More <sys/file.h> vs. <fcntl.h> and open() flags fixes.

5 files changed, 13 insertions, 13 deletions

diff --git a/lib/libc/gen/nlist.c b/lib/libc/gen/nlist.c
index 0feb82d3614..35b790140da 100644
--- a/lib/libc/gen/nlist.c
+++ b/lib/libc/gen/nlist.c
@@ -32,16 +32,16 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: nlist.c,v 1.32 1998/10/04 17:24:17 millert Exp $";
+static char rcsid[] = "$OpenBSD: nlist.c,v 1.33 1999/08/17 09:13:12 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
-#include <sys/file.h>
 
 #include <errno.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/libc/hash/rmd160hl.c b/lib/libc/hash/rmd160hl.c
index 550ba421317..06511336938 100644
--- a/lib/libc/hash/rmd160hl.c
+++ b/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/lib/libc/hash/sha1hl.c b/lib/libc/hash/sha1hl.c
index 0de559fa4e7..75d65c1a522 100644
--- a/lib/libc/hash/sha1hl.c
+++ b/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/lib/libc/md/mdXhl.c b/lib/libc/md/mdXhl.c
index d26424df993..3e0de52567c 100644
--- a/lib/libc/md/mdXhl.c
+++ b/lib/libc/md/mdXhl.c
@@ -8,13 +8,13 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: mdXhl.c,v 1.8 1997/07/23 21:17:56 kstailey Exp $";
+static char rcsid[] = "$OpenBSD: mdXhl.c,v 1.9 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 @@ MDXFile (filename, buf)
     int f,i,j;
 
     MDXInit(&ctx);
-    f = open(filename,O_RDONLY);
+    f = open(filename, O_RDONLY);
     if (f < 0) return 0;
     while ((i = read(f,buffer,sizeof buffer)) > 0) {
 	MDXUpdate(&ctx,buffer,i);
diff --git a/lib/libc/yp/yp_bind.c b/lib/libc/yp/yp_bind.c
index 6738701d48e..47cf920737b 100644
--- a/lib/libc/yp/yp_bind.c
+++ b/lib/libc/yp/yp_bind.c
@@ -31,15 +31,15 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: yp_bind.c,v 1.9 1997/04/29 21:25:20 deraadt Exp $";
+static char *rcsid = "$OpenBSD: yp_bind.c,v 1.10 1999/08/17 09:13:13 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/file.h>
 #include <sys/uio.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>