X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod_command.c;h=875e4551242615b1b7780664b98517b5029d8a5f;hp=349480ff1f34f5a9bfebe57f26ddad6f0aef93ce;hb=73aebb78da7297053f41dba5b3f0cefb33ad248e;hpb=101e1fd3252d838458a6ad4015f497818c54c897

diff --git a/audiod_command.c b/audiod_command.c
index 349480ff..875e4551 100644
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -1,25 +1,15 @@
 /*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file audiod_command.c commands for para_audiod */
 
-#include "para.h"
+#include <sys/types.h>
+#include <dirent.h>
 
+#include "para.h"
 #include "audiod.cmdline.h"
 #include "list.h"
 #include "close_on_fork.h"
@@ -80,7 +70,7 @@ static char *get_time_string(struct timeval *newest_stime)
 		total = 0;
 out:
 	return make_message(
-		"%s:%s%d:%02d [%d:%02d] (%d%%/%d:%02d)\n",
+		"%s: %s%d:%02d [%d:%02d] (%d%%/%d:%02d)\n",
 		status_item_list[SI_PLAY_TIME],
 		use_server_time? "~" : "",
 		total / 60,
@@ -98,7 +88,7 @@ __malloc static char *audiod_status_string(void)
 {
 	const char *status = (audiod_status == AUDIOD_ON)?
 		"on" : (audiod_status == AUDIOD_OFF)? "off": "sb";
-	return make_message("%s:%s\n", status_item_list[SI_AUDIOD_STATUS], status);
+	return make_message("%s: %s\n", status_item_list[SI_AUDIOD_STATUS], status);
 }
 
 static struct timeval *wstime(void)
@@ -130,7 +120,7 @@ __malloc static char *decoder_flags(void)
 		flags[i] = flag;
 	}
 	flags[MAX_STREAM_SLOTS] = '\0';
-	return make_message("%s:%s\n", status_item_list[SI_DECODER_FLAGS],
+	return make_message("%s: %s\n", status_item_list[SI_DECODER_FLAGS],
 		flags);
 }
 
@@ -247,7 +237,7 @@ int com_stat(int fd, __a_unused int argc, __a_unused char **argv)
 	}
 	if (mask & (1 << SI_AUDIOD_UPTIME)) {
 		char *tmp, *us = uptime_str();
-		tmp = make_message("%s:%s\n",
+		tmp = make_message("%s: %s\n",
 			status_item_list[SI_AUDIOD_UPTIME], us);
 		free(us);
 		ret = client_write(fd, tmp);
@@ -263,14 +253,13 @@ int com_stat(int fd, __a_unused int argc, __a_unused char **argv)
 		free(s);
 	}
 	if (mask & (1 << SI_DECODER_FLAGS)) {
-		char *df =decoder_flags();
+		char *df = decoder_flags();
 		ret = client_write(fd, df);
 		if (ret < 0)
 			goto out;
 		free(df);
 	}
-
-	for (i = 0; i < NUM_STAT_ITEMS; i++) {
+	FOR_EACH_STATUS_ITEM(i) {
 		char *tmp, *v;
 		if (!((1 << i) & mask))
 			continue;
@@ -350,7 +339,7 @@ err_out:
 	return 1;
 }
 
-int __noreturn com_term(int fd, __a_unused int argc, __a_unused char **argv)
+__noreturn int com_term(int fd, __a_unused int argc, __a_unused char **argv)
 {
 	close(fd);
 	clean_exit(EXIT_SUCCESS, "terminating on user request");
@@ -426,6 +415,7 @@ int handle_connect(int accept_fd)
 	int i, argc, ret, clifd = -1;
 	char *cmd = NULL, *p, *buf = para_calloc(MAXLINE), **argv = NULL;
 	struct sockaddr_un unix_addr;
+	uid_t uid;
 
 	ret = para_accept(accept_fd, &unix_addr, sizeof(struct sockaddr_un));
 	if (ret < 0)
@@ -434,8 +424,9 @@ int handle_connect(int accept_fd)
 	ret = recv_cred_buffer(clifd, buf, MAXLINE - 1);
 	if (ret < 0)
 		goto out;
+	uid = ret;
 	PARA_INFO_LOG("connection from user %i, buf: %s\n",  ret, buf);
-	ret = check_perms(ret);
+	ret = check_perms(uid);
 	if (ret < 0)
 		goto out;
 	ret = -E_INVALID_AUDIOD_CMD;
@@ -470,14 +461,16 @@ out:
 	free(buf);
 	free(argv);
 	if (clifd > 0 && ret < 0 && ret != -E_CLIENT_WRITE) {
-		char *tmp = make_message("%s\n", PARA_STRERROR(-ret));
+		char *tmp = make_message("%s\n", para_strerror(-ret));
 		client_write(clifd, tmp);
 		free(tmp);
 		close(clifd);
 	}
 	return ret;
 }
-
+/**
+ * send the current audiod status to all connected stat clients
+ */
 void audiod_status_dump(void)
 {
 	struct timeval *t = wstime();
@@ -498,7 +491,7 @@ void audiod_status_dump(void)
 	old = stat_task->stat_item_values[SI_AUDIOD_UPTIME];
 	if (!old || strcmp(old, new)) {
 		free(old);
-		tmp = make_message("%s:%s\n",
+		tmp = make_message("%s: %s\n",
 			status_item_list[SI_AUDIOD_UPTIME], new);
 		stat_client_write(tmp, SI_AUDIOD_UPTIME);
 		free(tmp);
@@ -518,6 +511,7 @@ void audiod_status_dump(void)
 	old = stat_task->stat_item_values[SI_DECODER_FLAGS];
 	new = decoder_flags();
 	if (!old || strcmp(old, new)) {
+		free(old);
 		stat_client_write(new, SI_DECODER_FLAGS);
 		stat_task->stat_item_values[SI_DECODER_FLAGS] = new;
 	} else
@@ -534,7 +528,7 @@ void dump_empty_status(void)
 {
 	int i;
 
-	FOR_EACH_STAT_ITEM(i) {
+	FOR_EACH_STATUS_ITEM(i) {
 		char *tmp = make_message("%s:\n", status_item_list[i]);
 		stat_client_write(tmp, i);
 		free(tmp);