circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 09:26:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master' into master

Browse Source
This commit is contained in:
Thomas Adam
2021-02-22 12:01:18 +00:00
parent 0cd5ed9e9b 6d8efe9319
commit 0982a1a975
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tmux.c
View File

@@ -347,6 +347,12 @@ main(int argc, char **argv)
if (**argv == '-') if (**argv == '-')
flags = CLIENT_LOGIN; flags = CLIENT_LOGIN;
global_environ = environ_create();
for (var = environ; *var != NULL; var++)
environ_put(global_environ, *var, 0);
if ((cwd = find_cwd()) != NULL)
environ_set(global_environ, "PWD", 0, "%s", cwd);
expand_paths(TMUX_CONF, &cfg_files, &cfg_nfiles, 1); expand_paths(TMUX_CONF, &cfg_files, &cfg_nfiles, 1);
while ((opt = getopt(argc, argv, "2c:CDdf:lL:NqS:T:uUvV")) != -1) { while ((opt = getopt(argc, argv, "2c:CDdf:lL:NqS:T:uUvV")) != -1) {
@@ -441,12 +447,6 @@ main(int argc, char **argv)
flags |= CLIENT_UTF8; flags |= CLIENT_UTF8;
} }
global_environ = environ_create();
for (var = environ; *var != NULL; var++)
environ_put(global_environ, *var, 0);
if ((cwd = find_cwd()) != NULL)
environ_set(global_environ, "PWD", 0, "%s", cwd);
global_options = options_create(NULL); global_options = options_create(NULL);
global_s_options = options_create(NULL); global_s_options = options_create(NULL);
global_w_options = options_create(NULL); global_w_options = options_create(NULL);