describe: omit clearing marks on the last one.

diff --git a/git.c b/git.c
index bdd3f8d01c0be5edeccf8b99c98a1cff5d70dbc2..5e7da74b6800a4256f9bcb0d0add7560213271e1 100644 (file)
--- a/git.c
+++ b/git.c
@@ -8,6 +8,8 @@
 #include <errno.h>
 #include <limits.h>
 #include <stdarg.h>
+#include <sys/ioctl.h>
+#include "git-compat-util.h"
 
 #ifndef PATH_MAX
 # define PATH_MAX 4096
@@ -25,6 +27,16 @@ static int term_columns(void)
        if (col_string && (n_cols = atoi(col_string)) > 0)
                return n_cols;
 
+#ifdef TIOCGWINSZ
+       {
+               struct winsize ws;
+               if (!ioctl(1, TIOCGWINSZ, &ws)) {
+                       if (ws.ws_col)
+                               return ws.ws_col;
+               }
+       }
+#endif
+
        return 80;
 }
 
@@ -73,25 +85,28 @@ static int cmdname_compare(const void *a_, const void *b_)
 
 static void pretty_print_string_list(struct cmdname **cmdname, int longest)
 {
-       int cols = 1;
+       int cols = 1, rows;
        int space = longest + 1; /* min 1 SP between words */
        int max_cols = term_columns() - 1; /* don't print *on* the edge */
-       int i;
+       int i, j;
 
        if (space < max_cols)
                cols = max_cols / space;
+       rows = (cmdname_cnt + cols - 1) / cols;
 
        qsort(cmdname, cmdname_cnt, sizeof(*cmdname), cmdname_compare);
 
-       for (i = 0; i < cmdname_cnt; ) {
-               int c;
+       for (i = 0; i < rows; i++) {
                printf("  ");
 
-               for (c = cols; c && i < cmdname_cnt; i++) {
-                       printf("%s", cmdname[i]->name);
-
-                       if (--c)
-                               mput_char(' ', space - cmdname[i]->len);
+               for (j = 0; j < cols; j++) {
+                       int n = j * rows + i;
+                       int size = space;
+                       if (n >= cmdname_cnt)
+                               break;
+                       if (j == cols-1 || n + rows >= cmdname_cnt)
+                               size = 1;
+                       printf("%-*s", size, cmdname[n]->name);
                }
                putchar('\n');
        }
@@ -152,10 +167,10 @@ static void list_commands(const char *exec_path, const char *pattern)
 }
 
 #ifdef __GNUC__
-static void usage(const char *exec_path, const char *fmt, ...)
+static void cmd_usage(const char *exec_path, const char *fmt, ...)
        __attribute__((__format__(__printf__, 2, 3), __noreturn__));
 #endif
-static void usage(const char *exec_path, const char *fmt, ...)
+static void cmd_usage(const char *exec_path, const char *fmt, ...)
 {
        if (fmt) {
                va_list ap;
@@ -188,7 +203,6 @@ static void prepend_to_path(const char *dir, int len)
        path_len = len + strlen(old_path) + 1;
 
        path = malloc(path_len + 1);
-       path[path_len + 1] = '\0';
 
        memcpy(path, dir, len);
        path[len] = ':';
@@ -230,6 +244,11 @@ int main(int argc, char **argv, char **envp)
        for (i = 1; i < argc; i++) {
                char *arg = argv[i];
 
+               if (!strcmp(arg, "help")) {
+                       show_help = 1;
+                       continue;
+               }
+
                if (strncmp(arg, "--", 2))
                        break;
 
@@ -251,12 +270,12 @@ int main(int argc, char **argv, char **envp)
                else if (!strcmp(arg, "help"))
                        show_help = 1;
                else if (!show_help)
-                       usage(NULL, NULL);
+                       cmd_usage(NULL, NULL);
        }
 
        if (i >= argc || show_help) {
                if (i >= argc)
-                       usage(exec_path, NULL);
+                       cmd_usage(exec_path, NULL);
 
                show_man_page(argv[i]);
        }
@@ -264,7 +283,7 @@ int main(int argc, char **argv, char **envp)
        if (*exec_path != '/') {
                if (!getcwd(git_command, sizeof(git_command))) {
                        fprintf(stderr,
-                               "git: cannot determine current directory");
+                               "git: cannot determine current directory\n");
                        exit(1);
                }
                len = strlen(git_command);
@@ -273,7 +292,7 @@ int main(int argc, char **argv, char **envp)
                while (!strncmp(exec_path, "./", 2)) {
                        exec_path += 2;
                        while (*exec_path == '/')
-                               *exec_path++;
+                               exec_path++;
                }
                snprintf(git_command + len, sizeof(git_command) - len,
                         "/%s", exec_path);
@@ -283,16 +302,21 @@ int main(int argc, char **argv, char **envp)
        len = strlen(git_command);
        prepend_to_path(git_command, len);
 
-       strncat(&git_command[len], "/git-", sizeof(git_command) - len);
-       len += 5;
-       strncat(&git_command[len], argv[i], sizeof(git_command) - len);
-
-       if (access(git_command, X_OK))
-               usage(exec_path, "'%s' is not a git-command", argv[i]);
+       len += snprintf(git_command + len, sizeof(git_command) - len,
+                       "/git-%s", argv[i]);
+       if (sizeof(git_command) <= len) {
+               fprintf(stderr, "git: command name given is too long.\n");
+               exit(1);
+       }
 
        /* execve() can only ever return if it fails */
        execve(git_command, &argv[i], envp);
-       printf("Failed to run command '%s': %s\n", git_command, strerror(errno));
+
+       if (errno == ENOENT)
+               cmd_usage(exec_path, "'%s' is not a git-command", argv[i]);
+
+       fprintf(stderr, "Failed to run command '%s': %s\n",
+               git_command, strerror(errno));
 
        return 1;
 }