git.c: simplify stripping extension of a file in handle_builtin()

The handle_builtin() starts from stripping of command extension if
STRIP_EXTENSION is enabled. Actually STRIP_EXTENSION does not used
anywhere else.

This patch introduces strip_extension() helper to strip STRIP_EXTENSION
extension from argv[0] with the strip_suffix() instead of manually
stripping.

Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-compat-util.h b/git-compat-util.h
index f649e81f1107722f4c7d051201920ae2a0e7846a..b7fcbd4b86664854a71128864ae41ae55a7d633d 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -319,10 +319,6 @@ extern char *gitbasename(char *);
 #define _PATH_DEFPATH "/usr/local/bin:/usr/bin:/bin"
 #endif
 
 #define _PATH_DEFPATH "/usr/local/bin:/usr/bin:/bin"
 #endif
 

-#ifndef STRIP_EXTENSION
-#define STRIP_EXTENSION ""
-#endif
-

 #ifndef has_dos_drive_prefix
 static inline int git_has_dos_drive_prefix(const char *path)
 {
 #ifndef has_dos_drive_prefix
 static inline int git_has_dos_drive_prefix(const char *path)
 {

diff --git a/git.c b/git.c
index 5feba410cab6d95e3b9ff9745db56a9d045f0c20..a9dc2e8b492589e1f41d2c91cf4149aefe25c872 100644 (file)
--- a/git.c
+++ b/git.c
@@ -505,21 +505,25 @@ int is_builtin(const char *s)
        return !!get_builtin(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)
 {
 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;
 
        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")) {
 
        /* Turn "git cmd --help" into "git help cmd" */
        if (argc > 1 && !strcmp(argv[1], "--help")) {