X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write.c;h=acfb94605b53d259a89ea41e75507b81e2cb2ca4;hp=98cd3557e0f3e7a60b0019a309cfe61d63fa5824;hb=e32a0e7295c6386b421956553ae577a7df1abf8e;hpb=870fcd0379ab096184f42481541d668694da7c83

diff --git a/write.c b/write.c
index 98cd3557..acfb9460 100644
--- a/write.c
+++ b/write.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file write.c Paraslash's standalone wav/raw player. */
 
@@ -11,12 +7,11 @@
 #include <lopsub.h>
 
 #include "write_cmd.lsg.h"
+#include "write.lsg.h"
 #include "para.h"
 #include "string.h"
-#include "write.cmdline.h"
 #include "list.h"
 #include "sched.h"
-#include "ggo.h"
 #include "stdin.h"
 #include "buffer_tree.h"
 #include "write.h"
@@ -28,21 +23,30 @@
 /** Array of error strings. */
 DEFINE_PARA_ERRLIST;
 
-static struct write_args_info conf;
+#define CMD_PTR (lls_cmd(0, write_suite))
+#define OPT_RESULT(_name, _lpr) \
+	(lls_opt_result(LSG_WRITE_PARA_WRITE_OPT_ ## _name, _lpr))
+#define OPT_GIVEN(_name, _lpr) (lls_opt_given(OPT_RESULT(_name, _lpr)))
+#define OPT_UINT32_VAL(_name, _lpr) (lls_uint32_val(0, OPT_RESULT(_name, _lpr)))
 
 static struct stdin_task sit;
-
 static int loglevel;
 INIT_STDERR_LOGGING(loglevel)
 
-__noreturn static void print_help_and_die(void)
+static void handle_help_flag(struct lls_parse_result *lpr)
 {
-	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);
-	exit(0);
+	char *help;
+
+	if (OPT_GIVEN(DETAILED_HELP, lpr))
+		help = lls_long_help(CMD_PTR);
+	else if (OPT_GIVEN(HELP, lpr))
+		help = lls_short_help(CMD_PTR);
+	else
+		return;
+	printf("%s\n", help);
+	free(help);
+	print_writer_helps(OPT_GIVEN(DETAILED_HELP, lpr));
+	exit(EXIT_SUCCESS);
 }
 
 struct write_task {
@@ -62,9 +66,9 @@ static int write_post_select(__a_unused struct sched *s, void *context)
 	return check_wav_post_select(wt->cwc);
 }
 
-static int setup_and_schedule(void)
+static int setup_and_schedule(struct lls_parse_result *lpr)
 {
-	int i, n, ret;
+	int i, n, ret, writer_given = OPT_GIVEN(WRITER, lpr);
 	struct btr_node *cw_btrn;
 	struct writer_node *wns;
 	static struct sched s;
@@ -75,7 +79,7 @@ static int setup_and_schedule(void)
 		EMBRACE(.name = "stdin"));
 	stdin_task_register(&sit, &s);
 
-	COPY_WAV_PARMS(&wp, &conf);
+	LLS_COPY_WAV_PARMS(&wp, LSG_WRITE_PARA_WRITE, lpr);
 	wt.cwc = check_wav_init(sit.btrn, NULL, &wp, &cw_btrn);
 	wt.task = task_register(&(struct task_info) {
 		.name = "write",
@@ -84,10 +88,11 @@ static int setup_and_schedule(void)
 		.context = &wt,
 	}, &s);
 
-	n = conf.writer_given > 0? conf.writer_given : 1;
+	n = writer_given? writer_given : 1;
 	wns = para_calloc(n * sizeof(*wns));
 	for (i = 0; i < n; i++) {
-		char *arg = i < conf.writer_given?  conf.writer_arg[i] : NULL;
+		const char *arg = i < writer_given?
+			lls_string_val(i, OPT_RESULT(WRITER, lpr)) : NULL;
 		wns[i].wid = check_writer_arg_or_die(arg, &wns[i].lpr);
 		register_writer_node(wns + i, cw_btrn, &s);
 	}
@@ -136,17 +141,23 @@ static int setup_and_schedule(void)
 int main(int argc, char *argv[])
 {
 	int ret;
-
-	write_cmdline_parser(argc, argv, &conf);
-	loglevel = get_loglevel_by_name(conf.loglevel_arg);
-	version_handle_flag("write", conf.version_given);
-	if (conf.help_given || conf.detailed_help_given)
-		print_help_and_die();
-
-	ret = setup_and_schedule();
+	struct lls_parse_result *lpr;
+	char *errctx;
+
+	ret = lls(lls_parse(argc, argv, CMD_PTR, &lpr, &errctx));
+	if (ret < 0)
+		goto out;
+	loglevel = OPT_UINT32_VAL(LOGLEVEL, lpr);
+	version_handle_flag("write",  OPT_GIVEN(VERSION, lpr));
+	handle_help_flag(lpr);
+	ret = setup_and_schedule(lpr);
+	lls_free_parse_result(lpr, CMD_PTR);
+out:
 	if (ret < 0) {
+		if (errctx)
+			PARA_ERROR_LOG("%s\n", errctx);
+		free(errctx);
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
-		exit(EXIT_FAILURE);
 	}
-	exit(EXIT_SUCCESS);
+	return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;
 }