From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Han-Wen Nienhuys <hanwenn@gmail.com>,
Han-Wen Nienhuys <hanwen@google.com>, Jeff King <peff@peff.net>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH 4/6] fixup! reftable: rest of library
Date: Sat, 28 Nov 2020 06:44:36 +0000 [thread overview]
Message-ID: <5c3bdc212962a24f8f23207c6b1b3504c53903ad.1606545878.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.801.git.1606545878.gitgitgadget@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Avoid using `getopt()`: it might be POSIX, but Git's audience is much
larger than POSIX. MSVC, for example, does not support `getopt()`.
Without this patch, the `vs-build` job of our CI/PR builds would simply
fail completely.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
reftable/dump.c | 32 +++++++++++++-------------------
1 file changed, 13 insertions(+), 19 deletions(-)
diff --git a/reftable/dump.c b/reftable/dump.c
index 0bd7a1cfa6..e990bffe0c 100644
--- a/reftable/dump.c
+++ b/reftable/dump.c
@@ -167,40 +167,34 @@ static void print_help(void)
int reftable_dump_main(int argc, char *const *argv)
{
int err = 0;
- int opt;
int opt_dump_table = 0;
int opt_dump_stack = 0;
int opt_compact = 0;
- const char *arg = NULL;
- while ((opt = getopt(argc, argv, "2chts")) != -1) {
- switch (opt) {
- case '2':
- hash_id = 0x73323536;
+ const char *arg = NULL, *argv0 = argv[0];
+
+ for (; argc > 1; argv++, argc--)
+ if (*argv[1] != '-')
break;
- case 't':
+ else if (!strcmp("-2", argv[1]))
+ hash_id = 0x73323536;
+ else if (!strcmp("-t", argv[1]))
opt_dump_table = 1;
- break;
- case 's':
+ else if (!strcmp("-s", argv[1]))
opt_dump_stack = 1;
- break;
- case 'c':
+ else if (!strcmp("-c", argv[1]))
opt_compact = 1;
- break;
- case '?':
- case 'h':
+ else if (!strcmp("-?", argv[1]) || !strcmp("-h", argv[1])) {
print_help();
return 2;
- break;
}
- }
- if (argv[optind] == NULL) {
+ if (argc != 2) {
fprintf(stderr, "need argument\n");
print_help();
return 2;
}
- arg = argv[optind];
+ arg = argv[1];
if (opt_dump_table) {
err = dump_table(arg);
@@ -211,7 +205,7 @@ int reftable_dump_main(int argc, char *const *argv)
}
if (err < 0) {
- fprintf(stderr, "%s: %s: %s\n", argv[0], arg,
+ fprintf(stderr, "%s: %s: %s\n", argv0, arg,
reftable_error_str(err));
return 1;
}
--
gitgitgadget
next prev parent reply other threads:[~2020-11-28 22:55 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-28 6:44 [PATCH 0/6] Minimal patches to let reftable pass the CI builds Johannes Schindelin via GitGitGadget
2020-11-28 6:44 ` [PATCH 1/6] fixup! reftable: rest of library Johannes Schindelin via GitGitGadget
2020-12-01 14:32 ` Han-Wen Nienhuys
2020-12-02 10:57 ` Johannes Schindelin
2020-12-02 18:31 ` Reftable locking on Windows (Re: [PATCH 1/6] fixup! reftable: rest of library) Han-Wen Nienhuys
2020-12-03 12:24 ` Ævar Arnfjörð Bjarmason
2020-12-03 13:56 ` Han-Wen Nienhuys
2020-11-28 6:44 ` [PATCH 2/6] fixup! reftable: utility functions Johannes Schindelin via GitGitGadget
2020-11-28 6:44 ` [PATCH 3/6] fixup! reftable: rest of library Johannes Schindelin via GitGitGadget
2020-12-01 10:26 ` Jeff King
2020-12-01 11:10 ` Han-Wen Nienhuys
2020-12-01 11:57 ` Jeff King
2020-11-28 6:44 ` Johannes Schindelin via GitGitGadget [this message]
2020-11-28 6:44 ` [PATCH 5/6] " Johannes Schindelin via GitGitGadget
2020-11-28 6:44 ` [PATCH 6/6] " Johannes Schindelin via GitGitGadget
2020-12-01 10:28 ` Jeff King
2020-12-01 14:24 ` Johannes Schindelin
2020-12-02 1:50 ` Jeff King
2020-12-02 11:01 ` Han-Wen Nienhuys
2020-12-02 12:43 ` Jeff King
2020-11-30 14:26 ` [PATCH 0/6] Minimal patches to let reftable pass the CI builds Han-Wen Nienhuys
2020-12-01 14:18 ` Johannes Schindelin
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5c3bdc212962a24f8f23207c6b1b3504c53903ad.1606545878.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=hanwen@google.com \
--cc=hanwenn@gmail.com \
--cc=johannes.schindelin@gmx.de \
--cc=peff@peff.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).