X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=command.c;h=551fe05a66eb4eab694f62f6ac1578ad0992d742;hb=d1e7875caba9aface190dab0de394435a80edd21;hp=585bb31c54b8df7395c8330f7f4d6e7b15890ad8;hpb=435ad905b15bdad01dc3189bed5bf1d647ed1229;p=paraslash.git

diff --git a/command.c b/command.c
index 585bb31c..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"
 
@@ -363,8 +363,10 @@ 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;
 		}
 		mmd->sender_cmd_data = scd;
@@ -383,7 +385,7 @@ static int com_si(struct command_context *cc)
 	if (cc->argc != 1)
 		return -E_COMMAND_SYNTAX;
 	mutex_lock(mmd_mutex);
-	ut = get_server_uptime_str(now);
+	ut = daemon_get_uptime_str(now);
 	ret = xasprintf(&msg,
 		"up: %s\nplayed: %u\n"
 		"server_pid: %d\n"