diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-06-14 10:01:10 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-06-14 10:01:10 +0100 |
| commit | 91dec25fc96d17f99ba63115acf1cbbfb058d781 (patch) | |
| tree | bef53ef0c8b685c0c8fc5658c3c4ef7b3015655d /cmd-string.c | |
| parent | 6e57401610c98232ec5cfc791107c40a0dcc5720 (diff) | |
| parent | af93453190c2fbb207c8541df33314160816985f (diff) | |
| download | rtmux-91dec25fc96d17f99ba63115acf1cbbfb058d781.tar.gz rtmux-91dec25fc96d17f99ba63115acf1cbbfb058d781.tar.bz2 rtmux-91dec25fc96d17f99ba63115acf1cbbfb058d781.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-string.c')
| -rw-r--r-- | cmd-string.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/cmd-string.c b/cmd-string.c index 822d35b5..9c8f10c1 100644 --- a/cmd-string.c +++ b/cmd-string.c @@ -159,21 +159,19 @@ cmd_string_parse(const char *s, const char *file, u_int line, char **cause) char **argv; *cause = NULL; - if (cmd_string_split(s, &argc, &argv) != 0) - goto error; + if (cmd_string_split(s, &argc, &argv) != 0) { + xasprintf(cause, "invalid or unknown command: %s", s); + return (NULL); + } if (argc != 0) { cmdlist = cmd_list_parse(argc, argv, file, line, cause); if (cmdlist == NULL) { cmd_free_argv(argc, argv); - goto error; + return (NULL); } } cmd_free_argv(argc, argv); return (cmdlist); - -error: - xasprintf(cause, "invalid or unknown command: %s", s); - return (NULL); } static void |