From: Jonathan Nieder <jrnieder@gmail.com>
To: Matthieu Moy <Matthieu.Moy@imag.fr>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH 1/4] Allow detached form (e.g. "-S foo" instead of "-Sfoo") for diff options
Date: Tue, 27 Jul 2010 16:37:50 -0500 [thread overview]
Message-ID: <20100727213750.GB11768@burratino> (raw)
In-Reply-To: <1280265719-30968-2-git-send-email-Matthieu.Moy@imag.fr>
Matthieu Moy wrote:
> +++ b/diff.c
> @@ -2990,9 +2990,23 @@ static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *va
[...]
> +#define IF_SHORT_OPT(optname) \
> + ((!strcmp(arg, "-" #optname) \
> + && (argv[1] || (die("Option `" #optname "' requires a value"), 1), \
> + optarg = argv[1], \
> + argcount = 2, \
> + 1)) || \
> + (!prefixcmp(arg, "-" #optname) \
> + && (optarg = arg + strlen("-" #optname), \
> + argcount = 1, \
> + 1)))
> +
Why not something like this?
static inline int short_opt(char opt, const char *arg,
const char *argv, const char **optarg)
{
if (arg[0] != '-' || arg[1] != opt)
return 0;
if (arg[2] != '\0') {
*optarg = arg + strlen("-c");
return 1;
}
if (!argv[1])
die("Option '%c' requires a value", opt);
*optarg = argv[1];
return 2;
}
and then:
if ((argcount = short_opt('S', arg, argv, &optarg))) {
...
> +++ b/diff.h
> @@ -214,6 +214,21 @@ extern void diff_unmerge(struct diff_options *,
> #define DIFF_SETUP_USE_CACHE 2
> #define DIFF_SETUP_USE_SIZE_CACHE 4
>
> +/*
> + * Poor man's alternative to parse-option, only meant to be used in
> + * handle_revision_opt and diff_opt_parse.
> + */
> +#define IF_LONG_OPT(optname) \
> + ((!strcmp(arg, "--" #optname) \
> + && (argv[1] || (die("Option `" #optname "' requires a value"), 1), \
> + optarg = argv[1], \
> + argcount = 2, \
> + 1)) || \
> + (!prefixcmp(arg, "--" #optname "=") \
> + && (optarg = arg + strlen("--" #optname "="), \
> + argcount = 1, \
> + 1)))
static int long_opt(const char *opt, const char *arg,
const char **argv, const char **optarg)
{
if (arg[0] != '-' || arg[1] != '-')
return 0;
if (prefixcmp(arg, opt))
return 0;
arg += strlen("--") + strlen(opt);
if (*arg == '=') {
*optarg = arg + 1;
return 1;
}
if (*arg != '\0')
return 0;
if (!argv[1])
die("Option '--%s' requires a value", opt);
*optarg = argv[1];
return 2;
}
Jonathan
next prev parent reply other threads:[~2010-07-27 21:39 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-27 21:21 [PATCH 0/4] Allow detached forms (--option arg) for git log and friends Matthieu Moy
2010-07-27 21:21 ` [PATCH 1/4] Allow detached form (e.g. "-S foo" instead of "-Sfoo") for diff options Matthieu Moy
2010-07-27 21:37 ` Jonathan Nieder [this message]
2010-07-28 7:38 ` Matthieu Moy
2010-07-28 9:40 ` [PATCH 1/4 v2] " Matthieu Moy
2010-07-29 2:00 ` Jonathan Nieder
2010-07-29 7:19 ` Matthieu Moy
2010-07-29 16:54 ` Junio C Hamano
2010-07-28 9:41 ` [PATCH 2/4 v2] Allow detached form for git diff --stat-name-width and --stat-width Matthieu Moy
2010-07-29 2:36 ` Jonathan Nieder
2010-07-29 2:37 ` [PATCH 1/2] diff: split off a function for --stat-* option parsing Jonathan Nieder
2010-07-29 2:38 ` [PATCH 2/2] diff: allow --stat-width n, --stat-name-width n Jonathan Nieder
2010-07-28 9:41 ` [PATCH 3/4 v2] Allow detached form (e.g. "git log --grep foo") in log options Matthieu Moy
2010-07-28 10:11 ` Ævar Arnfjörð Bjarmason
2010-07-28 11:29 ` Matthieu Moy
2010-07-28 12:56 ` Ævar Arnfjörð Bjarmason
2010-07-28 14:00 ` Matthieu Moy
2010-07-28 15:03 ` Ævar Arnfjörð Bjarmason
2010-07-29 2:46 ` Jonathan Nieder
2010-07-28 9:41 ` [PATCH 4/4 v2] Allow detached form for --glob, --branches, --tags and --remote Matthieu Moy
2010-07-29 2:48 ` Jonathan Nieder
2010-07-27 21:21 ` [PATCH 2/4] Allow detached form for git diff --stat-name-width and --stat-width Matthieu Moy
2010-07-27 21:21 ` [PATCH 3/4] Allow detached form (e.g. "git log --grep foo") in log options Matthieu Moy
2010-07-27 21:21 ` [PATCH 4/4] Allow detached form for --glob, --branches, --tags and --remote Matthieu Moy
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=20100727213750.GB11768@burratino \
--to=jrnieder@gmail.com \
--cc=Matthieu.Moy@imag.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).