X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=6777ccc971e2590bd2d46879ba428ff1f327f7d8;hp=8ea725de7898ef817a62c0ba2755c73a0f744572;hb=refs%2Fheads%2Fmaint;hpb=57a338b4f7a8346708636de18780eaec52750e96

diff --git a/command.c b/command.c
index 8ea725de..427c90fe 100644
--- a/command.c
+++ b/command.c
@@ -52,12 +52,14 @@ extern struct misc_meta_data *mmd;
 int send_afs_status(struct command_context *cc, int parser_friendly);
 static bool subcmd_should_die;
 
+/*
+ * Don't call PARA_XXX_LOG() here as we might already hold the log mutex. See
+ * generic_signal_handler() for details.
+ */
 static void command_handler_sighandler(int s)
 {
-	if (s != SIGTERM)
-		return;
-	PARA_EMERG_LOG("terminating on signal %d\n", SIGTERM);
-	subcmd_should_die = true;
+	if (s == SIGTERM)
+		subcmd_should_die = true;
 }
 
 /*
@@ -512,6 +514,7 @@ static int com_stat(struct command_context *cc, struct lls_parse_result *lpr)
 	 * while we sleep.
 	 */
 	para_block_signal(SIGTERM);
+	para_block_signal(SIGUSR1);
 	for (;;) {
 		sigset_t set;
 		/*
@@ -543,8 +546,10 @@ static int com_stat(struct command_context *cc, struct lls_parse_result *lpr)
 		 * open a race window similar to the one described above.
 		 */
 		pselect(1, NULL, NULL, NULL, &ts, &set);
-		if (subcmd_should_die)
+		if (subcmd_should_die) {
+			PARA_EMERG_LOG("terminating on SIGTERM\n");
 			goto out;
+		}
 		ret = -E_SERVER_CRASH;
 		if (getppid() == 1)
 			goto out;
@@ -554,7 +559,7 @@ out:
 }
 EXPORT_SERVER_CMD_HANDLER(stat);
 
-const char *aux_info_cb(unsigned cmd_num, bool verbose)
+static const char *aux_info_cb(unsigned cmd_num, bool verbose)
 {
 	static char result[80];
 	unsigned perms = server_command_perms[cmd_num];
@@ -717,8 +722,7 @@ EXPORT_SERVER_CMD_HANDLER(ff);
 
 static int com_jmp(struct command_context *cc, struct lls_parse_result *lpr)
 {
-	long unsigned int i;
-	int ret;
+	int i, ret;
 	char *errctx;
 
 	ret = lls(lls_check_arg_count(lpr, 1, 1, &errctx));
@@ -726,18 +730,16 @@ static int com_jmp(struct command_context *cc, struct lls_parse_result *lpr)
 		send_errctx(cc, errctx);
 		return ret;
 	}
-	if (sscanf(lls_input(0, lpr), "%lu", &i) <= 0)
+	if (sscanf(lls_input(0, lpr), "%d", &i) <= 0)
+		return -ERRNO_TO_PARA_ERROR(EINVAL);
+	if (i < 0 || i > 100)
 		return -ERRNO_TO_PARA_ERROR(EINVAL);
 	mutex_lock(mmd_mutex);
 	ret = -E_NO_AUDIO_FILE;
 	if (!mmd->afd.afhi.chunks_total)
 		goto out;
-	if (i > 100)
-		i = 100;
-	PARA_INFO_LOG("jumping to %lu%%\n", i);
+	PARA_INFO_LOG("jumping to %d%%\n", i);
 	mmd->repos_request = (mmd->afd.afhi.chunks_total * i + 50) / 100;
-	PARA_INFO_LOG("sent: %lu, offset before jmp: %li\n",
-		mmd->chunks_sent, mmd->offset);
 	mmd->new_vss_status_flags |= VSS_REPOS;
 	mmd->new_vss_status_flags &= ~VSS_NEXT;
 	ret = 1;