X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=15bbb4a6399dd0739b41d3ee6c7b73e4c6af5fbc;hp=0f04fe5295942357fa69a27d25dceb715299075f;hb=c5056b00502d27e602cfcd716f92e5f85f97b470;hpb=75feacbafa2a1fe258f85963205b8c28a976badc

diff --git a/write.c b/write.c
index 0f04fe52..15bbb4a6 100644
--- a/write.c
+++ b/write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -35,15 +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", VERSION_SINGLE_LINE("write"));
-	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);
 }
 
@@ -75,19 +71,19 @@ static void setup_writer_node(const char *arg, struct btr_node *parent,
 }
 
 struct write_task {
-	struct task task;
+	struct task *task;
 	struct check_wav_context *cwc;
 };
 
 static void write_pre_select(struct sched *s, struct task *t)
 {
-	struct write_task *wt = container_of(t, struct write_task, task);
+	struct write_task *wt = task_context(t);
 	check_wav_pre_select(s, wt->cwc);
 }
 
 static int write_post_select(__a_unused struct sched *s, struct task *t)
 {
-	struct write_task *wt = container_of(t, struct write_task, task);
+	struct write_task *wt = task_context(t);
 	return check_wav_post_select(wt->cwc);
 }
 
@@ -98,22 +94,20 @@ static int setup_and_schedule(void)
 	struct writer_node *wns;
 	static struct sched s;
 	struct wav_params wp;
-	struct write_task wt = {
-		.task = {
-			.pre_select = write_pre_select,
-			.post_select = write_post_select,
-			.status = "write task",
-		},
-	};
+	struct write_task wt;
 
 	sit.btrn = btr_new_node(&(struct btr_node_description)
 		EMBRACE(.name = "stdin"));
-	stdin_set_defaults(&sit);
-	register_task(&s, &sit.task);
+	stdin_task_register(&sit, &s);
 
 	COPY_WAV_PARMS(&wp, &conf);
 	wt.cwc = check_wav_init(sit.btrn, NULL, &wp, &cw_btrn);
-	register_task(&s, &wt.task);
+	wt.task = task_register(&(struct task_info) {
+		.name = "write",
+		.pre_select = write_pre_select,
+		.post_select = write_post_select,
+		.context = &wt,
+	}, &s);
 	if (!conf.writer_given) {
 		wns = para_calloc(sizeof(*wns));
 		setup_writer_node(NULL, cw_btrn, wns, &s);
@@ -131,7 +125,7 @@ static int setup_and_schedule(void)
 	if (ret >= 0) {
 		int j;
 		for (j = 0; j < i; j++) {
-			struct task *t = &wns[j].task;
+			struct task *t = wns[j].task;
 			assert(t->error < 0);
 			if (t->error != -E_WRITE_COMMON_EOF
 					&& t->error != -E_BTR_EOF) {
@@ -153,6 +147,7 @@ static int setup_and_schedule(void)
 	}
 	free(wns);
 	check_wav_shutdown(wt.cwc);
+	sched_shutdown(&s);
 	return ret;
 }
 
@@ -174,7 +169,7 @@ int main(int argc, char *argv[])
 	write_cmdline_parser(argc, argv, &conf);
 	loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	writer_init();
-	HANDLE_VERSION_FLAG("write", conf);
+	version_handle_flag("write", conf.version_given);
 	if (conf.help_given || conf.detailed_help_given)
 		print_help_and_die();