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

Do not use PWD unless it actually matches the real working directory.

Browse Source
This commit is contained in:
nicm
2018-11-22 10:36:40 +00:00
parent 749f67b7d8
commit 3a7b9d5735
3 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tmux.c
View File

@ -166,6 +166,31 @@ setblocking(int fd, int state)
}
}
const char *
find_cwd(void)
{
char resolved1[PATH_MAX], resolved2[PATH_MAX];
static char cwd[PATH_MAX];
const char *pwd;
if (getcwd(cwd, sizeof cwd) == NULL)
return (NULL);
if ((pwd = getenv("PWD")) == NULL || *pwd == '\0')
return (cwd);
/*
* We want to use PWD so that symbolic links are maintained,
* but only if it matches the actual working directory.
*/
if (realpath(pwd, resolved1) == NULL)
return (cwd);
if (realpath(cwd, resolved2) == NULL)
return (cwd);
if (strcmp(resolved1, resolved2) != 0)
return (cwd);
return (pwd);
}
const char *
find_home(void)
{
@ -191,7 +216,6 @@ int
main(int argc, char **argv)
{
char *path, *label, *cause, **var;
char tmp[PATH_MAX];
const char *s, *shell, *cwd;
int opt, flags, keys;
const struct options_table_entry *oe;
@ -293,8 +317,7 @@ main(int argc, char **argv)
global_environ = environ_create();
for (var = environ; *var != NULL; var++)
environ_put(global_environ, *var);
if ((cwd = getenv("PWD")) == NULL &&
(cwd = getcwd(tmp, sizeof tmp)) != NULL)
if ((cwd = find_cwd()) != NULL)
environ_set(global_environ, "PWD", "%s", cwd);
global_options = options_create(NULL);