X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audiod.c;h=c183491f5f0e81fafe51ff9d88f521bbada3c811;hb=06b3e7bc1b04def7488a5c5cd65de00aca655612;hp=d2c66f2bfe5f5bd0d8ba1da88b048ad21d9ceb00;hpb=2f07d34b5d4c37606be5849b6ee51e0443707898;p=paraslash.git

diff --git a/audiod.c b/audiod.c
index d2c66f2b..c183491f 100644
--- a/audiod.c
+++ b/audiod.c
@@ -343,10 +343,11 @@ static void parse_config_or_die(void)
 		PARA_EMERG_LOG("can not read config file %s\n", config_file);
 		goto err;
 	}
-	if (ret)
+	if (ret) {
 		audiod_cmdline_parser_config_file(config_file, &conf, &params);
+		daemon_set_loglevel(conf.loglevel_arg);
+	}
 	free(config_file);
-	daemon_set_loglevel(conf.loglevel_arg);
 	return;
 err:
 	free(config_file);
@@ -1304,8 +1305,7 @@ __noreturn static void print_help_and_die(void)
 	const char **p = d? audiod_args_info_detailed_help
 		: audiod_args_info_help;
 
-	printf_or_die("%s\n\n", AUDIOD_CMDLINE_PARSER_PACKAGE "-"
-		AUDIOD_CMDLINE_PARSER_VERSION);
+	printf_or_die("%s\n\n", version_single_line("audiod"));
 	printf_or_die("%s\n\n", audiod_args_info_usage);
 	for (; *p; p++)
 		printf_or_die("%s\n", *p);
@@ -1350,9 +1350,9 @@ int main(int argc, char *argv[])
 	};
 
 	valid_fd_012();
-	if (audiod_cmdline_parser_ext(argc, argv, &conf, &params))
-		exit(EXIT_FAILURE);
-	HANDLE_VERSION_FLAG("audiod", conf);
+	audiod_cmdline_parser_ext(argc, argv, &conf, &params);
+	daemon_set_loglevel(conf.loglevel_arg);
+	version_handle_flag("audiod", conf.version_given);
 	/* init receivers/filters/writers early to make help work */
 	recv_init();
 	filter_init();