Merge branch 'obsd-master'

1 files changed, 4 insertions, 1 deletions

diff --git a/job.c b/job.c
index 023a1d47..74b316ed 100644
--- a/job.c
+++ b/job.c
@@ -40,7 +40,7 @@ struct joblist	all_jobs = LIST_HEAD_INITIALIZER(all_jobs);
 
 /* Start a job running, if it isn't already. */
 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)
 {
 	struct job	*job;
@@ -66,6 +66,9 @@ job_run(const char *cmd, struct session *s,
 	case 0:		/* child */
 		clear_signals(1);
 
+		if (cwd != -1 && fchdir(cwd) != 0)
+			chdir("/");
+
 		environ_push(&env);
 		environ_free(&env);