kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Đoàn Trần Công Danh 2021-05-06 22:02:20 +07:00 committed by Junio C Hamano
parent d582992e80
commit dd9323b7fb
1 changed files with 45 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
builtin/mailinfo.c
View File

@ -7,9 +7,13 @@
#include "utf8.h" #include "utf8.h"
#include "strbuf.h" #include "strbuf.h"
#include "mailinfo.h" #include "mailinfo.h"
#include "parse-options.h"


static const char mailinfo_usage[] = static const char * const mailinfo_usage[] = {
"git mailinfo [-k | -b] [-m | --message-id] [-u | --encoding=<encoding> | -n] [--scissors | --no-scissors] <msg> <patch> < mail >info"; /* TRANSLATORS: keep <> in "<" mail ">" info. */
N_("git mailinfo [<options>] <msg> <patch> < mail >info"),
NULL,
};


struct metainfo_charset struct metainfo_charset
{ {
@ -21,6 +25,19 @@ struct metainfo_charset
const char *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) int cmd_mailinfo(int argc, const char **argv, const char *prefix)
{ {
struct metainfo_charset meta_charset; struct metainfo_charset meta_charset;
@ -28,36 +45,34 @@ int cmd_mailinfo(int argc, const char **argv, const char *prefix)
int status; int status;
char *msgfile, *patchfile; 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); setup_mailinfo(&mi);
meta_charset.policy = CHARSET_DEFAULT; meta_charset.policy = CHARSET_DEFAULT;


while (1 < argc && argv[1][0] == '-') { argc = parse_options(argc, argv, prefix, options, mailinfo_usage, 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++;
}


if (argc != 3) if (argc != 2)
usage(mailinfo_usage); usage_with_options(mailinfo_usage, options);


switch (meta_charset.policy) { switch (meta_charset.policy) {
case CHARSET_DEFAULT: case CHARSET_DEFAULT:
@ -75,8 +90,8 @@ int cmd_mailinfo(int argc, const char **argv, const char *prefix)
mi.input = stdin; mi.input = stdin;
mi.output = stdout; mi.output = stdout;


msgfile = prefix_filename(prefix, argv[1]); msgfile = prefix_filename(prefix, argv[0]);
patchfile = prefix_filename(prefix, argv[2]); patchfile = prefix_filename(prefix, argv[1]);


status = !!mailinfo(&mi, msgfile, patchfile); status = !!mailinfo(&mi, msgfile, patchfile);
clear_mailinfo(&mi); clear_mailinfo(&mi);