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

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2015-10-31 10:01:12 +00:00
parent e8bb385d6d 01defc9f49
commit 17f6c3be8e
18 changed files with 136 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server-client.c
View File

@ -96,7 +96,7 @@ server_client_create(int fd)
c->environ = environ_create();
c->fd = -1;
c->cwd = -1;
c->cwd = NULL;
c->cmdq = cmdq_new(c);
c->cmdq->client_exit = 1;
@ -192,7 +192,7 @@ server_client_lost(struct client *c)
screen_free(&c->status);
free(c->title);
close(c->cwd);
free((void *)c->cwd);
evtimer_del(&c->repeat_timer);
@ -1107,7 +1107,7 @@ error:
void
server_client_dispatch_identify(struct client *c, struct imsg *imsg)
{
const char *data;
const char *data, *home;
size_t datalen;
int flags;
@ -1140,8 +1140,12 @@ server_client_dispatch_identify(struct client *c, struct imsg *imsg)
case MSG_IDENTIFY_CWD:
if (datalen == 0 || data[datalen - 1] != '\0')
fatalx("bad MSG_IDENTIFY_CWD string");
if ((c->cwd = open(data, O_RDONLY)) == -1)
c->cwd = open("/", O_RDONLY);
if (access(data, X_OK) == 0)
c->cwd = xstrdup(data);
else if ((home = find_home()) != NULL)
c->cwd = xstrdup(home);
else
c->cwd = xstrdup("/");
log_debug("client %p IDENTIFY_CWD %s", c, data);
break;
case MSG_IDENTIFY_STDIN: