X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=aa230f59f9e17a0c4c09a672cbf830e73fd7c3ea;hp=866ea43327b3d1389993e18b7277e29201a223da;hb=e58586b7395a84e5883b077d89b92c8ac649a1f2;hpb=1775d4d4147730e79e48aa941aee88580b8beb08

diff --git a/write.c b/write.c
index 866ea433..aa230f59 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,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);
 }
 
@@ -107,11 +102,9 @@ 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);
+	stdin_task_register(&sit, &s);
 
 	COPY_WAV_PARMS(&wp, &conf);
 	wt.cwc = check_wav_init(sit.btrn, NULL, &wp, &cw_btrn);
@@ -155,6 +148,7 @@ static int setup_and_schedule(void)
 	}
 	free(wns);
 	check_wav_shutdown(wt.cwc);
+	sched_shutdown(&s);
 	return ret;
 }
 
@@ -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();