X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=63f0f1659f64aa60cd8b2c1bf399aed97993af18;hp=6adb945555d32e101fdd24bc7255133e33f0bd1b;hb=94c2ac98cd097f5ecbfe0abc7b38e7a83891bc2e;hpb=f787a626b8885247948e3c47ae886b1e3a7c2a3a

diff --git a/command.c b/command.c
index 6adb9455..63f0f165 100644
--- a/command.c
+++ b/command.c
@@ -279,7 +279,7 @@ static int check_sender_args(struct command_context *cc,
 }
 
 /**
- * Send a sideband packet through a blocking file descriptor.
+ * Receive a sideband packet from a blocking file descriptor.
  *
  * \param scc fd and crypto keys.
  * \param expected_band The expected band designator.
@@ -457,6 +457,7 @@ EXPORT_SERVER_CMD_HANDLER(version);
 	ITEM(chunk_time) \
 	ITEM(num_chunks) \
 	ITEM(amplification) \
+	ITEM(play_time) \
 
 /*
  * Create a set of audio-file related status items with empty values. These are
@@ -663,8 +664,7 @@ EXPORT_SERVER_CMD_HANDLER(nomore);
 static int com_ff(struct command_context *cc, struct lls_parse_result *lpr)
 {
 	long promille;
-	int ret, backwards = 0;
-	unsigned i;
+	int i, ret;
 	char c, *errctx;
 
 	ret = lls(lls_check_arg_count(lpr, 1, 1, &errctx));
@@ -672,20 +672,33 @@ static int com_ff(struct command_context *cc, struct lls_parse_result *lpr)
 		send_errctx(cc, errctx);
 		return ret;
 	}
-	if (!(ret = sscanf(lls_input(0, lpr), "%u%c", &i, &c)))
-		return -E_COMMAND_SYNTAX;
-	if (ret > 1 && c == '-')
-		backwards = 1; /* jmp backwards */
+	ret = para_atoi32(lls_input(0, lpr), &i);
+	if (ret < 0) {
+		if (ret != -E_ATOI_JUNK_AT_END)
+			return ret;
+		/*
+		 * Compatibility code to keep the historic syntax (ff 30-)
+		 * working. This can be removed after 0.7.0.
+		 */
+		ret = sscanf(lls_input(0, lpr), "%i%c", &i, &c);
+		if (ret <= 0)
+			return -E_COMMAND_SYNTAX;
+		if (ret > 1 && c == '-') {
+			PARA_WARNING_LOG("use of obsolete syntax\n");
+			i = -i;
+		}
+	}
 	mutex_lock(mmd_mutex);
 	ret = -E_NO_AUDIO_FILE;
 	if (!mmd->afd.afhi.chunks_total || !mmd->afd.afhi.seconds_total)
 		goto out;
 	ret = 1;
 	promille = (1000 * mmd->current_chunk) / mmd->afd.afhi.chunks_total;
-	if (backwards)
-		promille -= 1000 * i / mmd->afd.afhi.seconds_total;
-	else
-		promille += 1000 * i / mmd->afd.afhi.seconds_total;
+	/*
+	 * We need this cast because without it the expression on the right
+	 * hand side is of unsigned type.
+	 */
+	promille += 1000 * i / (int)mmd->afd.afhi.seconds_total;
 	if (promille < 0)
 		promille = 0;
 	if (promille > 1000) {