X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audiod.c;h=9b79121b3aa16f51662b9e7e2649e097f81b5a26;hb=f63aa66c5655ca9f9a881c0988c90ed135515c19;hp=397ef9a257ed89743ca651eed797890966d59a2a;hpb=61b0a431ca3c5dabfa5445355664f00e312c5299;p=paraslash.git

diff --git a/audiod.c b/audiod.c
index 397ef9a2..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)
@@ -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);