summaryrefslogtreecommitdiff
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 0d28c86a5..c6e386e5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120010621
2 - OpenBSD CVS Sync
3 - markus@cvs.openbsd.org 2001/06/16 08:49:38
4 [misc.c]
5 typo; dunlap@apl.washington.edu
6
120010615 720010615
2 - (stevesk) don't set SA_RESTART and set SIGCHLD to SIG_DFL 8 - (stevesk) don't set SA_RESTART and set SIGCHLD to SIG_DFL
3 around grantpt(). 9 around grantpt().
@@ -5649,4 +5655,4 @@
5649 - Wrote replacements for strlcpy and mkdtemp 5655 - Wrote replacements for strlcpy and mkdtemp
5650 - Released 1.0pre1 5656 - Released 1.0pre1
5651 5657
5652$Id: ChangeLog,v 1.1288 2001/06/15 04:23:12 stevesk Exp $ 5658$Id: ChangeLog,v 1.1289 2001/06/21 03:04:37 mouring Exp $
diff --git a/misc.c b/misc.c
index 5e98b8bb3..aa9d775f4 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: misc.c,v 1.9 2001/05/19 19:43:57 stevesk Exp $ */ 1/* $OpenBSD: misc.c,v 1.10 2001/06/16 08:49:38 markus Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -25,7 +25,7 @@
25 */ 25 */
26 26
27#include "includes.h" 27#include "includes.h"
28RCSID("$OpenBSD: misc.c,v 1.9 2001/05/19 19:43:57 stevesk Exp $"); 28RCSID("$OpenBSD: misc.c,v 1.10 2001/06/16 08:49:38 markus Exp $");
29 29
30#include "misc.h" 30#include "misc.h"
31#include "log.h" 31#include "log.h"
@@ -82,7 +82,7 @@ unset_nonblock(int fd)
82 debug2("fd %d is not O_NONBLOCK", fd); 82 debug2("fd %d is not O_NONBLOCK", fd);
83 return; 83 return;
84 } 84 }
85 debug("fd %d setting O_NONBLOCK", fd); 85 debug("fd %d clearing O_NONBLOCK", fd);
86 val &= ~O_NONBLOCK; 86 val &= ~O_NONBLOCK;
87 if (fcntl(fd, F_SETFL, val) == -1) 87 if (fcntl(fd, F_SETFL, val) == -1)
88 if (errno != ENODEV) 88 if (errno != ENODEV)