circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Tidy function a little by using a temporary variable.

pull/1/head
Nicholas Marriott 2009-08-08 21:18:23 +00:00
parent 90f8151ffd
commit e985629440
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
client.c
View File

@ -43,7 +43,7 @@ client_init(char *path, struct client_ctx *cctx, int cmdflags, int flags)
struct msg_identify_data data;
struct winsize ws;
size_t size;
int mode;
int fd, mode;
char *name, *term;
char rpathbuf[MAXPATHLEN];
@ -53,7 +53,7 @@ client_init(char *path, struct client_ctx *cctx, int cmdflags, int flags)
if (lstat(path, &sb) != 0) {
if (cmdflags & CMD_STARTSERVER && errno == ENOENT) {
if ((cctx->srv_fd = server_start(path)) == -1)
if ((fd = server_start(path)) == -1)
goto start_failed;
goto server_started;
}
@ -72,15 +72,14 @@ client_init(char *path, struct client_ctx *cctx, int cmdflags, int flags)
goto not_found;
}
if ((cctx->srv_fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
fatal("socket");
if (connect(
cctx->srv_fd, (struct sockaddr *) &sa, SUN_LEN(&sa)) == -1) {
if (connect(fd, (struct sockaddr *) &sa, SUN_LEN(&sa)) == -1) {
if (errno == ECONNREFUSED) {
if (unlink(path) != 0 || !(cmdflags & CMD_STARTSERVER))
goto not_found;
if ((cctx->srv_fd = server_start(path)) == -1)
if ((fd = server_start(path)) == -1)
goto start_failed;
goto server_started;
}
@ -88,10 +87,11 @@ client_init(char *path, struct client_ctx *cctx, int cmdflags, int flags)
}
server_started:
if ((mode = fcntl(cctx->srv_fd, F_GETFL)) == -1)
if ((mode = fcntl(fd, F_GETFL)) == -1)
fatal("fcntl failed");
if (fcntl(cctx->srv_fd, F_SETFL, mode|O_NONBLOCK) == -1)
if (fcntl(fd, F_SETFL, mode|O_NONBLOCK) == -1)
fatal("fcntl failed");
cctx->srv_fd = fd;
cctx->srv_in = buffer_create(BUFSIZ);
cctx->srv_out = buffer_create(BUFSIZ);