shell: Display errors from improperly-formatted command lines

diff --git a/shell.c b/shell.c
index e07aef4bf2331765deba3a344a2d1641becb4068..dea4cfdd2c230af6afd6233cacfa5c776a9962f9 100644 (file)
--- a/shell.c
+++ b/shell.c
@@ -73,8 +73,10 @@ static void run_shell(void)
                const char *prog;
                char *full_cmd;
                char *rawargs;
+               char *split_args;
                const char **argv;
                int code;
+               int count;
 
                fprintf(stderr, "git> ");
                if (strbuf_getline(&line, stdin, '\n') == EOF) {
@@ -84,7 +86,12 @@ static void run_shell(void)
                }
                strbuf_trim(&line);
                rawargs = strbuf_detach(&line, NULL);
-               if (split_cmdline(rawargs, &argv) == -1) {
+               split_args = xstrdup(rawargs);
+               count = split_cmdline(split_args, &argv);
+               if (count < 0) {
+                       fprintf(stderr, "invalid command format '%s': %s\n", rawargs,
+                               split_cmdline_strerror(count));
+                       free(split_args);
                        free(rawargs);
                        continue;
                }
@@ -128,6 +135,7 @@ int main(int argc, char **argv)
        const char **user_argv;
        struct commands *cmd;
        int devnull_fd;
+       int count;
 
        /*
         * Always open file descriptors 0/1/2 to avoid clobbering files
@@ -149,8 +157,11 @@ int main(int argc, char **argv)
        } else if (argc == 1) {
                /* Allow the user to run an interactive shell */
                cd_to_homedir();
-               if (access(COMMAND_DIR, R_OK | X_OK) == -1)
-                       die("Sorry, the interactive git-shell is not enabled");
+               if (access(COMMAND_DIR, R_OK | X_OK) == -1) {
+                       die("Interactive git shell is not enabled.\n"
+                           "hint: ~/" COMMAND_DIR " should exist "
+                           "and have read and execute access.");
+               }
                run_shell();
                exit(0);
        } else if (argc != 3 || strcmp(argv[1], "-c")) {
@@ -187,7 +198,8 @@ int main(int argc, char **argv)
        }
 
        cd_to_homedir();
-       if (split_cmdline(prog, &user_argv) != -1) {
+       count = split_cmdline(prog, &user_argv);
+       if (count >= 0) {
                if (is_valid_cmd_name(user_argv[0])) {
                        prog = make_cmd(user_argv[0]);
                        user_argv[0] = prog;
@@ -198,6 +210,7 @@ int main(int argc, char **argv)
                die("unrecognized command '%s'", argv[2]);
        } else {
                free(prog);
-               die("invalid command format '%s'", argv[2]);
+               die("invalid command format '%s': %s", argv[2],
+                   split_cmdline_strerror(count));
        }
 }