circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-01 20:57:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2018-11-22 12:02:38 +00:00
parent 2eca63b98e 3a7b9d5735
commit 2977317243
3 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client.c
View File

@ -222,7 +222,7 @@ client_main(struct event_base *base, int argc, char **argv, int flags)
const char *ttynam, *cwd;
pid_t ppid;
enum msgtype msg;
char *cause, path[PATH_MAX];
char *cause;
struct termios tio, saved_tio;
size_t size;
@ -277,9 +277,7 @@ client_main(struct event_base *base, int argc, char **argv, int flags)
client_peer = proc_add_peer(client_proc, fd, client_dispatch, NULL);
/* Save these before pledge(). */
if ((cwd = getenv("PWD")) == NULL &&
(cwd = getcwd(path, sizeof path)) == NULL &&
(cwd = find_home()) == NULL)
if ((cwd = find_cwd()) == NULL && (cwd = find_home()) == NULL)
cwd = "/";
if ((ttynam = ttyname(STDIN_FILENO)) == NULL)
ttynam = "";