mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-10 13:28:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2025-09-08 14:01:08 +01:00
parent 9a72317c4f b21b1ee9af
commit d4f129b513
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd-source-file.c
View File

@@ -201,7 +201,7 @@ cmd_source_file_exec(struct cmd *self, struct cmdq_item *item)
cdata->flags |= CMD_PARSE_QUIET; cdata->flags |= CMD_PARSE_QUIET;
if (args_has(args, 'n')) if (args_has(args, 'n'))
cdata->flags |= CMD_PARSE_PARSEONLY; cdata->flags |= CMD_PARSE_PARSEONLY;
if (args_has(args, 'v') && (~c->flags & CLIENT_CONTROL)) if (args_has(args, 'v') && (c == NULL || ~c->flags & CLIENT_CONTROL))
cdata->flags |= CMD_PARSE_VERBOSE; cdata->flags |= CMD_PARSE_VERBOSE;
cwd = cmd_source_file_quote_for_glob(server_client_get_cwd(c, NULL)); cwd = cmd_source_file_quote_for_glob(server_client_get_cwd(c, NULL));

20
job.c
View File

@@ -50,7 +50,7 @@ struct job {
char *cmd; char *cmd;
pid_t pid; pid_t pid;
char tty[TTY_NAME_MAX]; char tty[TTY_NAME_MAX];
int status; int status;
int fd; int fd;
@@ -139,14 +139,16 @@ job_run(const char *cmd, int argc, char **argv, struct environ *e,
proc_clear_signals(server_proc, 1); proc_clear_signals(server_proc, 1);
sigprocmask(SIG_SETMASK, &oldset, NULL); sigprocmask(SIG_SETMASK, &oldset, NULL);
if (chdir(cwd) == 0) if (cwd != NULL) {
environ_set(env, "PWD", 0, "%s", cwd); if (chdir(cwd) == 0)
else if ((home = find_home()) != NULL && chdir(home) == 0) environ_set(env, "PWD", 0, "%s", cwd);
environ_set(env, "PWD", 0, "%s", home); else if ((home = find_home()) != NULL && chdir(home) == 0)
else if (chdir("/") == 0) environ_set(env, "PWD", 0, "%s", home);
environ_set(env, "PWD", 0, "/"); else if (chdir("/") == 0)
else environ_set(env, "PWD", 0, "/");
fatal("chdir failed"); else
fatal("chdir failed");
}
environ_push(env); environ_push(env);
environ_free(env); environ_free(env);