diff options
| author | Thomas Adam <thomas@xteddy.org> | 2021-02-22 12:01:18 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2021-02-22 12:01:18 +0000 |
| commit | 0982a1a9752cd34f311830f4508ebbd341b7482e (patch) | |
| tree | d88b2b2959ccf2eb032348245881ad750451e0ce | |
| parent | 0cd5ed9e9b56b082e38e7a5be298803ccb68564c (diff) | |
| parent | 6d8efe9319857c0b1bc49118248efe7f55112bb5 (diff) | |
| download | rtmux-0982a1a9752cd34f311830f4508ebbd341b7482e.tar.gz rtmux-0982a1a9752cd34f311830f4508ebbd341b7482e.tar.bz2 rtmux-0982a1a9752cd34f311830f4508ebbd341b7482e.zip | |
Merge branch 'obsd-master' into master
| -rw-r--r-- | tmux.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -347,6 +347,12 @@ main(int argc, char **argv) if (**argv == '-') 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); while ((opt = getopt(argc, argv, "2c:CDdf:lL:NqS:T:uUvV")) != -1) { @@ -441,12 +447,6 @@ main(int argc, char **argv) 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_s_options = options_create(NULL); global_w_options = options_create(NULL); |