summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-02-26 13:37:13 -0800
committerJunio C Hamano <gitster@pobox.com>2016-02-26 13:37:13 -0800
commitdede29612a723a7da9f489fecbdf02500a018430 (patch)
treee09b30d6a8ec19c8d8ff4e92b8f7246fc6b7d1ec /git.c
parent7943cba1ded6c5e295d06f9de6664999db5a09a8 (diff)
parent63ca1c099c36e61b0e9cd7fa0b912c0b9d89b628 (diff)
downloadgit-dede29612a723a7da9f489fecbdf02500a018430.tar.gz
Merge branch 'ak/git-strip-extension-from-dashed-command'
Code simplification. * ak/git-strip-extension-from-dashed-command: git.c: simplify stripping extension of a file in handle_builtin()
Diffstat (limited to 'git.c')
-rw-r--r--git.c26
1 files changed, 15 insertions, 11 deletions
diff --git a/git.c b/git.c
index 6c64c9430e..9bc04fd528 100644
--- a/git.c
+++ b/git.c
@@ -513,21 +513,25 @@ int is_builtin(const char *s)
return !!get_builtin(s);
}
+#ifdef STRIP_EXTENSION
+static void strip_extension(const char **argv)
+{
+ size_t len;
+
+ if (strip_suffix(argv[0], STRIP_EXTENSION, &len))
+ argv[0] = xmemdupz(argv[0], len);
+}
+#else
+#define strip_extension(cmd)
+#endif
+
static void handle_builtin(int argc, const char **argv)
{
- const char *cmd = argv[0];
- int i;
- static const char ext[] = STRIP_EXTENSION;
+ const char *cmd;
struct cmd_struct *builtin;
- if (sizeof(ext) > 1) {
- i = strlen(argv[0]) - strlen(ext);
- if (i > 0 && !strcmp(argv[0] + i, ext)) {
- char *argv0 = xstrdup(argv[0]);
- argv[0] = cmd = argv0;
- argv0[i] = '\0';
- }
- }
+ strip_extension(argv);
+ cmd = argv[0];
/* Turn "git cmd --help" into "git help cmd" */
if (argc > 1 && !strcmp(argv[1], "--help")) {