From: Johannes Schindelin <johannes.schindelin@xxxxxx>
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@xxxxxx>
---
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
