diff options
| author | Thomas Adam <thomas@xteddy.org> | 2018-01-01 12:01:13 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2018-01-01 12:01:13 +0000 |
| commit | 06684c93de3e5fbc01bf6749c62defffaa07c52c (patch) | |
| tree | 1294805dfef1c6193a631ed8c5483104e7bb8322 /tmux.c | |
| parent | 6e99a2f4bbf21409921a6b54ce29702adda8d034 (diff) | |
| parent | d17c90583a2cbbb15ec1a357380b0985e6472a5f (diff) | |
| download | rtmux-06684c93de3e5fbc01bf6749c62defffaa07c52c.tar.gz rtmux-06684c93de3e5fbc01bf6749c62defffaa07c52c.tar.bz2 rtmux-06684c93de3e5fbc01bf6749c62defffaa07c52c.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'tmux.c')
| -rw-r--r-- | tmux.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -190,7 +190,7 @@ main(int argc, char **argv) { char *path, *label, **var; char tmp[PATH_MAX]; - const char *s, *shell; + const char *s, *shell, *cwd; int opt, flags, keys; const struct options_table_entry *oe; @@ -294,8 +294,9 @@ main(int argc, char **argv) global_environ = environ_create(); for (var = environ; *var != NULL; var++) environ_put(global_environ, *var); - if (getcwd(tmp, sizeof tmp) != NULL) - environ_set(global_environ, "PWD", "%s", tmp); + if ((cwd = getenv("PWD")) == NULL && + (cwd = getcwd(tmp, sizeof tmp)) != NULL) + environ_set(global_environ, "PWD", "%s", cwd); global_options = options_create(NULL); global_s_options = options_create(NULL); |