mailinfo: stop parsing options manually

In a later change, mailinfo will learn more options, let's switch to our
robust parse_options framework before that step.

Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c
index 77f96177ccd7cfb62b7848717b453cec98f3d16f..f55549a0975ac01bb15c0523fdeaf809b4b00f0d 100644 (file)
--- a/builtin/mailinfo.c
+++ b/builtin/mailinfo.c
@@ -7,9 +7,13 @@
 #include "utf8.h"
 #include "strbuf.h"
 #include "mailinfo.h"
+#include "parse-options.h"
 
-static const char mailinfo_usage[] =
-       "git mailinfo [-k | -b] [-m | --message-id] [-u | --encoding=<encoding> | -n] [--scissors | --no-scissors] <msg> <patch> < mail >info";
+static const char * const mailinfo_usage[] = {
+       /* TRANSLATORS: keep <> in "<" mail ">" info. */
+       N_("git mailinfo [<options>] <msg> <patch> < mail >info"),
+       NULL,
+};
 
 struct metainfo_charset
 {
@@ -21,6 +25,19 @@ struct metainfo_charset
        const char *charset;
 };
 
+static int parse_opt_explicit_encoding(const struct option *opt,
+                                      const char *arg, int unset)
+{
+       struct metainfo_charset *meta_charset = opt->value;
+
+       BUG_ON_OPT_NEG(unset);
+
+       meta_charset->policy = CHARSET_EXPLICIT;
+       meta_charset->charset = arg;
+
+       return 0;
+}
+
 int cmd_mailinfo(int argc, const char **argv, const char *prefix)
 {
        struct metainfo_charset meta_charset;
@@ -28,36 +45,34 @@ int cmd_mailinfo(int argc, const char **argv, const char *prefix)
        int status;
        char *msgfile, *patchfile;
 
+       struct option options[] = {
+               OPT_BOOL('k', NULL, &mi.keep_subject, N_("keep subject")),
+               OPT_BOOL('b', NULL, &mi.keep_non_patch_brackets_in_subject,
+                        N_("keep non patch brackets in subject")),
+               OPT_BOOL('m', "message-id", &mi.add_message_id,
+                        N_("copy Message-ID to the end of commit message")),
+               OPT_SET_INT_F('u', NULL, &meta_charset.policy,
+                             N_("re-code metadata to i18n.commitEncoding"),
+                             CHARSET_DEFAULT, PARSE_OPT_NONEG),
+               OPT_SET_INT_F('n', NULL, &meta_charset.policy,
+                             N_("disable charset re-coding of metadata"),
+                             CHARSET_NO_REENCODE, PARSE_OPT_NONEG),
+               OPT_CALLBACK_F(0, "encoding", &meta_charset, N_("encoding"),
+                              N_("re-code metadata to this encoding"),
+                              PARSE_OPT_NONEG, parse_opt_explicit_encoding),
+               OPT_BOOL(0, "scissors", &mi.use_scissors, N_("use scissors")),
+               OPT_HIDDEN_BOOL(0, "inbody-headers", &mi.use_inbody_headers,
+                        N_("use headers in message's body")),
+               OPT_END()
+       };
+
        setup_mailinfo(&mi);
        meta_charset.policy = CHARSET_DEFAULT;
 
-       while (1 < argc && argv[1][0] == '-') {
-               if (!strcmp(argv[1], "-k"))
-                       mi.keep_subject = 1;
-               else if (!strcmp(argv[1], "-b"))
-                       mi.keep_non_patch_brackets_in_subject = 1;
-               else if (!strcmp(argv[1], "-m") || !strcmp(argv[1], "--message-id"))
-                       mi.add_message_id = 1;
-               else if (!strcmp(argv[1], "-u"))
-                       meta_charset.policy = CHARSET_DEFAULT;
-               else if (!strcmp(argv[1], "-n"))
-                       meta_charset.policy = CHARSET_NO_REENCODE;
-               else if (starts_with(argv[1], "--encoding=")) {
-                       meta_charset.policy = CHARSET_EXPLICIT;
-                       meta_charset.charset = argv[1] + 11;
-               } else if (!strcmp(argv[1], "--scissors"))
-                       mi.use_scissors = 1;
-               else if (!strcmp(argv[1], "--no-scissors"))
-                       mi.use_scissors = 0;
-               else if (!strcmp(argv[1], "--no-inbody-headers"))
-                       mi.use_inbody_headers = 0;
-               else
-                       usage(mailinfo_usage);
-               argc--; argv++;
-       }
+       argc = parse_options(argc, argv, prefix, options, mailinfo_usage, 0);
 
-       if (argc != 3)
-               usage(mailinfo_usage);
+       if (argc != 2)
+               usage_with_options(mailinfo_usage, options);
 
        switch (meta_charset.policy) {
        case CHARSET_DEFAULT:
@@ -75,8 +90,8 @@ int cmd_mailinfo(int argc, const char **argv, const char *prefix)
        mi.input = stdin;
        mi.output = stdout;
 
-       msgfile = prefix_filename(prefix, argv[1]);
-       patchfile = prefix_filename(prefix, argv[2]);
+       msgfile = prefix_filename(prefix, argv[0]);
+       patchfile = prefix_filename(prefix, argv[1]);
 
        status = !!mailinfo(&mi, msgfile, patchfile);
        clear_mailinfo(&mi);