v/tmate-ssh-server
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate-ssh-server.git synced 2020-11-18 19:53:51 -08:00
Code Issues Releases Wiki Activity

Set working directory for run-shell and if-shell.

Browse Source
This commit is contained in:
nicm 2015-04-24 22:19:36 +00:00
parent 5a2d0533a8
commit 583b4ab72b
6 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmd-if-shell.c
View File

@ -66,16 +66,24 @@ cmd_if_shell_exec(struct cmd *self, struct cmd_q *cmdq)
struct winlink *wl = NULL; struct winlink *wl = NULL;
struct window_pane *wp = NULL; struct window_pane *wp = NULL;
struct format_tree *ft; struct format_tree *ft;
int cwd;
if (args_has(args, 't')) if (args_has(args, 't')) {
wl = cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp); wl = cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp);
else { cwd = wp->cwd;
} else {
c = cmd_find_client(cmdq, NULL, 1); c = cmd_find_client(cmdq, NULL, 1);
if (c != NULL && c->session != NULL) { if (c != NULL && c->session != NULL) {
s = c->session; s = c->session;
wl = s->curw; wl = s->curw;
wp = wl->window->active; wp = wl->window->active;
} }
if (cmdq->client != NULL && cmdq->client->session == NULL)
cwd = cmdq->client->cwd;
else if (s != NULL)
cwd = s->cwd;
else
cwd = -1;
} }
ft = format_create(); ft = format_create();
@ -118,7 +126,8 @@ cmd_if_shell_exec(struct cmd *self, struct cmd_q *cmdq)
cmdq->references++; cmdq->references++;
cdata->references = 1; cdata->references = 1;
job_run(shellcmd, s, cmd_if_shell_callback, cmd_if_shell_free, cdata); job_run(shellcmd, s, cwd, cmd_if_shell_callback, cmd_if_shell_free,
cdata);
free(shellcmd); free(shellcmd);
if (cdata->bflag) if (cdata->bflag)

15
cmd-run-shell.c
View File

@ -80,16 +80,24 @@ cmd_run_shell_exec(struct cmd *self, struct cmd_q *cmdq)
struct winlink *wl = NULL; struct winlink *wl = NULL;
struct window_pane *wp = NULL; struct window_pane *wp = NULL;
struct format_tree *ft; struct format_tree *ft;
int cwd;
if (args_has(args, 't')) if (args_has(args, 't')) {
wl = cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp); wl = cmd_find_pane(cmdq, args_get(args, 't'), &s, &wp);
else { cwd = wp->cwd;
} else {
c = cmd_find_client(cmdq, NULL, 1); c = cmd_find_client(cmdq, NULL, 1);
if (c != NULL && c->session != NULL) { if (c != NULL && c->session != NULL) {
s = c->session; s = c->session;
wl = s->curw; wl = s->curw;
wp = wl->window->active; wp = wl->window->active;
} }
if (cmdq->client != NULL && cmdq->client->session == NULL)
cwd = cmdq->client->cwd;
else if (s != NULL)
cwd = s->cwd;
else
cwd = -1;
} }
ft = format_create(); ft = format_create();
@ -105,7 +113,8 @@ cmd_run_shell_exec(struct cmd *self, struct cmd_q *cmdq)
cdata->cmdq = cmdq; cdata->cmdq = cmdq;
cmdq->references++; cmdq->references++;
job_run(shellcmd, s, cmd_run_shell_callback, cmd_run_shell_free, cdata); job_run(shellcmd, s, cwd, cmd_run_shell_callback, cmd_run_shell_free,
cdata);
if (cdata->bflag) if (cdata->bflag)
return (CMD_RETURN_NORMAL); return (CMD_RETURN_NORMAL);

5
job.c
View File

@ -41,7 +41,7 @@ struct joblist all_jobs = LIST_HEAD_INITIALIZER(all_jobs);
/* Start a job running, if it isn't already. */ /* Start a job running, if it isn't already. */
struct job * struct job *
job_run(const char *cmd, struct session *s, job_run(const char *cmd, struct session *s, int cwd,
void (*callbackfn)(struct job *), void (*freefn)(void *), void *data) void (*callbackfn)(struct job *), void (*freefn)(void *), void *data)
{ {
struct job *job; struct job *job;
@ -67,6 +67,9 @@ job_run(const char *cmd, struct session *s,
case 0: /* child */ case 0: /* child */
clear_signals(1); clear_signals(1);
if (cwd != -1 && fchdir(cwd) != 0)
chdir("/");
environ_push(&env); environ_push(&env);
environ_free(&env); environ_free(&env);

2
status.c
View File

@ -515,7 +515,7 @@ status_find_job(struct client *c, char **iptr)
/* If not found at all, start the job and add to the tree. */ /* If not found at all, start the job and add to the tree. */
if (so == NULL) { if (so == NULL) {
job_run(cmd, NULL, status_job_callback, status_job_free, c); job_run(cmd, NULL, -1, status_job_callback, status_job_free, c);
c->references++; c->references++;
so = xmalloc(sizeof *so); so = xmalloc(sizeof *so);

2
tmux.h
View File

@ -1613,7 +1613,7 @@ int options_table_find(const char *, const struct options_table_entry **,
/* job.c */ /* job.c */
extern struct joblist all_jobs; extern struct joblist all_jobs;
struct job *job_run(const char *, struct session *, struct job *job_run(const char *, struct session *, int,
void (*)(struct job *), void (*)(void *), void *); void (*)(struct job *), void (*)(void *), void *);
void job_free(struct job *); void job_free(struct job *);
void job_died(struct job *, int); void job_died(struct job *, int);

2
window-copy.c
View File

@ -1465,7 +1465,7 @@ window_copy_copy_pipe(struct window_pane *wp, struct session *sess,
format_defaults(ft, NULL, sess, NULL, wp); format_defaults(ft, NULL, sess, NULL, wp);
expanded = format_expand(ft, arg); expanded = format_expand(ft, arg);
job = job_run(expanded, sess, NULL, NULL, NULL); job = job_run(expanded, sess, -1, NULL, NULL, NULL);
bufferevent_write(job->event, buf, len); bufferevent_write(job->event, buf, len);
free(expanded); free(expanded);