mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 01:34:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2018-01-01 12:01:13 +00:00
parent 6e99a2f4bb d17c90583a
commit 06684c93de
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client.c
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); client_peer = proc_add_peer(client_proc, fd, client_dispatch, NULL);
/* Save these before pledge(). */ /* Save these before pledge(). */
if ((cwd = getcwd(path, sizeof path)) == NULL) { if ((cwd = getenv("PWD")) == NULL &&
if ((cwd = find_home()) == NULL) (cwd = getcwd(path, sizeof path)) == NULL &&
(cwd = find_home()) == NULL)
cwd = "/"; cwd = "/";
}
if ((ttynam = ttyname(STDIN_FILENO)) == NULL) if ((ttynam = ttyname(STDIN_FILENO)) == NULL)
ttynam = ""; ttynam = "";

1
status.c
View File

@@ -1339,6 +1339,7 @@ process_key:
break; break;
case '\033': /* Escape */ case '\033': /* Escape */
case '\003': /* C-c */ case '\003': /* C-c */
case '\007': /* C-g */
if (c->prompt_inputcb(c, c->prompt_data, NULL, 1) == 0) if (c->prompt_inputcb(c, c->prompt_data, NULL, 1) == 0)
status_prompt_clear(c); status_prompt_clear(c);
break; break;

7
tmux.c
View File

@@ -190,7 +190,7 @@ main(int argc, char **argv)
{ {
char *path, *label, **var; char *path, *label, **var;
char tmp[PATH_MAX]; char tmp[PATH_MAX];
const char *s, *shell; const char *s, *shell, *cwd;
int opt, flags, keys; int opt, flags, keys;
const struct options_table_entry *oe; const struct options_table_entry *oe;
@@ -294,8 +294,9 @@ main(int argc, char **argv)
global_environ = environ_create(); global_environ = environ_create();
for (var = environ; *var != NULL; var++) for (var = environ; *var != NULL; var++)
environ_put(global_environ, *var); environ_put(global_environ, *var);
if (getcwd(tmp, sizeof tmp) != NULL) if ((cwd = getenv("PWD")) == NULL &&
environ_set(global_environ, "PWD", "%s", tmp); (cwd = getcwd(tmp, sizeof tmp)) != NULL)
environ_set(global_environ, "PWD", "%s", cwd);
global_options = options_create(NULL); global_options = options_create(NULL);
global_s_options = options_create(NULL); global_s_options = options_create(NULL);