diff options
-rw-r--r-- | mh/ali.c | 3 | ||||
-rw-r--r-- | mh/anno.c | 2 | ||||
-rw-r--r-- | mh/comp.c | 6 | ||||
-rw-r--r-- | mh/forw.c | 9 | ||||
-rw-r--r-- | mh/mh_getopt.c | 13 | ||||
-rw-r--r-- | mh/mh_getopt.h | 3 | ||||
-rw-r--r-- | mh/mhn.c | 1 | ||||
-rw-r--r-- | mh/pick.c | 3 | ||||
-rw-r--r-- | mh/refile.c | 1 | ||||
-rw-r--r-- | mh/repl.c | 9 | ||||
-rw-r--r-- | mh/scan.c | 2 | ||||
-rw-r--r-- | mh/send.c | 15 |
12 files changed, 51 insertions, 16 deletions
@@ -28,8 +28,7 @@ const char *program_version = "ali (" PACKAGE_STRING ")"; static char doc[] = N_("GNU MH ali")"\v" -N_("Options marked with `*' are not yet implemented.\n" -"Use -help to obtain the list of traditional MH options."); +N_("Use -help to obtain the list of traditional MH options."); static char args_doc[] = N_("aliases ..."); /* GNU options */ @@ -69,10 +69,12 @@ opt_handler (int key, char *arg, struct argp_state *state) break; case ARG_INPLACE: + mh_opt_notimpl_warning ("-inplace"); inplace = is_true (arg); break; case ARG_NOINPLACE: + mh_opt_notimpl_warning ("-noinplace"); inplace = 0; break; @@ -140,9 +140,9 @@ opt_handler (int key, char *arg, struct argp_state *state) case ARG_WHATNOWPROC: case ARG_NOWHATNOWPROC: - argp_error (state, _("option is not yet implemented")); - exit (1); - + mh_opt_notimpl ("-[no]whatnowproc"); + break; + case ARG_LICENSE: mh_license (argp_program_version); break; @@ -204,11 +204,14 @@ opt_handler (int key, char *arg, struct argp_state *state) break; case ARG_INPLACE: + mh_opt_notimpl_warning ("-inplace"); + break; + case ARG_WHATNOWPROC: case ARG_NOWHATNOWPROC: - argp_error (state, _("option is not yet implemented")); - exit (1); - + mh_opt_notimpl ("-[no]whatnowproc"); + break; + case ARG_LICENSE: mh_license (argp_program_version); break; diff --git a/mh/mh_getopt.c b/mh/mh_getopt.c index dbd385a53..2a6c9490f 100644 --- a/mh/mh_getopt.c +++ b/mh/mh_getopt.c @@ -150,3 +150,16 @@ mh_help (struct mh_option *mh_opt, const char *doc) "Run %s --help for more info on these.\n"), mu_program_name); } + +void +mh_opt_notimpl (const char *name) +{ + mu_error (_("option is not yet implemented: %s"), name); + exit (1); +} + +void +mh_opt_notimpl_warning (const char *name) +{ + mu_error (_("ignoring not implemented option %s"), name); +} diff --git a/mh/mh_getopt.h b/mh/mh_getopt.h index bd26f832a..b930cf348 100644 --- a/mh/mh_getopt.h +++ b/mh/mh_getopt.h @@ -197,3 +197,6 @@ int mh_argp_parse (int *argc, char **argv[], void mh_help (struct mh_option *mh_option, const char *doc); void mh_license (const char *name); + +void mh_opt_notimpl (const char *name); +void mh_opt_notimpl_warning (const char *name); @@ -334,6 +334,7 @@ opt_handler (int key, char *arg, struct argp_state *state) /* Display options */ case ARG_SERIALONLY: + mh_opt_notimpl_warning ("-[no]serialonly"); if (is_true (arg)) { mode_options |= OPT_SERIALONLY; @@ -29,8 +29,7 @@ const char *program_version = "pick (" PACKAGE_STRING ")"; static char doc[] = N_("GNU MH pick")"\v" -N_("Options marked with `*' are not yet implemented.\n\ -Use -help to obtain the list of traditional MH options."); +N_("Use -help to obtain the list of traditional MH options."); static char args_doc[] = N_("[messages]"); /* GNU options */ diff --git a/mh/refile.c b/mh/refile.c index 9cade4c02..5bf2faad0 100644 --- a/mh/refile.c +++ b/mh/refile.c @@ -168,6 +168,7 @@ opt_handler (int key, char *arg, struct argp_state *state) break; case ARG_PRESERVE: + mh_opt_notimpl_warning ("-preserve"); preserve_flag = is_true(arg); break; @@ -256,11 +256,14 @@ opt_handler (int key, char *arg, struct argp_state *state) break; case ARG_INPLACE: + mh_opt_notimpl_warning ("-inplace"); + break; + case ARG_WHATNOWPROC: case ARG_NOWHATNOWPROC: - argp_error (state, _("Option is not yet implemented")); - exit (1); - + mh_opt_notimpl ("-[no]whatnowproc"); + break; + case ARG_LICENSE: mh_license (argp_program_version); break; @@ -134,7 +134,7 @@ opt_handler (int key, char *arg, struct argp_state *state) break; case ARG_FILE: - argp_error (state, _("Option is not yet implemented")); + mh_opt_notimpl ("-file"); break; case ARG_LICENSE: @@ -170,30 +170,40 @@ opt_handler (int key, char *arg, struct argp_state *state) break; case ARG_FILTER: + mh_opt_notimpl ("-filter"); + break; + case ARG_NOFILTER: - return 1; - + mh_opt_notimpl ("-nofilter"); + break; + case ARG_FORMAT: + mh_opt_notimpl_warning ("-format"); reformat_recipients = is_true (arg); break; case ARG_NOFORMAT: + mh_opt_notimpl_warning ("-noformat"); reformat_recipients = 0; break; case ARG_FORWARD: + mh_opt_notimpl_warning ("-forward"); forward_notice = is_true (arg); break; case ARG_NOFORWARD: + mh_opt_notimpl_warning ("-noforward"); forward_notice = 0; break; case ARG_MIME: + mh_opt_notimpl_warning ("-mime"); mime_encaps = is_true (arg); break; case ARG_NOMIME: + mh_opt_notimpl_warning ("-nomime"); mime_encaps = 0; break; @@ -244,6 +254,7 @@ opt_handler (int key, char *arg, struct argp_state *state) break; case ARG_WIDTH: + mh_opt_notimpl_warning ("-width"); width = strtoul (arg, &p, 10); if (*p) { |