summaryrefslogtreecommitdiff
path: root/util.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-08-29 11:33:50 +1100
committerDamien Miller <djm@mindrot.org>2000-08-29 11:33:50 +1100
commitcaf6dd6d219e916e2784b3c884a7f2ce8784df37 (patch)
treeaa41094fe8f805cd56791ff3d023a785fe1d1c29 /util.c
parent4e0f5e1ec9b6318ef251180dbca50eaa01f74536 (diff)
- More OpenBSD updates:
- deraadt@cvs.openbsd.org 2000/08/24 15:46:59 [scp.c] off_t in sink, to fix files > 2GB, i think, test is still running ;-) - deraadt@cvs.openbsd.org 2000/08/25 10:10:06 [session.c] Wall - markus@cvs.openbsd.org 2000/08/26 04:33:43 [compat.c] ssh.com-2.3.0 - markus@cvs.openbsd.org 2000/08/27 12:18:05 [compat.c] compatibility with future ssh.com versions - deraadt@cvs.openbsd.org 2000/08/27 21:50:55 [auth-krb4.c session.c ssh-add.c sshconnect.c uidswap.c] print uid/gid as unsigned - markus@cvs.openbsd.org 2000/08/28 13:51:00 [ssh.c] enable -n and -f for ssh2 - markus@cvs.openbsd.org 2000/08/28 14:19:53 [ssh.c] allow combination of -N and -f - markus@cvs.openbsd.org 2000/08/28 14:20:56 [util.c] util.c - markus@cvs.openbsd.org 2000/08/28 14:22:02 [util.c] undo - markus@cvs.openbsd.org 2000/08/28 14:23:38 [util.c] don't complain if setting NONBLOCK fails with ENODEV
Diffstat (limited to 'util.c')
-rw-r--r--util.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/util.c b/util.c
index 3b221924e..16c8c5072 100644
--- a/util.c
+++ b/util.c
@@ -1,5 +1,5 @@
1#include "includes.h" 1#include "includes.h"
2RCSID("$OpenBSD: util.c,v 1.1 2000/08/01 19:01:42 provos Exp $"); 2RCSID("$OpenBSD: util.c,v 1.4 2000/08/28 20:23:37 markus Exp $");
3 3
4#include "ssh.h" 4#include "ssh.h"
5 5
@@ -37,7 +37,9 @@ set_nonblock(int fd)
37 debug("fd %d setting O_NONBLOCK", fd); 37 debug("fd %d setting O_NONBLOCK", fd);
38 val |= O_NONBLOCK; 38 val |= O_NONBLOCK;
39 if (fcntl(fd, F_SETFL, val) == -1) 39 if (fcntl(fd, F_SETFL, val) == -1)
40 error("fcntl(%d, F_SETFL, O_NONBLOCK): %s", fd, strerror(errno)); 40 if (errno != ENODEV)
41 error("fcntl(%d, F_SETFL, O_NONBLOCK): %s",
42 fd, strerror(errno));
41} 43}
42 44
43/* Characters considered whitespace in strsep calls. */ 45/* Characters considered whitespace in strsep calls. */