diff options
| author |   nicm <nicm@openbsd.org> | 2016-03-01 12:06:07 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2016-03-01 12:06:07 +0000 |
| commit | 1549639c4d224f0bdfa651953ab6bc8f8998ea33 (patch) | |
| tree | c2bb99a41d8678f238a9ffb606559ec8f90bd3b8 /usr.bin/tmux/cmd-if-shell.c | |
| parent | Redraw status on mode entry and exit. (diff) | |
| download | wireguard-openbsd-1549639c4d224f0bdfa651953ab6bc8f8998ea33.tar.xz wireguard-openbsd-1549639c4d224f0bdfa651953ab6bc8f8998ea33.zip | |
Remove some more unused variables, and use RB_FOREACH_SAFE in
key_bindings_unref_table.
Diffstat (limited to 'usr.bin/tmux/cmd-if-shell.c')
| -rw-r--r-- | usr.bin/tmux/cmd-if-shell.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.bin/tmux/cmd-if-shell.c b/usr.bin/tmux/cmd-if-shell.c index 489353f2675..902264c2415 100644 --- a/usr.bin/tmux/cmd-if-shell.c +++ b/usr.bin/tmux/cmd-if-shell.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-if-shell.c,v 1.40 2015/12/14 00:31:54 nicm Exp $ */ +/* $OpenBSD: cmd-if-shell.c,v 1.41 2016/03/01 12:06:07 nicm Exp $ */ /* * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org> @@ -73,14 +73,13 @@ cmd_if_shell_exec(struct cmd *self, struct cmd_q *cmdq) struct format_tree *ft; const char *cwd; - cwd = wp->cwd; - if (cmdq->client != NULL && cmdq->client->session == NULL) cwd = cmdq->client->cwd; else if (s != NULL) cwd = s->cwd; else cwd = NULL; + ft = format_create(cmdq, 0); format_defaults(ft, NULL, s, wl, wp); shellcmd = format_expand(ft, args->argv[0]); |