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

Unlink and retry if server socket connect fails.

Browse Source
This commit is contained in:
Nicholas Marriott
2007-09-26 18:12:19 +00:00
parent 302a35da85
commit b1822f6a72
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client.c
View File

@@ -1,4 +1,4 @@
/* $Id: client.c,v 1.1 2007-09-26 13:43:15 nicm Exp $ */ /* $Id: client.c,v 1.2 2007-09-26 18:12:19 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -42,12 +42,14 @@ client_init(char *path, struct client_ctx *cctx, int ws)
struct stat sb; struct stat sb;
size_t sz; size_t sz;
int mode; int mode;
u_int retries;
if (path == NULL) { if (path == NULL) {
xasprintf(&path, xasprintf(&path,
"%s/%s-%lu", _PATH_TMP, __progname, (u_long) getuid()); "%s/%s-%lu", _PATH_TMP, __progname, (u_long) getuid());
} }
retries = 0;
retry: retry:
if (stat(path, &sb) != 0) { if (stat(path, &sb) != 0) {
if (errno != ENOENT) { if (errno != ENOENT) {
@@ -94,6 +96,14 @@ retry:
} }
if (connect( if (connect(
cctx->srv_fd, (struct sockaddr *) &sa, SUN_LEN(&sa)) == -1) { cctx->srv_fd, (struct sockaddr *) &sa, SUN_LEN(&sa)) == -1) {
if (errno == ECONNREFUSED && retries < 5) {
if (unlink(path) != 0) {
log_warn("%s: unlink", path);
return (-1);
}
retries++;
goto retry;
}
log_warn("%s: connect", path); log_warn("%s: connect", path);
return (-1); return (-1);
} }