X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=9b79121b3aa16f51662b9e7e2649e097f81b5a26;hp=a1f1d62169d7a24a3be814a284df87c56032f3a9;hb=77264e47dcd6a606ecff2f86f14359f25ab0eba0;hpb=cd4b294da6f6802d9918c8fe5bcecb8a2a2363c3

diff --git a/audiod.c b/audiod.c
index a1f1d621..9b79121b 100644
--- a/audiod.c
+++ b/audiod.c
@@ -168,14 +168,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)
@@ -869,11 +869,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);
@@ -1120,7 +1120,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 +1130,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 +1139,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);