aboutsummaryrefslogtreecommitdiff
path: root/cmd-if-shell.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2015-10-31 10:01:12 +0000
committerThomas Adam <thomas@xteddy.org>2015-10-31 10:01:12 +0000
commit17f6c3be8eeb0b67d07f916026dab918795c0317 (patch)
tree08a10a780a8de977d4452c10a7a9c03db1ae1702 /cmd-if-shell.c
parente8bb385d6d9d8a91b5fa78e906531afc02320b80 (diff)
parent01defc9f4965bb174e1d1295754d5a8695683054 (diff)
downloadrtmux-17f6c3be8eeb0b67d07f916026dab918795c0317.tar.gz
rtmux-17f6c3be8eeb0b67d07f916026dab918795c0317.tar.bz2
rtmux-17f6c3be8eeb0b67d07f916026dab918795c0317.zip
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-if-shell.c')
-rw-r--r--cmd-if-shell.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd-if-shell.c b/cmd-if-shell.c
index 0271fdea..a9c84261 100644
--- a/cmd-if-shell.c
+++ b/cmd-if-shell.c
@@ -66,7 +66,7 @@ cmd_if_shell_exec(struct cmd *self, struct cmd_q *cmdq)
struct winlink *wl = NULL;
struct window_pane *wp = NULL;
struct format_tree *ft;
- int cwd;
+ const char *cwd;
if (args_has(args, 't')) {
wl = cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp);
@@ -83,7 +83,7 @@ cmd_if_shell_exec(struct cmd *self, struct cmd_q *cmdq)
else if (s != NULL)
cwd = s->cwd;
else
- cwd = -1;
+ cwd = NULL;
}
ft = format_create();