summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--misc.c6
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 0d28c86a..c6e386e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20010621
+ - OpenBSD CVS Sync
+ - markus@cvs.openbsd.org 2001/06/16 08:49:38
+ [misc.c]
+ typo; dunlap@apl.washington.edu
+
20010615
- (stevesk) don't set SA_RESTART and set SIGCHLD to SIG_DFL
around grantpt().
@@ -5649,4 +5655,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1288 2001/06/15 04:23:12 stevesk Exp $
+$Id: ChangeLog,v 1.1289 2001/06/21 03:04:37 mouring Exp $
diff --git a/misc.c b/misc.c
index 5e98b8bb..aa9d775f 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.9 2001/05/19 19:43:57 stevesk Exp $ */
+/* $OpenBSD: misc.c,v 1.10 2001/06/16 08:49:38 markus Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: misc.c,v 1.9 2001/05/19 19:43:57 stevesk Exp $");
+RCSID("$OpenBSD: misc.c,v 1.10 2001/06/16 08:49:38 markus Exp $");
#include "misc.h"
#include "log.h"
@@ -82,7 +82,7 @@ unset_nonblock(int fd)
debug2("fd %d is not O_NONBLOCK", fd);
return;
}
- debug("fd %d setting O_NONBLOCK", fd);
+ debug("fd %d clearing O_NONBLOCK", fd);
val &= ~O_NONBLOCK;
if (fcntl(fd, F_SETFL, val) == -1)
if (errno != ENODEV)