circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-04-29 01:08:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2015-09-24 14:01:10 +01:00
commit b0372840e7
2 changed files with 8 additions and 1 deletions

6
client.c
View File

@ -153,15 +153,19 @@ retry:
} }
fd = server_start(base, lockfd, lockfile); fd = server_start(base, lockfd, lockfile);
} }
if (locked) { if (locked) {
free(lockfile); free(lockfile);
close(lockfd); close(lockfd);
} }
setblocking(fd, 0); setblocking(fd, 0);
return (fd); return (fd);
failed: failed:
if (locked) {
free(lockfile);
close(lockfd);
}
close(fd); close(fd);
return (-1); return (-1);
} }

3
log.c
View File

@ -42,6 +42,9 @@ log_event_cb(unused int severity, const char *msg)
void void
log_open(const char *path) log_open(const char *path)
{ {
if (log_file != NULL)
fclose(log_file);
log_file = fopen(path, "w"); log_file = fopen(path, "w");
if (log_file == NULL) if (log_file == NULL)
return; return;