diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-01-16 00:01:10 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-01-16 00:01:10 +0000 |
| commit | 7b606457320995e2f4790b758a13d26d383ae213 (patch) | |
| tree | e57056522b598aee1c15e88ce8607052aa97b7a3 /cmd-if-shell.c | |
| parent | c9fcb76651cd6685ad33b845bcd0a21771964d37 (diff) | |
| parent | 52847a951802fda7a3ce36cdac77c34914b0ccca (diff) | |
| download | rtmux-7b606457320995e2f4790b758a13d26d383ae213.tar.gz rtmux-7b606457320995e2f4790b758a13d26d383ae213.tar.bz2 rtmux-7b606457320995e2f4790b758a13d26d383ae213.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-if-shell.c')
| -rw-r--r-- | cmd-if-shell.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cmd-if-shell.c b/cmd-if-shell.c index 5dfb5a19..93910f34 100644 --- a/cmd-if-shell.c +++ b/cmd-if-shell.c @@ -96,7 +96,8 @@ cmd_if_shell_exec(struct cmd *self, struct cmdq_item *item) free(shellcmd); if (cmd == NULL) return (CMD_RETURN_NORMAL); - if (cmd_string_parse(cmd, &cmdlist, NULL, 0, &cause) != 0) { + cmdlist = cmd_string_parse(cmd, NULL, 0, &cause); + if (cmdlist == NULL) { if (cause != NULL) { cmdq_error(item, "%s", cause); free(cause); @@ -167,7 +168,8 @@ cmd_if_shell_callback(struct job *job) if (cmd == NULL) goto out; - if (cmd_string_parse(cmd, &cmdlist, file, line, &cause) != 0) { + cmdlist = cmd_string_parse(cmd, file, line, &cause); + if (cmdlist == NULL) { if (cause != NULL) new_item = cmdq_get_callback(cmd_if_shell_error, cause); else |