Use <fcntl.h> instead of <sys/file.h> for open() and friends.

Delete a bunch of unnecessary #includes and sort to match style(9)
while doing the above cleanup.

ok deraadt@ krw@

6 files changed, 12 insertions, 46 deletions

diff --git a/libexec/ld.so/ldconfig/ldconfig.c b/libexec/ld.so/ldconfig/ldconfig.c
index 1badc8ca32d..6511c8a218d 100644
--- a/libexec/ld.so/ldconfig/ldconfig.c
+++ b/libexec/ld.so/ldconfig/ldconfig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldconfig.c,v 1.36 2016/07/04 20:56:50 kettenis Exp $	*/
+/*	$OpenBSD: ldconfig.c,v 1.37 2018/04/26 12:42:50 guenther Exp $	*/
 
 /*
  * Copyright (c) 1993,1995 Paul Kranenburg
@@ -32,11 +32,8 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/file.h>
-#include <sys/time.h>
 #include <sys/mman.h>
-#include <sys/resource.h>
-#include <ctype.h>
+
 #include <dirent.h>
 #include <err.h>
 #include <errno.h>
diff --git a/libexec/ld.so/ldconfig/shlib.c b/libexec/ld.so/ldconfig/shlib.c
index eced53c4b18..f496c5581ae 100644
--- a/libexec/ld.so/ldconfig/shlib.c
+++ b/libexec/ld.so/ldconfig/shlib.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: shlib.c,v 1.12 2015/12/22 08:15:05 mmcc Exp $	*/
+/*	$OpenBSD: shlib.c,v 1.13 2018/04/26 12:42:50 guenther Exp $	*/
 /*	$NetBSD: shlib.c,v 1.13 1998/04/04 01:00:29 fvdl Exp $	*/
 
 /*
@@ -32,16 +32,8 @@
  *
  */
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-#include <sys/time.h>
-#include <ranlib.h>
 #include <ctype.h>
-#include <dirent.h>
 #include <err.h>
-#include <fcntl.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/libexec/login_chpass/login_chpass.c b/libexec/login_chpass/login_chpass.c
index 4afe266d6f7..c82ff4115f5 100644
--- a/libexec/login_chpass/login_chpass.c
+++ b/libexec/login_chpass/login_chpass.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: login_chpass.c,v 1.20 2015/11/26 19:01:47 deraadt Exp $	*/
+/*	$OpenBSD: login_chpass.c,v 1.21 2018/04/26 12:42:51 guenther Exp $	*/
 
 /*-
  * Copyright (c) 1995,1996 Berkeley Software Design, Inc. All rights reserved.
@@ -33,23 +33,14 @@
  *
  *	BSDI $From: login_chpass.c,v 1.3 1996/08/21 21:01:48 prb Exp $
  */
-#include <sys/stat.h>
-#include <sys/time.h>
+
 #include <sys/resource.h>
-#include <sys/file.h>
-#include <sys/uio.h>
-#include <sys/wait.h>
 
 #include <err.h>
-#include <errno.h>
-#include <pwd.h>
-#include <signal.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
 #include <unistd.h>
-#include <login_cap.h>
 
 #define	_PATH_LOGIN_LCHPASS	"/usr/libexec/auth/login_lchpass"
 
diff --git a/libexec/login_lchpass/login_lchpass.c b/libexec/login_lchpass/login_lchpass.c
index a81098e123a..3d7dc305361 100644
--- a/libexec/login_lchpass/login_lchpass.c
+++ b/libexec/login_lchpass/login_lchpass.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: login_lchpass.c,v 1.20 2016/09/03 10:48:15 gsoares Exp $	*/
+/*	$OpenBSD: login_lchpass.c,v 1.21 2018/04/26 12:42:51 guenther Exp $	*/
 
 /*-
  * Copyright (c) 1995,1996 Berkeley Software Design, Inc. All rights reserved.
@@ -33,23 +33,16 @@
  *
  *	BSDI $From: login_lchpass.c,v 1.4 1997/08/08 18:58:23 prb Exp $
  */
-#include <sys/stat.h>
-#include <sys/time.h>
+
 #include <sys/resource.h>
-#include <sys/file.h>
 #include <sys/uio.h>
-#include <sys/wait.h>
 
-#include <err.h>
-#include <errno.h>
 #include <pwd.h>
-#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
 #include <unistd.h>
-#include <stdarg.h>
 #include <login_cap.h>
 #include <readpassphrase.h>
 
diff --git a/libexec/login_reject/login_reject.c b/libexec/login_reject/login_reject.c
index 3927bc33bbd..f3e3499b92b 100644
--- a/libexec/login_reject/login_reject.c
+++ b/libexec/login_reject/login_reject.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: login_reject.c,v 1.16 2016/09/03 10:51:26 gsoares Exp $	*/
+/*	$OpenBSD: login_reject.c,v 1.17 2018/04/26 12:42:51 guenther Exp $	*/
 
 /*-
  * Copyright (c) 1995 Berkeley Software Design, Inc. All rights reserved.
@@ -33,19 +33,11 @@
  *
  *	BSDI $From: login_reject.c,v 1.5 1996/08/22 20:43:11 prb Exp $
  */
-#include <sys/stat.h>
-#include <sys/time.h>
+
 #include <sys/resource.h>
-#include <sys/file.h>
-#include <sys/wait.h>
 
-#include <err.h>
-#include <errno.h>
 #include <login_cap.h>
-#include <pwd.h>
 #include <readpassphrase.h>
-#include <signal.h>
-#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/libexec/rpc.rusersd/rusersd.c b/libexec/rpc.rusersd/rusersd.c
index 4e3ebd93c65..7b9a36fb21d 100644
--- a/libexec/rpc.rusersd/rusersd.c
+++ b/libexec/rpc.rusersd/rusersd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rusersd.c,v 1.19 2016/09/04 15:03:13 jca Exp $	*/
+/*	$OpenBSD: rusersd.c,v 1.20 2018/04/26 12:42:51 guenther Exp $	*/
 
 /*-
  *  Copyright (c) 1993 John Brezak
@@ -30,7 +30,8 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/file.h>
+
+#include <fcntl.h>
 #include <stdio.h>
 #include <signal.h>
 #include <unistd.h>