X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=551fe05a66eb4eab694f62f6ac1578ad0992d742;hp=412769336a2896555142eac66cf6c9469f9c394b;hb=d1e7875caba9aface190dab0de394435a80edd21;hpb=823a4ff87a03ff9e1d2bfe8bc501f55ee4213649

diff --git a/command.c b/command.c
index 41276933..551fe05a 100644
--- a/command.c
+++ b/command.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2014 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2014 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -35,8 +35,8 @@
 #include "fd.h"
 #include "ipc.h"
 #include "user_list.h"
-#include "server_command_list.h"
-#include "afs_command_list.h"
+#include "server.command_list.h"
+#include "afs.command_list.h"
 #include "signal.h"
 #include "version.h"
 
@@ -344,7 +344,10 @@ static int com_sender(struct command_context *cc)
 	if (ret < 0) {
 		if (scd.sender_num < 0)
 			return ret;
-		msg = senders[scd.sender_num].help();
+		if (strcmp(cc->argv[2], "status") == 0)
+			msg = senders[scd.sender_num].status();
+		else
+			msg = senders[scd.sender_num].help();
 		return send_sb(&cc->scc, msg, strlen(msg), SBD_OUTPUT, false);
 	}
 
@@ -360,11 +363,13 @@ static int com_sender(struct command_context *cc)
 	for (i = 0; i < 10; i++) {
 		mutex_lock(mmd_mutex);
 		if (mmd->sender_cmd_data.cmd_num >= 0) {
+			/* another sender command is active, retry in 100ms */
+			struct timespec ts = {.tv_nsec = 100 * 1000 * 1000};
 			mutex_unlock(mmd_mutex);
-			usleep(100 * 1000);
+			nanosleep(&ts, NULL);
 			continue;
 		}
-		memcpy(&mmd->sender_cmd_data, &scd, sizeof(scd));
+		mmd->sender_cmd_data = scd;
 		mutex_unlock(mmd_mutex);
 		break;
 	}
@@ -374,28 +379,20 @@ static int com_sender(struct command_context *cc)
 /* server info */
 static int com_si(struct command_context *cc)
 {
-	int i, ret;
-	char *msg, *ut, *sender_info = NULL;
+	int ret;
+	char *msg, *ut;
 
 	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 = daemon_get_uptime_str(now);
 	ret = xasprintf(&msg,
-		"version: %s\n"
 		"up: %s\nplayed: %u\n"
 		"server_pid: %d\n"
 		"afs_pid: %d\n"
 		"connections (active/accepted/total): %u/%u/%u\n"
 		"current loglevel: %s\n"
-		"supported audio formats: %s\n"
-		"%s",
-		version_git(),
+		"supported audio formats: %s\n",
 		ut, mmd->num_played,
 		(int)getppid(),
 		(int)mmd->afs_pid,
@@ -403,12 +400,10 @@ static int com_si(struct command_context *cc)
 		mmd->num_commands,
 		mmd->num_connects,
 		conf.loglevel_arg,
-		AUDIO_FORMAT_HANDLERS,
-		sender_info
+		AUDIO_FORMAT_HANDLERS
 	);
 	mutex_unlock(mmd_mutex);
 	free(ut);
-	free(sender_info);
 	return send_sb(&cc->scc, msg, ret, SBD_OUTPUT, false);
 }