Make gengetopt descriptions work.

[paraslash.git] / write.c

diff --git a/write.c b/write.c
index 0be4a783cfb196a8b8b66f43c00a91abca578c54..73cddf8cad85a0afd8aaad9100ac4a5d66d747a7 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.
  */
@@ -39,8 +39,7 @@ __noreturn static void print_help_and_die(void)
        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", version_single_line("write"));
        printf_or_die("%s\n\n", write_args_info_usage);
        for (; *p; p++)
                printf_or_die("%s\n", *p);
@@ -86,10 +85,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,7 +106,6 @@ 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);
@@ -173,9 +171,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();