X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=6799db4175282b779c2fd454d11988be31b933d8;hp=8c57b3bde28fc45d2337f316a0c7cf8d41f4d112;hb=75602d559d3dd57d704839b817377646722bfed8;hpb=216399fa29e2c071cd4485c57b6b1c9f4a74057b

diff --git a/write.c b/write.c
index 8c57b3bd..6799db41 100644
--- a/write.c
+++ b/write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -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,14 +102,13 @@ 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);
 	register_task(&s, &sit.task);
 
 	COPY_WAV_PARMS(&wp, &conf);
-	wt.cwc = check_wav_init(sit.btrn, &wp, &cw_btrn);
+	wt.cwc = check_wav_init(sit.btrn, NULL, &wp, &cw_btrn);
 	register_task(&s, &wt.task);
 	if (!conf.writer_given) {
 		wns = para_calloc(sizeof(*wns));
@@ -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();