From f110e3be6dc277a64ba2e673e704e9ac5cec0f74 Mon Sep 17 00:00:00 2001
From: millert <>
Date: Tue, 17 Aug 1999 09:13:13 +0000
Subject: [PATCH] More <sys/file.h> vs. <fcntl.h> and open() flags fixes.

---
 src/lib/libc/hash/rmd160hl.c | 6 +++---
 src/lib/libc/hash/sha1hl.c   | 6 +++---
 src/lib/libutil/logwtmp.c    | 6 +++---
 src/lib/libutil/uucplock.c   | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/lib/libc/hash/rmd160hl.c b/src/lib/libc/hash/rmd160hl.c
index 550ba421..06511336 100644
--- a/src/lib/libc/hash/rmd160hl.c
+++ b/src/lib/libc/hash/rmd160hl.c
@@ -8,13 +8,13 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: rmd160hl.c,v 1.1 1997/07/17 05:37:01 millert Exp $";
+static char rcsid[] = "$OpenBSD: rmd160hl.c,v 1.2 1999/08/17 09:13:12 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
-#include <sys/file.h>
+#include <fcntl.h>
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <unistd.h>
@@ -54,7 +54,7 @@ RMD160File (filename, buf)
 
     RMD160Init(&ctx);
 
-    if ((fd = open(filename,O_RDONLY)) < 0)
+    if ((fd = open(filename, O_RDONLY)) < 0)
 	return(0);
 
     while ((num = read(fd, buffer, sizeof(buffer))) > 0)
diff --git a/src/lib/libc/hash/sha1hl.c b/src/lib/libc/hash/sha1hl.c
index 0de559fa..75d65c1a 100644
--- a/src/lib/libc/hash/sha1hl.c
+++ b/src/lib/libc/hash/sha1hl.c
@@ -8,13 +8,13 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: sha1hl.c,v 1.1 1997/07/12 20:06:03 millert Exp $";
+static char rcsid[] = "$OpenBSD: sha1hl.c,v 1.2 1999/08/17 09:13:12 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
-#include <sys/file.h>
+#include <fcntl.h>
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <unistd.h>
@@ -54,7 +54,7 @@ SHA1File (filename, buf)
 
     SHA1Init(&ctx);
 
-    if ((fd = open(filename,O_RDONLY)) < 0)
+    if ((fd = open(filename, O_RDONLY)) < 0)
 	return(0);
 
     while ((num = read(fd, buffer, sizeof(buffer))) > 0)
diff --git a/src/lib/libutil/logwtmp.c b/src/lib/libutil/logwtmp.c
index 31bb3e5b..cc9df123 100644
--- a/src/lib/libutil/logwtmp.c
+++ b/src/lib/libutil/logwtmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: logwtmp.c,v 1.3 1996/06/17 07:46:03 downsj Exp $	*/
+/*	$OpenBSD: logwtmp.c,v 1.4 1999/08/17 09:13:13 millert Exp $	*/
 /*
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -34,14 +34,14 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /* from: static char sccsid[] = "@(#)logwtmp.c	8.1 (Berkeley) 6/4/93"; */
-static char *rcsid = "$Id: logwtmp.c,v 1.3 1996/06/17 07:46:03 downsj Exp $";
+static char *rcsid = "$Id: logwtmp.c,v 1.4 1999/08/17 09:13:13 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
-#include <sys/file.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 
+#include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
 #include <utmp.h>
diff --git a/src/lib/libutil/uucplock.c b/src/lib/libutil/uucplock.c
index 4fa41288..1517895b 100644
--- a/src/lib/libutil/uucplock.c
+++ b/src/lib/libutil/uucplock.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: uucplock.c,v 1.5 1999/03/16 01:26:02 brian Exp $
+ * $Id: uucplock.c,v 1.6 1999/08/17 09:13:13 millert Exp $
  *
  */
 
@@ -39,9 +39,9 @@ static const char sccsid[] = "@(#)uucplock.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
 #include <sys/types.h>
-#include <sys/file.h>
 #include <dirent.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <unistd.h>
 #include <signal.h>
 #include <stdio.h>