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

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas
2014-01-20 10:48:12 +00:00
parent ba014c1a60 938768ed3d
commit d02c4bda3a
19 changed files with 192 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client.c
View File

@@ -118,10 +118,15 @@ retry:
close(fd);
xasprintf(&lockfile, "%s.lock", path);
if ((lockfd = client_get_lock(lockfile)) == -1)
if ((lockfd = client_get_lock(lockfile)) == -1) {
free(lockfile);
goto retry;
if (unlink(path) != 0 && errno != ENOENT)
}
if (unlink(path) != 0 && errno != ENOENT) {
free(lockfile);
close(lockfd);
return (-1);
}
fd = server_start(lockfd, lockfile);
free(lockfile);
close(lockfd);
@@ -232,7 +237,8 @@ client_main(int argc, char **argv, int flags)
/* Initialise the client socket and start the server. */
fd = client_connect(socket_path, cmdflags & CMD_STARTSERVER);
if (fd == -1) {
fprintf(stderr, "failed to connect to server\n");
fprintf(stderr, "failed to connect to server: %s\n",
strerror(errno));
return (1);
}