mood: Deduplicate score formula.

[paraslash.git] / write.c

diff --git a/write.c b/write.c
index 453824ace679f97feaa24c0d74b61ebdd83b049f..6799db4175282b779c2fd454d11988be31b933d8 100644 (file)
--- 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);
 }
 
@@ -75,31 +70,54 @@ static void setup_writer_node(const char *arg, struct btr_node *parent,
        register_writer_node(wn, parent, s);
 }
 
+struct write_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);
+       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);
+       return check_wav_post_select(wt->cwc);
+}
+
 static int setup_and_schedule(void)
 {
        int i, ret;
-       struct check_wav_task *cwt;
-       struct btr_node *cwt_btrn;
+       struct btr_node *cw_btrn;
        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",
+               },
+       };
 
-       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);
-       cwt = check_wav_init(&s, sit.btrn, &wp, &cwt_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));
-               setup_writer_node(NULL, cwt_btrn, wns, &s);
+               setup_writer_node(NULL, cw_btrn, wns, &s);
                i = 1;
        } else {
                wns = para_calloc(conf.writer_given * sizeof(*wns));
                for (i = 0; i < conf.writer_given; i++)
-                       setup_writer_node(conf.writer_arg[i], cwt_btrn,
+                       setup_writer_node(conf.writer_arg[i], cw_btrn,
                                wns + i, &s);
        }
 
@@ -130,7 +148,7 @@ static int setup_and_schedule(void)
                free(wn->conf);
        }
        free(wns);
-       check_wav_shutdown(cwt);
+       check_wav_shutdown(wt.cwc);
        return ret;
 }
 
@@ -149,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();