Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2018-01-01 12:01:13 +00:00
3 changed files with 9 additions and 7 deletions

View File

@ -278,10 +278,10 @@ 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 = getcwd(path, sizeof path)) == NULL) {
if ((cwd = find_home()) == NULL)
cwd = "/";
}
if ((cwd = getenv("PWD")) == NULL &&
(cwd = getcwd(path, sizeof path)) == NULL &&
(cwd = find_home()) == NULL)
cwd = "/";
if ((ttynam = ttyname(STDIN_FILENO)) == NULL)
ttynam = "";