X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=command.c;h=a8d479e95c7a237f4889ad389a7cf2bf46dc5433;hb=448c8f8e8c1c1eeb88ae468c0c3ab25bed6f2ac8;hp=d4955fb696d7ff88c6f6fd1d263fbf025bcaca73;hpb=277ed4a605f68118aff9e671f16c0ac6edb1d55a;p=paraslash.git

diff --git a/command.c b/command.c
index d4955fb6..a8d479e9 100644
--- a/command.c
+++ b/command.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <signal.h>
-#include <sys/time.h>
 #include <sys/types.h>
 #include <osl.h>
 
@@ -36,8 +35,8 @@
 #include "signal.h"
 #include "version.h"
 
-struct server_command afs_cmds[] = {DEFINE_AFS_CMD_ARRAY};
-struct server_command server_cmds[] = {DEFINE_SERVER_CMD_ARRAY};
+static struct server_command afs_cmds[] = {DEFINE_AFS_CMD_ARRAY};
+static struct server_command server_cmds[] = {DEFINE_SERVER_CMD_ARRAY};
 
 /** Commands including options must be shorter than this. */
 #define MAX_COMMAND_LEN 32768
@@ -111,7 +110,6 @@ static unsigned get_status(struct misc_meta_data *nmmd, int parser_friendly,
 	char mtime[30] = "";
 	char *status, *flags; /* vss status info */
 	/* nobody updates our version of "now" */
-	char *ut = get_server_uptime_str(NULL);
 	long offset = (nmmd->offset + 500) / 1000;
 	struct timeval current_time;
 	struct tm mtime_tm;
@@ -124,7 +122,7 @@ static unsigned get_status(struct misc_meta_data *nmmd, int parser_friendly,
 		localtime_r(&nmmd->mtime, &mtime_tm);
 		strftime(mtime, 29, "%b %d %Y", &mtime_tm);
 	}
-	gettimeofday(&current_time, NULL);
+	clock_get_realtime(&current_time);
 	/*
 	 * The calls to WRITE_STATUS_ITEM() below never fail because
 	 * b->max_size is zero (unlimited), see para_printf(). However, clang
@@ -145,7 +143,6 @@ static unsigned get_status(struct misc_meta_data *nmmd, int parser_friendly,
 		(long unsigned)current_time.tv_usec);
 	free(flags);
 	free(status);
-	free(ut);
 	*result = b.buf;
 	return b.offset;
 }
@@ -221,8 +218,8 @@ int send_sb(struct stream_cipher_context *scc, void *buf, size_t numbytes,
 	int ret;
 	struct sb_context *sbc;
 	struct iovec iov[2];
-	struct sb_buffer sbb = SBB_INIT(band, buf, numbytes);
 	sb_transformation trafo = band < SBD_PROCEED? NULL : sc_trafo;
+	struct sb_buffer sbb = SBB_INIT(band, buf, numbytes);
 
 	sbc = sb_new_send(&sbb, dont_free, trafo, scc->send);
 	do {
@@ -384,7 +381,8 @@ static int com_si(struct command_context *cc)
 		free(info);
 	}
 	ut = get_server_uptime_str(now);
-	ret = xasprintf(&msg, "version: " GIT_VERSION "\n"
+	ret = xasprintf(&msg,
+		"version: %s\n"
 		"up: %s\nplayed: %u\n"
 		"server_pid: %d\n"
 		"afs_pid: %d\n"
@@ -392,6 +390,7 @@ static int com_si(struct command_context *cc)
 		"current loglevel: %s\n"
 		"supported audio formats: %s\n"
 		"%s",
+		version_git(),
 		ut, mmd->num_played,
 		(int)getppid(),
 		(int)mmd->afs_pid,
@@ -399,7 +398,7 @@ static int com_si(struct command_context *cc)
 		mmd->num_commands,
 		mmd->num_connects,
 		conf.loglevel_arg,
-		SERVER_AUDIO_FORMATS,
+		AUDIO_FORMAT_HANDLERS,
 		sender_info
 	);
 	mutex_unlock(mmd_mutex);
@@ -416,10 +415,8 @@ static int com_version(struct command_context *cc)
 
 	if (cc->argc != 1)
 		return -E_COMMAND_SYNTAX;
-	msg = VERSION_TEXT("server") "built: " BUILD_DATE "\n" UNAME_RS
-		", " CC_VERSION "\n";
-	len = strlen(msg);
-	return send_sb(&cc->scc, msg, len, SBD_OUTPUT, true);
+	len = xasprintf(&msg, "%s", version_text("server"));
+	return send_sb(&cc->scc, msg, len, SBD_OUTPUT, false);
 }
 
 #define EMPTY_STATUS_ITEMS \
@@ -457,11 +454,8 @@ static int com_version(struct command_context *cc)
  */
 static unsigned empty_status_items(int parser_friendly, char **result)
 {
-	static char *esi;
-	static unsigned len;
-
-	if (esi)
-		goto out;
+	char *esi;
+	unsigned len;
 
 	if (parser_friendly)
 		len = xasprintf(&esi,
@@ -481,7 +475,6 @@ static unsigned empty_status_items(int parser_friendly, char **result)
 			EMPTY_STATUS_ITEMS
 			#undef ITEM
 		);
-out:
 	*result = esi;
 	return len;
 }
@@ -492,7 +485,7 @@ static int com_stat(struct command_context *cc)
 {
 	int i, ret;
 	struct misc_meta_data tmp, *nmmd = &tmp;
-	char *s, *esi = NULL;
+	char *s;
 	int32_t num = 0;
 	int parser_friendly = 0;
 
@@ -527,8 +520,9 @@ static int com_stat(struct command_context *cc)
 		if (ret < 0)
 			goto out;
 		if (nmmd->vss_status_flags & VSS_NEXT) {
+			char *esi;
 			ret = empty_status_items(parser_friendly, &esi);
-			ret = send_sb(&cc->scc, esi, ret, SBD_OUTPUT, true);
+			ret = send_sb(&cc->scc, esi, ret, SBD_OUTPUT, false);
 			if (ret < 0)
 				goto out;
 		} else
@@ -542,7 +536,6 @@ static int com_stat(struct command_context *cc)
 			goto out;
 	}
 out:
-	free(esi);
 	return ret;
 }
 
@@ -559,6 +552,7 @@ static int send_list_of_commands(struct command_context *cc, struct server_comma
 		msg = para_strcat(msg, tmp);
 		free(tmp);
 	}
+	assert(msg);
 	return send_sb(&cc->scc, msg, strlen(msg), SBD_OUTPUT, false);
 }
 
@@ -847,7 +841,7 @@ static int parse_sb_command(struct command_context *cc, struct iovec *iov)
 	if (ret < 0)
 		goto out;
 	end = iov->iov_base + iov->iov_len;
-	for (i = 0, p = iov->iov_base; p < end; i++)
+	for (i = 0; p < end; i++)
 		p += strlen(p) + 1;
 	cc->argc = i;
 	cc->argv = para_malloc((cc->argc + 1) * sizeof(char *));