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@

24 files changed, 46 insertions, 70 deletions

diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c
index 3e9da2f9f5d..97d0f82034e 100644
--- a/usr.sbin/ac/ac.c
+++ b/usr.sbin/ac/ac.c
@@ -25,9 +25,8 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/types.h>
-#include <sys/file.h>
 #include <sys/time.h>
+
 #include <err.h>
 #include <errno.h>
 #include <pwd.h>
diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c
index 886a0fbc6b1..b424ef06ad0 100644
--- a/usr.sbin/arp/arp.c
+++ b/usr.sbin/arp/arp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: arp.c,v 1.80 2017/12/23 20:53:07 cheloha Exp $ */
+/*	$OpenBSD: arp.c,v 1.81 2018/04/26 12:42:51 guenther Exp $ */
 /*	$NetBSD: arp.c,v 1.12 1995/04/24 13:25:18 cgd Exp $ */
 
 /*
@@ -37,7 +37,6 @@
  * arp - display, set, delete arp table entries and wake up hosts.
  */
 
-#include <sys/file.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
 #include <sys/ioctl.h>
@@ -53,11 +52,11 @@
 #include <netdb.h>
 #include <errno.h>
 #include <err.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <paths.h>
 #include <unistd.h>
 #include <limits.h>
 #include <ifaddrs.h>
diff --git a/usr.sbin/authpf/authpf.c b/usr.sbin/authpf/authpf.c
index dc24ec4a008..f8039ab0891 100644
--- a/usr.sbin/authpf/authpf.c
+++ b/usr.sbin/authpf/authpf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: authpf.c,v 1.126 2018/01/16 17:07:49 cheloha Exp $	*/
+/*	$OpenBSD: authpf.c,v 1.127 2018/04/26 12:42:51 guenther Exp $	*/
 
 /*
  * Copyright (C) 1998 - 2007 Bob Beck (beck@openbsd.org).
@@ -17,7 +17,6 @@
  */
 
 #include <sys/types.h>
-#include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
@@ -30,6 +29,7 @@
 
 #include <err.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <login_cap.h>
 #include <pwd.h>
 #include <grp.h>
diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c
index 42a9d35fc06..b2429231f1d 100644
--- a/usr.sbin/edquota/edquota.c
+++ b/usr.sbin/edquota/edquota.c
@@ -35,13 +35,13 @@
  */
 #include <sys/param.h>	/* btodb dbtob */
 #include <sys/stat.h>
-#include <sys/file.h>
 #include <sys/wait.h>
 #include <ufs/ufs/quota.h>
 
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <fstab.h>
 #include <grp.h>
 #include <paths.h>
diff --git a/usr.sbin/hostapd/print-802_11.c b/usr.sbin/hostapd/print-802_11.c
index 66643834825..29e27eb2f5f 100644
--- a/usr.sbin/hostapd/print-802_11.c
+++ b/usr.sbin/hostapd/print-802_11.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print-802_11.c,v 1.9 2016/01/12 09:28:10 stsp Exp $	*/
+/*	$OpenBSD: print-802_11.c,v 1.10 2018/04/26 12:42:51 guenther Exp $	*/
 
 /*
  * Copyright (c) 2005 Reyk Floeter <reyk@openbsd.org>
@@ -20,8 +20,6 @@
 
 #include <sys/time.h>
 #include <sys/socket.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>
diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c
index b399a21311a..fce5fa658d7 100644
--- a/usr.sbin/inetd/inetd.c
+++ b/usr.sbin/inetd/inetd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inetd.c,v 1.158 2017/10/04 23:56:48 jca Exp $	*/
+/*	$OpenBSD: inetd.c,v 1.159 2018/04/26 12:42:51 guenther Exp $	*/
 
 /*
  * Copyright (c) 1983,1991 The Regents of the University of California.
@@ -122,10 +122,8 @@
  */
 
 #include <sys/stat.h>
-#include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/un.h>
-#include <sys/file.h>
 #include <sys/wait.h>
 #include <sys/time.h>
 #include <sys/resource.h>
diff --git a/usr.sbin/kgmon/kgmon.c b/usr.sbin/kgmon/kgmon.c
index 357e4325414..70c7929b301 100644
--- a/usr.sbin/kgmon/kgmon.c
+++ b/usr.sbin/kgmon/kgmon.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kgmon.c,v 1.24 2016/08/27 01:50:07 guenther Exp $	*/
+/*	$OpenBSD: kgmon.c,v 1.25 2018/04/26 12:42:51 guenther Exp $	*/
 
 /*
  * Copyright (c) 1983, 1992, 1993
@@ -29,12 +29,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/file.h>
+#include <sys/types.h>
 #include <sys/sysctl.h>
 #include <sys/time.h>
 #include <sys/gmon.h>
+
 #include <errno.h>
 #include <err.h>
+#include <fcntl.h>
 #include <kvm.h>
 #include <limits.h>
 #include <stdio.h>
@@ -42,7 +44,6 @@
 #include <unistd.h>
 #include <string.h>
 #include <nlist.h>
-#include <ctype.h>
 #include <paths.h>
 
 struct nlist nl[] = {
diff --git a/usr.sbin/kvm_mkdb/nlist.c b/usr.sbin/kvm_mkdb/nlist.c
index 4c59441cf63..7745642103e 100644
--- a/usr.sbin/kvm_mkdb/nlist.c
+++ b/usr.sbin/kvm_mkdb/nlist.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nlist.c,v 1.51 2017/10/27 16:47:08 mpi Exp $	*/
+/*	$OpenBSD: nlist.c,v 1.52 2018/04/26 12:42:51 guenther Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -30,8 +30,11 @@
  */
 
 #include <sys/types.h>
+#include <sys/mman.h>
+#include <sys/sysctl.h>
 
 #include <db.h>
+#include <elf.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -45,13 +48,6 @@
 
 #include "extern.h"
 
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-#include <sys/sysctl.h>
-
-#include <elf.h>
-
 typedef struct nlist NLIST;
 #define	_strx	n_un.n_strx
 #define	_name	n_un.n_name
diff --git a/usr.sbin/ldapd/uuid.c b/usr.sbin/ldapd/uuid.c
index be2575df6d4..46a1cf1e17e 100644
--- a/usr.sbin/ldapd/uuid.c
+++ b/usr.sbin/ldapd/uuid.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uuid.c,v 1.5 2016/08/27 01:42:37 guenther Exp $ */
+/*	$OpenBSD: uuid.c,v 1.6 2018/04/26 12:42:51 guenther Exp $ */
 /*
  * Copyright (c) 2002, Stockholms Universitet
  * (Stockholm University, Stockholm Sweden)
@@ -53,7 +53,6 @@
 #include <net/if.h>
 #include <net/if_types.h>
 #include <net/if_dl.h>
-#include <sys/file.h>
 
 #include <fcntl.h>
 #include <ifaddrs.h>
diff --git a/usr.sbin/lpr/common_source/displayq.c b/usr.sbin/lpr/common_source/displayq.c
index 415cd581865..4eb544202d3 100644
--- a/usr.sbin/lpr/common_source/displayq.c
+++ b/usr.sbin/lpr/common_source/displayq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: displayq.c,v 1.39 2016/03/17 05:27:10 bentley Exp $	*/
+/*	$OpenBSD: displayq.c,v 1.40 2018/04/26 12:42:51 guenther Exp $	*/
 /*	$NetBSD: displayq.c,v 1.21 2001/08/30 00:51:50 itojun Exp $	*/
 
 /*
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 
diff --git a/usr.sbin/lpr/lpc/cmds.c b/usr.sbin/lpr/lpc/cmds.c
index d27788c9429..149904f7960 100644
--- a/usr.sbin/lpr/lpc/cmds.c
+++ b/usr.sbin/lpr/lpc/cmds.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmds.c,v 1.27 2015/01/16 06:40:18 deraadt Exp $	*/
+/*	$OpenBSD: cmds.c,v 1.28 2018/04/26 12:42:51 guenther Exp $	*/
 /*	$NetBSD: cmds.c,v 1.12 1997/10/05 15:12:06 mrg Exp $	*/
 
 /*
@@ -37,7 +37,6 @@
 
 #include <sys/time.h>
 #include <sys/stat.h>
-#include <sys/file.h>
 
 #include <signal.h>
 #include <fcntl.h>
diff --git a/usr.sbin/lpr/lpd/lpd.c b/usr.sbin/lpr/lpd/lpd.c
index bd4f48c1485..e0d9196cfbb 100644
--- a/usr.sbin/lpr/lpd/lpd.c
+++ b/usr.sbin/lpr/lpd/lpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lpd.c,v 1.64 2016/02/29 17:26:01 jca Exp $	*/
+/*	$OpenBSD: lpd.c,v 1.65 2018/04/26 12:42:51 guenther Exp $	*/
 /*	$NetBSD: lpd.c,v 1.33 2002/01/21 14:42:29 wiz Exp $	*/
 
 /*
@@ -63,12 +63,12 @@
  * Users can't touch the spool w/o the help of one of the lp* programs.
  */
 
-#include <sys/wait.h>
 #include <sys/types.h>
+#include <sys/wait.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/stat.h>
-#include <sys/file.h>
+
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
diff --git a/usr.sbin/lpr/lpd/printjob.c b/usr.sbin/lpr/lpd/printjob.c
index 280e1850aa9..ff9428359f1 100644
--- a/usr.sbin/lpr/lpd/printjob.c
+++ b/usr.sbin/lpr/lpd/printjob.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: printjob.c,v 1.59 2017/09/20 05:08:11 guenther Exp $	*/
+/*	$OpenBSD: printjob.c,v 1.60 2018/04/26 12:42:51 guenther Exp $	*/
 /*	$NetBSD: printjob.c,v 1.31 2002/01/21 14:42:30 wiz Exp $	*/
 
 /*
@@ -38,10 +38,9 @@
  *	it does not need to be removed because file locks are dynamic.
  */
 
+#include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/file.h>
 
 #include <pwd.h>
 #include <unistd.h>
diff --git a/usr.sbin/lpr/lpr/lpr.c b/usr.sbin/lpr/lpr/lpr.c
index 1bb9eb2f95a..9f95109b38f 100644
--- a/usr.sbin/lpr/lpr/lpr.c
+++ b/usr.sbin/lpr/lpr/lpr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lpr.c,v 1.48 2015/02/09 23:00:14 deraadt Exp $ */
+/*	$OpenBSD: lpr.c,v 1.49 2018/04/26 12:42:51 guenther Exp $ */
 /*	$NetBSD: lpr.c,v 1.19 2000/10/11 20:23:52 is Exp $	*/
 
 /*
@@ -44,7 +44,6 @@
  */
 
 #include <sys/stat.h>
-#include <sys/file.h>
 
 #include <dirent.h>
 #include <errno.h>
diff --git a/usr.sbin/makefs/msdos/msdosfs_fat.c b/usr.sbin/makefs/msdos/msdosfs_fat.c
index c2fb2db6c42..5ac212b6b8b 100644
--- a/usr.sbin/makefs/msdos/msdosfs_fat.c
+++ b/usr.sbin/makefs/msdos/msdosfs_fat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_fat.c,v 1.4 2016/12/17 16:43:30 krw Exp $	*/
+/*	$OpenBSD: msdosfs_fat.c,v 1.5 2018/04/26 12:42:51 guenther Exp $	*/
 /*	$NetBSD: msdosfs_fat.c,v 1.31 2016/05/07 16:43:02 mlelstv Exp $	*/
 
 /*-
@@ -52,7 +52,6 @@
  * kernel include files.
  */
 #include <sys/param.h>
-#include <sys/file.h>
 
 #include "ffs/buf.h"
 
diff --git a/usr.sbin/mopd/common/pf.c b/usr.sbin/mopd/common/pf.c
index d38b1095e9d..7bcf73d426c 100644
--- a/usr.sbin/mopd/common/pf.c
+++ b/usr.sbin/mopd/common/pf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf.c,v 1.17 2017/04/19 05:36:13 natano Exp $ */
+/*	$OpenBSD: pf.c,v 1.18 2018/04/26 12:42:51 guenther Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,12 +28,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
-#include <unistd.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/ioctl.h>
-#include <sys/file.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
 #include <net/if.h>
@@ -48,8 +45,10 @@
 #include <string.h>
 #include <err.h>
 #include <errno.h>
-
+#include <fcntl.h>
+#include <stdio.h>
 #include <syslog.h>
+#include <unistd.h>
 
 #include "common/mopdef.h"
 
diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c
index 937213e871c..4fed6b404a7 100644
--- a/usr.sbin/ndp/ndp.c
+++ b/usr.sbin/ndp/ndp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ndp.c,v 1.87 2017/10/25 12:09:07 mpi Exp $	*/
+/*	$OpenBSD: ndp.c,v 1.88 2018/04/26 12:42:51 guenther Exp $	*/
 /*	$KAME: ndp.c,v 1.101 2002/07/17 08:46:33 itojun Exp $	*/
 
 /*
@@ -74,7 +74,6 @@
  */
 
 
-#include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
@@ -98,7 +97,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>
-#include <paths.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/usr.sbin/quotaon/quotaon.c b/usr.sbin/quotaon/quotaon.c
index 5d782bdd49e..f70f6f99c53 100644
--- a/usr.sbin/quotaon/quotaon.c
+++ b/usr.sbin/quotaon/quotaon.c
@@ -33,9 +33,10 @@
 /*
  * Turn quota on/off for a filesystem.
  */
-#include <sys/file.h>
+#include <sys/types.h>
 #include <sys/mount.h>
 #include <ufs/ufs/quota.h>
+
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr.sbin/rarpd/arptab.c b/usr.sbin/rarpd/arptab.c
index 5eca91f50e0..44526e86c98 100644
--- a/usr.sbin/rarpd/arptab.c
+++ b/usr.sbin/rarpd/arptab.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: arptab.c,v 1.28 2016/08/27 01:42:37 guenther Exp $ */
+/*	$OpenBSD: arptab.c,v 1.29 2018/04/26 12:42:51 guenther Exp $ */
 
 /*
  * Copyright (c) 1984, 1993
@@ -37,9 +37,7 @@
  */
 
 
-#include <sys/file.h>
 #include <sys/socket.h>
-#include <sys/sysctl.h>
 #include <sys/time.h>
 
 #include <net/if.h>
@@ -54,10 +52,10 @@
 
 #include <netdb.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <paths.h>
 #include <syslog.h>
 #include <string.h>
 #include <err.h>
diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c
index a2dc5d9c4a0..451de3ea5f2 100644
--- a/usr.sbin/rarpd/rarpd.c
+++ b/usr.sbin/rarpd/rarpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rarpd.c,v 1.72 2017/04/19 05:36:13 natano Exp $ */
+/*	$OpenBSD: rarpd.c,v 1.73 2018/04/26 12:42:51 guenther Exp $ */
 /*	$NetBSD: rarpd.c,v 1.25 1998/04/23 02:48:33 mrg Exp $	*/
 
 /*
@@ -26,8 +26,6 @@
  * rarpd - Reverse ARP Daemon
  */
 
-#include <sys/time.h>
-#include <sys/file.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <net/bpf.h>
@@ -45,12 +43,12 @@
 #include <unistd.h>
 #include <limits.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <netdb.h>
 #include <arpa/inet.h>
 #include <dirent.h>
 #include <poll.h>
 #include <ifaddrs.h>
-#include <paths.h>
 
 /*
  * The structures for each interface.
diff --git a/usr.sbin/rmt/rmt.c b/usr.sbin/rmt/rmt.c
index e6cc762f2b0..7979cca61a2 100644
--- a/usr.sbin/rmt/rmt.c
+++ b/usr.sbin/rmt/rmt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rmt.c,v 1.20 2016/08/14 18:34:48 guenther Exp $	*/
+/*	$OpenBSD: rmt.c,v 1.21 2018/04/26 12:42:51 guenther Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -34,15 +34,16 @@
  */
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/mtio.h>
+
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <err.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <string.h>
 #include <limits.h>
 
diff --git a/usr.sbin/trpt/trpt.c b/usr.sbin/trpt/trpt.c
index 88a4bf0abed..2ed3f207f24 100644
--- a/usr.sbin/trpt/trpt.c
+++ b/usr.sbin/trpt/trpt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trpt.c,v 1.35 2017/05/18 11:38:07 mpi Exp $	*/
+/*	$OpenBSD: trpt.c,v 1.36 2018/04/26 12:42:51 guenther Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -67,7 +67,6 @@
 #define _KERNEL
 #include <sys/timeout.h>		/* to get timeout_pending() and such */
 #undef _KERNEL
-#include <sys/file.h>
 
 #include <net/route.h>
 #include <net/if.h>
@@ -91,6 +90,7 @@
 #include <err.h>
 #include <stdio.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <kvm.h>
 #include <nlist.h>
 #include <paths.h>
diff --git a/usr.sbin/ypbind/ypbind.c b/usr.sbin/ypbind/ypbind.c
index 7b1a85c0918..ef85d588728 100644
--- a/usr.sbin/ypbind/ypbind.c
+++ b/usr.sbin/ypbind/ypbind.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypbind.c,v 1.70 2017/06/12 18:56:13 millert Exp $ */
+/*	$OpenBSD: ypbind.c,v 1.71 2018/04/26 12:42:51 guenther Exp $ */
 
 /*
  * Copyright (c) 1992, 1993, 1996, 1997, 1998 Theo de Raadt <deraadt@openbsd.org>
@@ -29,11 +29,11 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
-#include <sys/file.h>
 #include <sys/fcntl.h>
 #include <sys/uio.h>
 #include <sys/syslog.h>
 #include <net/if.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
diff --git a/usr.sbin/ypserv/common/yplib_host.c b/usr.sbin/ypserv/common/yplib_host.c
index 4bea9869199..4a421074c93 100644
--- a/usr.sbin/ypserv/common/yplib_host.c
+++ b/usr.sbin/ypserv/common/yplib_host.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yplib_host.c,v 1.19 2015/09/11 12:42:47 deraadt Exp $ */
+/*	$OpenBSD: yplib_host.c,v 1.20 2018/04/26 12:42:51 guenther Exp $ */
 
 /*
  * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@theos.com>
@@ -26,18 +26,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/file.h>
-#include <sys/uio.h>
-#include <errno.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-#include <unistd.h>
 #include <rpc/rpc.h>
 #include <rpc/xdr.h>
 #include <rpcsvc/yp.h>