From: Andre Noll <maan@tuebingen.mpg.de>
Date: Thu, 9 Oct 2014 21:37:09 +0000 (+0000)
Subject: Merge branch 'refs/heads/t/server_cmds'
X-Git-Tag: v0.5.4~50
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=bc15c3ff65eb00e04ebc303cfa9ee3d1a4675b35

Merge branch 'refs/heads/t/server_cmds'

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
---

bc15c3ff65eb00e04ebc303cfa9ee3d1a4675b35
diff --cc NEWS
index f7158c45,40ab08a1..6ff788bf
--- a/NEWS
+++ b/NEWS
@@@ -1,16 -1,6 +1,18 @@@
  NEWS
  ====
  
 +-----------------------------------------------
 +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.
++	- 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
index c832beea,585bb31c..db28b39d
--- a/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"