]> asedeno.scripts.mit.edu Git - git.git/commitdiff
list_commands(): simplify code by using chdir()
authorScott R Parish <srp@srparish.net>
Sat, 27 Oct 2007 08:36:52 +0000 (01:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 Oct 2007 03:51:37 +0000 (20:51 -0700)
The current code builds absolute path strings for each file to
stat(), this can easily be avoided by chdir()ing into the directory.

Signed-off-by: Scott R Parish <srp@srparish.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
help.c

diff --git a/help.c b/help.c
index 3d08973c9d6beab25f04daea72f7bdc22ac5d1a0..34ac5db60188d3b5d6984fcfcbbd30db018a9b3f 100644 (file)
--- a/help.c
+++ b/help.c
@@ -96,36 +96,24 @@ static void pretty_print_string_list(struct cmdname **cmdname, int longest)
 static void list_commands(const char *exec_path)
 {
        unsigned int longest = 0;
-       char path[PATH_MAX];
        const char *prefix = "git-";
        int prefix_len = strlen(prefix);
-       int dirlen;
        DIR *dir = opendir(exec_path);
        struct dirent *de;
 
-       if (!dir) {
+       if (!dir || chdir(exec_path)) {
                fprintf(stderr, "git: '%s': %s\n", exec_path, strerror(errno));
                exit(1);
        }
 
-       dirlen = strlen(exec_path);
-       if (PATH_MAX - 20 < dirlen) {
-               fprintf(stderr, "git: insanely long exec-path '%s'\n",
-                       exec_path);
-               exit(1);
-       }
-
-       memcpy(path, exec_path, dirlen);
-       path[dirlen++] = '/';
-
        while ((de = readdir(dir)) != NULL) {
                struct stat st;
                int entlen;
 
                if (prefixcmp(de->d_name, prefix))
                        continue;
-               strcpy(path+dirlen, de->d_name);
-               if (stat(path, &st) || /* stat, not lstat */
+
+               if (stat(de->d_name, &st) || /* stat, not lstat */
                    !S_ISREG(st.st_mode) ||
                    !(st.st_mode & S_IXUSR))
                        continue;