Merge branch 'refs/heads/t/server_cmds'
authorAndre Noll <maan@tuebingen.mpg.de>
Thu, 9 Oct 2014 21:37:09 +0000 (21:37 +0000)
committerAndre Noll <maan@tuebingen.mpg.de>
Thu, 9 Oct 2014 21:40:10 +0000 (21:40 +0000)
Was cooking for three weeks.

* Add sender subcommand "status".
* com_si(): Don't print git version string.
* Doxify the sender_subcommand enum.
* Overhaul help texts of server and afs commands.
* com_sender: Replace memcpy by struct copy.

Conflicts:
command.c

1  2 
NEWS
command.c
dccp_send.c
http_send.c
send.h
send_common.c
udp_send.c
web/manual.m4

diff --cc NEWS
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,16 -1,6 +1,18 @@@
  NEWS
  ====
  
-       * Minor cleanups to daemon.c.
-       * New URLs for home page and git services.
-       * Improved error diagnostics for the mvblob commands.
 +-----------------------------------------------
 +0.5.4 (to be announced) "exponential alignment"
 +-----------------------------------------------
 +
++      - Minor cleanups to daemon.c.
++      - New URLs for home page and git services.
++      - Improved error diagnostics for the mvblob commands.
++      - New sender subcommand: status.
++      - Improved help text for server and afs commands.
 +
 +Download: ./releases/paraslash-git.tar.bz2
 +
  ---------------------------------------------
  0.5.3 (2014-08-01) "symbolic synchronization"
  ---------------------------------------------
diff --cc command.c
+++ b/command.c
@@@ -380,14 -383,8 +383,8 @@@ static int com_si(struct command_contex
        if (cc->argc != 1)
                return -E_COMMAND_SYNTAX;
        mutex_lock(mmd_mutex);
-       for (i = 0; senders[i].name; i++) {
-               char *info = senders[i].info();
-               sender_info = para_strcat(sender_info, info);
-               free(info);
-       }
 -      ut = get_server_uptime_str(now);
 +      ut = daemon_get_uptime_str(now);
        ret = xasprintf(&msg,
-               "version: %s\n"
                "up: %s\nplayed: %u\n"
                "server_pid: %d\n"
                "afs_pid: %d\n"
diff --cc dccp_send.c
Simple merge
diff --cc http_send.c
Simple merge
diff --cc send.h
Simple merge
diff --cc send_common.c
Simple merge
diff --cc udp_send.c
Simple merge
diff --cc web/manual.m4
Simple merge