From dc00bbbad4d589aec11c4790d9d6bf99591f01b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= Date: Tue, 17 Aug 2021 03:27:10 -0700 Subject: [PATCH] builtin/fsmonitor--daemon: use parse-options API fully MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --help and -h are already handled internally so just parse_options() do the parsing and extract the command from the remaining options. as a side effect, avoid setting a variable argc to a value that was never used. Signed-off-by: Carlo Marcelo Arenas Belón Signed-off-by: Jeff Hostetler --- builtin/fsmonitor--daemon.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/builtin/fsmonitor--daemon.c b/builtin/fsmonitor--daemon.c index df2bad5311..f049879337 100644 --- a/builtin/fsmonitor--daemon.c +++ b/builtin/fsmonitor--daemon.c @@ -20,20 +20,13 @@ int cmd_fsmonitor__daemon(int argc, const char **argv, const char *prefix) OPT_END() }; - if (argc < 2) - usage_with_options(builtin_fsmonitor__daemon_usage, options); - - if (argc == 2 && !strcmp(argv[1], "-h")) - usage_with_options(builtin_fsmonitor__daemon_usage, options); - git_config(git_default_config, NULL); - subcmd = argv[1]; - argv--; - argc++; - argc = parse_options(argc, argv, prefix, options, builtin_fsmonitor__daemon_usage, 0); + if (argc != 1) + usage_with_options(builtin_fsmonitor__daemon_usage, options); + subcmd = argv[0]; die(_("Unhandled subcommand '%s'"), subcmd); }