From 492e3aa4373f0f20a8685cfb3591a9730bb0454a Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Fri, 21 Jan 2011 23:44:13 +0000 Subject: Sync OpenBSD patchset 834: Move all calls to fcntl(...O_NONBLOCK) into a function and clear the flag on the stdio file descriptors before closing them (fixes things like "tmux ls && cat"). --- client.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'client.c') diff --git a/client.c b/client.c index 73c3358c..fe7a7e54 100644 --- a/client.c +++ b/client.c @@ -1,4 +1,4 @@ -/* $Id: client.c,v 1.100 2010-10-24 19:54:41 nicm Exp $ */ +/* $Id: client.c,v 1.101 2011-01-21 23:44:13 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -54,7 +54,7 @@ client_connect(char *path, int start_server) { struct sockaddr_un sa; size_t size; - int fd, mode; + int fd; memset(&sa, 0, sizeof sa); sa.sun_family = AF_UNIX; @@ -84,10 +84,7 @@ client_connect(char *path, int start_server) } } - if ((mode = fcntl(fd, F_GETFL)) == -1) - fatal("fcntl failed"); - if (fcntl(fd, F_SETFL, mode|O_NONBLOCK) == -1) - fatal("fcntl failed"); + setblocking(fd, 0); return (fd); failed: -- cgit