X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=6799db4175282b779c2fd454d11988be31b933d8;hp=3deef1474c840a48e88d4db6717b0d446a1e994b;hb=d87806284b9f6be9aab71ccbf0280d273b57eeb3;hpb=3879481ddabc38236b9eee979a090c2a9bfa74d3

diff --git a/write.c b/write.c
index 3deef147..6799db41 100644
--- a/write.c
+++ b/write.c
@@ -35,16 +35,11 @@ INIT_STDERR_LOGGING(loglevel)
 
 __noreturn static void print_help_and_die(void)
 {
-	int d = conf.detailed_help_given;
-	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", write_args_info_usage);
-	for (; *p; p++)
-		printf_or_die("%s\n", *p);
-	print_writer_helps(d);
+	struct ggo_help h = DEFINE_GGO_HELP(write);
+	bool d = conf.detailed_help_given;
+
+	ggo_print_help(&h, d? GPH_STANDARD_FLAGS_DETAILED : GPH_STANDARD_FLAGS);
+	print_writer_helps(d? GPH_MODULE_FLAGS_DETAILED : GPH_MODULE_FLAGS);
 	exit(0);
 }
 
@@ -86,10 +81,10 @@ static void write_pre_select(struct sched *s, struct task *t)
 	check_wav_pre_select(s, wt->cwc);
 }
 
-static void write_post_select(__a_unused struct sched *s, struct task *t)
+static int write_post_select(__a_unused struct sched *s, struct task *t)
 {
 	struct write_task *wt = container_of(t, struct write_task, task);
-	t->error = check_wav_post_select(wt->cwc);
+	return check_wav_post_select(wt->cwc);
 }
 
 static int setup_and_schedule(void)
@@ -107,7 +102,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 +167,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();