From: "Đoàn Trần Công Danh" <congdanhqx@gmail.com> To: git@vger.kernel.org Cc: "Đoàn Trần Công Danh" <congdanhqx@gmail.com>, "Junio C Hamano" <gitster@pobox.com>, "brian m. carlson" <sandals@crustytoothpaste.net> Subject: [PATCH v2 1/5] mailinfo: avoid magic number in option parsing Date: Wed, 5 May 2021 00:19:58 +0700 [thread overview] Message-ID: <e1e0d8196197d0eb3a39454a48b112a5843d33d7.1620148732.git.congdanhqx@gmail.com> (raw) In-Reply-To: <cover.1620148732.git.congdanhqx@gmail.com> While current magic number is perfectly correct, in a later change, we would like to parse for another option, namely "--quoted-cr". Let's refactor a bit to remove that magic number. Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> --- builtin/mailinfo.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c index cfb667a594..b309badce5 100644 --- a/builtin/mailinfo.c +++ b/builtin/mailinfo.c @@ -24,6 +24,7 @@ int cmd_mailinfo(int argc, const char **argv, const char *prefix) mi.metainfo_charset = def_charset; while (1 < argc && argv[1][0] == '-') { + const char *str; if (!strcmp(argv[1], "-k")) mi.keep_subject = 1; else if (!strcmp(argv[1], "-b")) @@ -34,8 +35,8 @@ int cmd_mailinfo(int argc, const char **argv, const char *prefix) mi.metainfo_charset = def_charset; else if (!strcmp(argv[1], "-n")) mi.metainfo_charset = NULL; - else if (starts_with(argv[1], "--encoding=")) - mi.metainfo_charset = argv[1] + 11; + else if (skip_prefix(argv[1], "--encoding=", &str)) + mi.metainfo_charset = str; else if (!strcmp(argv[1], "--scissors")) mi.use_scissors = 1; else if (!strcmp(argv[1], "--no-scissors")) -- 2.31.1.500.gbc6bbdd36b
next prev parent reply other threads:[~2021-05-04 17:20 UTC|newest] Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-21 1:34 [PATCH] mailinfo: strip CR from base64/quoted-printable email Đoàn Trần Công Danh 2021-04-21 2:09 ` Junio C Hamano 2021-04-21 3:32 ` brian m. carlson 2021-04-21 12:07 ` Đoàn Trần Công Danh 2021-04-22 1:10 ` brian m. carlson 2021-05-04 17:19 ` [PATCH v2 0/5] Teach am/mailinfo to process quoted CR Đoàn Trần Công Danh 2021-05-04 17:19 ` Đoàn Trần Công Danh [this message] 2021-05-04 17:19 ` [PATCH v2 2/5] mailinfo: warn if CR found in base64/quoted-printable email Đoàn Trần Công Danh 2021-05-05 3:41 ` Junio C Hamano 2021-05-04 17:20 ` [PATCH v2 3/5] mailinfo: skip quoted CR on user's wish Đoàn Trần Công Danh 2021-05-05 4:12 ` Junio C Hamano 2021-05-05 15:53 ` Đoàn Trần Công Danh 2021-05-04 17:20 ` [PATCH v2 4/5] mailinfo: strip quoted CR on users' wish Đoàn Trần Công Danh 2021-05-05 4:27 ` Junio C Hamano 2021-05-04 17:20 ` [PATCH v2 5/5] am: learn to process quoted lines that ends with CRLF Đoàn Trần Công Danh 2021-05-05 4:31 ` [PATCH v2 0/5] Teach am/mailinfo to process quoted CR Junio C Hamano 2021-05-06 15:02 ` [PATCH v3 0/6] " Đoàn Trần Công Danh 2021-05-06 15:02 ` [PATCH v3 1/6] mailinfo: load default metainfo_charset lazily Đoàn Trần Công Danh 2021-05-06 15:02 ` [PATCH v3 2/6] mailinfo: stop parsing options manually Đoàn Trần Công Danh 2021-05-08 10:44 ` Junio C Hamano 2021-05-06 15:02 ` [PATCH v3 3/6] mailinfo: warn if CR found in decoded base64/QP email Đoàn Trần Công Danh 2021-05-08 10:52 ` Junio C Hamano 2021-05-06 15:02 ` [PATCH v3 4/6] mailinfo: allow squelching quoted CR warning Đoàn Trần Công Danh 2021-05-06 15:02 ` [PATCH v3 5/6] mailinfo: allow stripping quoted CR without warning Đoàn Trần Công Danh 2021-05-06 15:02 ` [PATCH v3 6/6] am: learn to process quoted lines that ends with CRLF Đoàn Trần Công Danh 2021-05-08 10:57 ` [PATCH v3 0/6] Teach am/mailinfo to process quoted CR Junio C Hamano [not found] ` <cover.1620309355.git.congdanhqx@gmail.com> 2021-05-06 15:02 ` [PATCH v3 2/6] mailinfo: stop parse options manually Đoàn Trần Công Danh 2021-05-06 15:19 ` Đoàn Trần Công Danh 2021-05-09 17:12 ` [PATCH v4 0/6] Teach am/mailinfo to process quoted CR Đoàn Trần Công Danh 2021-05-09 17:12 ` [PATCH v4 1/6] mailinfo: load default metainfo_charset lazily Đoàn Trần Công Danh 2021-05-09 17:12 ` [PATCH v4 2/6] mailinfo: stop parsing options manually Đoàn Trần Công Danh 2021-05-09 17:12 ` [PATCH v4 3/6] mailinfo: warn if CRLF found in decoded base64/QP email Đoàn Trần Công Danh 2021-05-09 17:12 ` [PATCH v4 4/6] mailinfo: allow squelching quoted CRLF warning Đoàn Trần Công Danh 2021-05-09 17:12 ` [PATCH v4 5/6] mailinfo: allow stripping quoted CR without warning Đoàn Trần Công Danh 2021-05-09 17:12 ` [PATCH v4 6/6] am: learn to process quoted lines that ends with CRLF Đoàn Trần Công Danh
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=e1e0d8196197d0eb3a39454a48b112a5843d33d7.1620148732.git.congdanhqx@gmail.com \ --to=congdanhqx@gmail.com \ --cc=git@vger.kernel.org \ --cc=gitster@pobox.com \ --cc=sandals@crustytoothpaste.net \ --subject='Re: [PATCH v2 1/5] mailinfo: avoid magic number in option parsing' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).