X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=2a78332f2133c854937b4be239990cc6a3e1caf8;hp=a1f1d62169d7a24a3be814a284df87c56032f3a9;hb=7e58bd75a29d2d4e1d184191c2500b6aa7a7ad8a;hpb=cd4b294da6f6802d9918c8fe5bcecb8a2a2363c3

diff --git a/audiod.c b/audiod.c
index a1f1d621..2a78332f 100644
--- a/audiod.c
+++ b/audiod.c
@@ -5,9 +5,11 @@
  */
 
 /** \file audiod.c the paraslash's audio daemon */
+#include <sys/types.h>
+#include <dirent.h>
 
 #include "para.h"
-
+#include "error.h"
 #include "audiod.cmdline.h"
 #include "list.h"
 #include "sched.h"
@@ -24,7 +26,6 @@
 #include "fd.h"
 #include "write.h"
 #include "write_common.h"
-#include "error.h"
 #include "signal.h"
 
 /** define the array of error lists needed by para_audiod */
@@ -104,18 +105,6 @@ struct command_task {
 	struct task task;
 };
 
-/**
- * task for signal handling
- */
-struct signal_task {
-	/** the signal pipe */
-	int fd;
-	/** the number of the most recent signal */
-	int signum;
-	/** the associated task structure */
-	struct task task;
-};
-
 /** iterate over all supported audio formats */
 #define FOR_EACH_AUDIO_FORMAT(af) for (af = 0; af < NUM_AUDIO_FORMATS; af++)
 
@@ -168,14 +157,14 @@ void para_log(int ll, const char* fmt,...)
 
 static char *configfile_exists(void)
 {
-	static char *config_file;
-
-	if (!config_file) {
-		char *home = para_homedir();
-		config_file = make_message("%s/.paraslash/audiod.conf", home);
-		free(home);
-	}
-	return file_exists(config_file)? config_file : NULL;
+	char *home = para_homedir();
+	char *config_file = make_message("%s/.paraslash/audiod.conf",
+		home);
+	free(home);
+	if (file_exists(config_file))
+		return config_file;
+	free(config_file);
+	return NULL;
 }
 
 static void setup_signal_handling(void)
@@ -497,7 +486,7 @@ out:
 	return count;
 }
 
-static void check_stat_line(char *line)
+static int check_stat_line(char *line, __a_unused void *data)
 {
 	int itemnum;
 	size_t ilen = 0;
@@ -506,14 +495,14 @@ static void check_stat_line(char *line)
 
 //	PARA_INFO_LOG("line: %s\n", line);
 	if (!line)
-		return;
+		return 1;
 	itemnum = stat_line_valid(line);
 	if (itemnum < 0) {
 		PARA_WARNING_LOG("invalid status line: %s\n", line);
-		return;
+		return 1;
 	}
 	if (stat_task->clock_diff_count && itemnum != SI_CURRENT_TIME)
-		return;
+		return 1;
 	tmp = make_message("%s\n", line);
 	stat_client_write(tmp, itemnum);
 	free(tmp);
@@ -557,6 +546,7 @@ static void check_stat_line(char *line)
 			stat_task->clock_diff_count--;
 		break;
 	}
+	return 1;
 }
 
 static void try_to_close_slot(int slot_num)
@@ -581,7 +571,7 @@ static void try_to_close_slot(int slot_num)
 
 /*
  * Check if any receivers/filters/writers need to be started and do so if
- * neccessary.  Since the pre_select function didn't have a chance yet to put
+ * necessary.  Since the pre_select function didn't have a chance yet to put
  * file descriptors into the fd sets given by s, make the upcoming select()
  * return immediately to avoid a long timeout in case we started something.
  */
@@ -869,11 +859,11 @@ static int audiod_get_socket(void)
 	fd = create_local_socket(socket_name, &unix_addr,
 			S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH);
 	if (fd < 0) {
-		PARA_EMERG_LOG("%s", "can not connect to socket\n");
+		PARA_EMERG_LOG("can not connect to socket\n");
 		exit(EXIT_FAILURE); /* do not unlink socket */
 	}
 	if (listen(fd , 5) < 0) {
-		PARA_EMERG_LOG("%s", "can not listen on socket\n");
+		PARA_EMERG_LOG("can not listen on socket\n");
 		exit(EXIT_FAILURE); /* do not unlink socket */
 	}
 	mark_fd_nonblock(fd);
@@ -1068,7 +1058,7 @@ static void status_post_select(__a_unused struct sched *s, struct task *t)
 		return;
 	}
 	bytes_left = for_each_line(st->pcd->buf, st->pcd->loaded,
-		&check_stat_line);
+		&check_stat_line, NULL);
 	if (st->pcd->loaded != bytes_left) {
 		st->last_status_read = *now;
 		st->pcd->loaded = bytes_left;
@@ -1120,7 +1110,7 @@ static void set_initial_status(void)
  * */
 int main(int argc, char *argv[])
 {
-	char *cf;
+	char *config_file;
 	int ret, i;
 	struct sched s;
 	struct command_task command_task_struct, *cmd_task = &command_task_struct;
@@ -1130,8 +1120,8 @@ int main(int argc, char *argv[])
 	audiod_cmdline_parser(argc, argv, &conf);
 	HANDLE_VERSION_FLAG("audiod", conf);
 	para_drop_privileges(conf.user_arg, conf.group_arg);
-	cf = configfile_exists();
-	if (cf) {
+	config_file = configfile_exists();
+	if (config_file) {
 		struct audiod_cmdline_parser_params params = {
 			.override = 0,
 			.initialize = 0,
@@ -1139,10 +1129,11 @@ int main(int argc, char *argv[])
 			.check_ambiguity = 0
 
 		};
-		if (audiod_cmdline_parser_config_file(cf, &conf, &params)) {
+		if (audiod_cmdline_parser_config_file(config_file, &conf, &params)) {
 			PARA_EMERG_LOG("%s", "parse error in config file\n");
 			exit(EXIT_FAILURE);
 		}
+		free(config_file);
 	}
 	if (conf.logfile_given)
 		logfile = open_log(conf.logfile_arg);