From: Pierre Habouzit <madcoder@debian•org>
To: Wincent Colaiuta <win@wincent•com>,
Junio C Hamano <gitster@pobox•com>,
git@vger•kernel.org
Subject: [PATCH] Have a flag to stop the option parsing at the first argument.
Date: Mon, 17 Dec 2007 10:50:14 +0100 [thread overview]
Message-ID: <20071217095014.GF7453@artemis.madism.org> (raw)
In-Reply-To: <20071217092013.GD7453@artemis.madism.org>
[-- Attachment #1: Type: text/plain, Size: 1737 bytes --]
Signed-off-by: Pierre Habouzit <madcoder@debian•org>
---
> // ...
> /* when in `git --opt1 --opt2 foo -a -b -c` mode: */
> int cmd_pos = git_find_builtin_command_name(argc, argv);
> int count = parse_options(cmd_pos, argv, git_generic_options,
> "git [special-options] cmd [options]", 0);
> if (count)
> die("unknown git command: `%s`", argv[0]);
> argv += cmd_pos;
> argc -= cmd_pos;
> /* here we simulate an argv of {"foo", "-a", "-b", "-c"} */
Or even simpler, with the following specifically tailored patch you
can directly write:
argc = parse_options(argc, argv, git_generic_options,
"git [generic-options] <command> [cmd-options]",
PARSE_OPT_STOP_AT_ARG);
and then {argc, argv} will exactly be the NULL-terminated array
starting with the builtin command. Kind of nice :)
parse-options.c | 2 ++
parse-options.h | 1 +
2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/parse-options.c b/parse-options.c
index 7a08a0c..4f5c55e 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -229,6 +229,8 @@ int parse_options(int argc, const char **argv, const struct option *options,
const char *arg = args.argv[0];
if (*arg != '-' || !arg[1]) {
+ if (flags & PARSE_OPT_STOP_AT_ARG)
+ break;
argv[j++] = args.argv[0];
continue;
}
diff --git a/parse-options.h b/parse-options.h
index 102ac31..7c636b9 100644
--- a/parse-options.h
+++ b/parse-options.h
@@ -18,6 +18,7 @@ enum parse_opt_type {
enum parse_opt_flags {
PARSE_OPT_KEEP_DASHDASH = 1,
+ PARSE_OPT_STOP_AT_ARG = 2,
};
enum parse_opt_option_flags {
--
1.5.4.rc0.1147.gfd22d
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2007-12-17 9:50 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-14 11:23 [PATCH 0/3] diff topic tweaks Wincent Colaiuta
2007-12-14 11:23 ` [PATCH 1/3] Revert changes and extend diff option documentation Wincent Colaiuta
2007-12-14 11:23 ` [PATCH 2/3] Use shorter error messages for whitespace problems Wincent Colaiuta
2007-12-14 11:23 ` [PATCH 3/3] Test interaction between diff --check and --exit-code Wincent Colaiuta
2007-12-16 19:43 ` [PATCH 1/3] Revert changes and extend diff option documentation Junio C Hamano
2007-12-17 8:27 ` git.c option parsing (was: [PATCH 1/3] Revert changes and extend diff option documentation) Wincent Colaiuta
2007-12-17 8:48 ` git.c option parsing Junio C Hamano
2007-12-17 9:01 ` Wincent Colaiuta
2007-12-17 9:20 ` Pierre Habouzit
2007-12-17 9:26 ` Pierre Habouzit
2007-12-17 9:50 ` Pierre Habouzit [this message]
2007-12-17 10:34 ` [PATCH] Have a flag to stop the option parsing at the first argument Johannes Schindelin
2007-12-17 11:10 ` Wincent Colaiuta
2007-12-17 11:47 ` Pierre Habouzit
2007-12-17 11:50 ` Johannes Schindelin
2007-12-17 12:06 ` Wincent Colaiuta
2007-12-17 12:26 ` Johannes Schindelin
2007-12-17 12:40 ` Wincent Colaiuta
2007-12-17 12:55 ` Johannes Schindelin
2007-12-17 13:12 ` Wincent Colaiuta
2007-12-17 13:30 ` Johannes Schindelin
2007-12-17 13:57 ` Wincent Colaiuta
2007-12-17 15:13 ` Johannes Sixt
2007-12-17 16:29 ` Pierre Habouzit
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=20071217095014.GF7453@artemis.madism.org \
--to=madcoder@debian$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=win@wincent$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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