X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=write.c;h=73cddf8cad85a0afd8aaad9100ac4a5d66d747a7;hb=06b3e7bc1b04def7488a5c5cd65de00aca655612;hp=866ea43327b3d1389993e18b7277e29201a223da;hpb=d46a0767b58654f15f16406cf99296287bd0d534;p=paraslash.git

diff --git a/write.c b/write.c
index 866ea433..73cddf8c 100644
--- a/write.c
+++ b/write.c
@@ -39,8 +39,7 @@ __noreturn static void print_help_and_die(void)
 	const char **p = d? write_args_info_detailed_help
 		: write_args_info_help;
 
-	printf_or_die("%s\n\n", WRITE_CMDLINE_PARSER_PACKAGE "-"
-		WRITE_CMDLINE_PARSER_VERSION);
+	printf_or_die("%s\n\n", version_single_line("write"));
 	printf_or_die("%s\n\n", write_args_info_usage);
 	for (; *p; p++)
 		printf_or_die("%s\n", *p);
@@ -107,7 +106,6 @@ static int setup_and_schedule(void)
 		},
 	};
 
-	loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	sit.btrn = btr_new_node(&(struct btr_node_description)
 		EMBRACE(.name = "stdin"));
 	stdin_set_defaults(&sit);
@@ -173,9 +171,10 @@ int main(int argc, char *argv[])
 {
 	int ret;
 
-	writer_init();
 	write_cmdline_parser(argc, argv, &conf);
-	HANDLE_VERSION_FLAG("write", conf);
+	loglevel = get_loglevel_by_name(conf.loglevel_arg);
+	writer_init();
+	version_handle_flag("write", conf.version_given);
 	if (conf.help_given || conf.detailed_help_given)
 		print_help_and_die();