kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

shell: Display errors from improperly-formatted command lines 

The interface for split_cmdline has changed such that the caller holds
responsibility for printing any error messages.  This patch changes
the git shell to print these error messages as appropriate.

Signed-off-by: Greg Brockman <gdb@mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Greg Brockman 2010-08-27 01:36:13 -04:00 committed by Junio C Hamano
parent 1666246b70
commit 9f29fe9a77
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
shell.c
View File

@ -73,8 +73,10 @@ static void run_shell(void)
const char *prog; const char *prog;
char *full_cmd; char *full_cmd;
char *rawargs; char *rawargs;
char *split_args;
const char **argv; const char **argv;
int code; int code;
int count;


fprintf(stderr, "git> "); fprintf(stderr, "git> ");
if (strbuf_getline(&line, stdin, '\n') == EOF) { if (strbuf_getline(&line, stdin, '\n') == EOF) {
@ -84,7 +86,12 @@ static void run_shell(void)
} }
strbuf_trim(&line); strbuf_trim(&line);
rawargs = strbuf_detach(&line, NULL); 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); free(rawargs);
continue; continue;
} }
@ -128,6 +135,7 @@ int main(int argc, char **argv)
const char **user_argv; const char **user_argv;
struct commands *cmd; struct commands *cmd;
int devnull_fd; int devnull_fd;
int count;


/* /*
* Always open file descriptors 0/1/2 to avoid clobbering files * Always open file descriptors 0/1/2 to avoid clobbering files
@ -190,7 +198,8 @@ int main(int argc, char **argv)
} }


cd_to_homedir(); 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])) { if (is_valid_cmd_name(user_argv[0])) {
prog = make_cmd(user_argv[0]); prog = make_cmd(user_argv[0]);
user_argv[0] = prog; user_argv[0] = prog;
@ -201,6 +210,7 @@ int main(int argc, char **argv)
die("unrecognized command '%s'", argv[2]); die("unrecognized command '%s'", argv[2]);
} else { } else {
free(prog); free(prog);
die("invalid command format '%s'", argv[2]); die("invalid command format '%s': %s", argv[2],
split_cmdline_strerror(count));
} }
} }