circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-12 03:08:46 +00:00
Code Issues Projects Releases Wiki Activity

Don't overwrite error message when it is available in

Browse Source 
cmd_string_parse. Reported by Jimi Damon in GitHub issue 975.
This commit is contained in:
nicm 2017-06-14 07:42:41 +00:00
parent dec00d3579
commit af93453190
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd-string.c
View File

@ -159,21 +159,19 @@ cmd_string_parse(const char *s, const char *file, u_int line, char **cause)
char **argv; char **argv;
*cause = NULL; *cause = NULL;
if (cmd_string_split(s, &argc, &argv) != 0) if (cmd_string_split(s, &argc, &argv) != 0) {
goto error; xasprintf(cause, "invalid or unknown command: %s", s);
return (NULL);
}
if (argc != 0) { if (argc != 0) {
cmdlist = cmd_list_parse(argc, argv, file, line, cause); cmdlist = cmd_list_parse(argc, argv, file, line, cause);
if (cmdlist == NULL) { if (cmdlist == NULL) {
cmd_free_argv(argc, argv); cmd_free_argv(argc, argv);
goto error; return (NULL);
} }
} }
cmd_free_argv(argc, argv); cmd_free_argv(argc, argv);
return (cmdlist); return (cmdlist);
error:
xasprintf(cause, "invalid or unknown command: %s", s);
return (NULL);
} }
static void static void