X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=56661b802948cc4a2ff8601e6f227c56c134a1fe;hp=e3db6bea822d4f6fd5954e19436f28358b13d906;hb=a6cbab95272b31c55b2b41e1d3dd55743c7c774f;hpb=5c01bccd6581c86020f9cf1500db70a8dacf911c

diff --git a/audiod.c b/audiod.c
index e3db6bea..56661b80 100644
--- a/audiod.c
+++ b/audiod.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -214,16 +214,39 @@ __printf_2_3 void para_log(int ll, const char* fmt,...)
 	va_end(argp);
 }
 
-static char *configfile_exists(void)
+static void parse_config_or_die(void)
 {
-	char *home = para_homedir();
-	char *config_file = make_message("%s/.paraslash/audiod.conf",
-		home);
-	free(home);
-	if (file_exists(config_file))
-		return config_file;
+	char *config_file;
+
+	if (conf.config_file_given)
+		config_file = para_strdup(conf.config_file_arg);
+	else {
+		char *home = para_homedir();
+		config_file = make_message("%s/.paraslash/audiod.conf", home);
+		free(home);
+	}
+	if (conf.config_file_given && !file_exists(config_file)) {
+		PARA_EMERG_LOG("can not read config file %s\n", config_file);
+		goto err;
+	}
+	if (config_file) {
+		struct audiod_cmdline_parser_params params = {
+			.override = 0,
+			.initialize = 0,
+			.check_required = 1,
+			.check_ambiguity = 0,
+			.print_errors = 1
+		};
+		if (audiod_cmdline_parser_config_file(config_file, &conf, &params)) {
+			PARA_EMERG_LOG("parse error in config file\n");
+			goto err;
+		}
+	}
 	free(config_file);
-	return NULL;
+	return;
+err:
+	free(config_file);
+	exit(EXIT_FAILURE);
 }
 
 static void setup_signal_handling(void)
@@ -1099,7 +1122,6 @@ __noreturn static void print_help_and_die(void)
  * */
 int main(int argc, char *argv[])
 {
-	char *config_file;
 	int ret, i;
 	static struct sched s;
 	struct command_task command_task_struct, *cmd_task = &command_task_struct;
@@ -1115,29 +1137,17 @@ int main(int argc, char *argv[])
 	audiod_cmdline_parser_ext(argc, argv, &conf, &params);
 	HANDLE_VERSION_FLAG("audiod", conf);
 	para_drop_privileges(conf.user_arg, conf.group_arg);
-	config_file = configfile_exists();
-	if (config_file) {
-		params.override = 0;
-		params.initialize = 0;
-		params.check_required = 1;
-		params.check_ambiguity = 0;
-		params.print_errors = 1;
-		if (audiod_cmdline_parser_config_file(config_file, &conf, &params)) {
-			PARA_EMERG_LOG("parse error in config file\n");
-			exit(EXIT_FAILURE);
-		}
-		free(config_file);
-	}
+	parse_config_or_die();
 	if (conf.logfile_given)
 		logfile = open_log(conf.logfile_arg);
 	i = init_stream_io();
 	if (conf.help_given || conf.detailed_help_given)
 		print_help_and_die();
-	log_welcome("para_audiod", conf.loglevel_arg);
 	if (i < 0) {
 		PARA_EMERG_LOG("init stream io error: %s\n", para_strerror(-i));
 		exit(EXIT_FAILURE);
 	}
+	log_welcome("para_audiod", conf.loglevel_arg);
 	server_uptime(UPTIME_SET);
 	set_initial_status();
 	FOR_EACH_SLOT(i)