diff options
50 files changed, 87 insertions, 181 deletions
diff --git a/distrib/common/elfrd_size.c b/distrib/common/elfrd_size.c index d53442b69ff..966b2bfc7b8 100644 --- a/distrib/common/elfrd_size.c +++ b/distrib/common/elfrd_size.c @@ -1,7 +1,6 @@ -/* $OpenBSD: elfrd_size.c,v 1.8 2017/12/03 19:32:19 tb Exp $ */ +/* $OpenBSD: elfrd_size.c,v 1.9 2018/04/26 12:42:50 guenther Exp $ */ #include <sys/types.h> -#include <sys/file.h> #include <sys/mman.h> #include <sys/stat.h> diff --git a/distrib/common/elfrdsetroot.c b/distrib/common/elfrdsetroot.c index 905047ba6db..42db343da03 100644 --- a/distrib/common/elfrdsetroot.c +++ b/distrib/common/elfrdsetroot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: elfrdsetroot.c,v 1.25 2017/12/03 19:32:19 tb Exp $ */ +/* $OpenBSD: elfrdsetroot.c,v 1.26 2018/04/26 12:42:50 guenther Exp $ */ /* $NetBSD: rdsetroot.c,v 1.2 1995/10/13 16:38:39 gwr Exp $ */ /* @@ -35,15 +35,14 @@ */ #include <sys/types.h> -#include <sys/file.h> #include <sys/mman.h> #include <sys/stat.h> #include <elf.h> +#include <fcntl.h> #include <stdio.h> #include <stdlib.h> #include <unistd.h> -#include <nlist.h> #include "elfrdsetroot.h" diff --git a/distrib/special/more/more.c b/distrib/special/more/more.c index b4a81e642eb..754f29202af 100644 --- a/distrib/special/more/more.c +++ b/distrib/special/more/more.c @@ -1,4 +1,4 @@ -/* $OpenBSD: more.c,v 1.38 2015/11/15 07:12:50 deraadt Exp $ */ +/* $OpenBSD: more.c,v 1.39 2018/04/26 12:42:50 guenther Exp $ */ /* * Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com> @@ -65,9 +65,7 @@ #include <sys/types.h> #include <sys/exec.h> #include <sys/ioctl.h> -#include <sys/file.h> #include <sys/stat.h> -#include <sys/wait.h> #include <ctype.h> #include <curses.h> @@ -75,7 +73,6 @@ #include <locale.h> #include <regex.h> #include <signal.h> -#include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> 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> diff --git a/usr.bin/cdio/cdio.c b/usr.bin/cdio/cdio.c index 0177630da6e..d0a35423478 100644 --- a/usr.bin/cdio/cdio.c +++ b/usr.bin/cdio/cdio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cdio.c,v 1.74 2015/01/16 06:40:06 deraadt Exp $ */ +/* $OpenBSD: cdio.c,v 1.75 2018/04/26 12:42:51 guenther Exp $ */ /* Copyright (c) 1995 Serge V. Vakulenko * All rights reserved. @@ -53,7 +53,6 @@ */ #include <sys/param.h> /* isset */ -#include <sys/file.h> #include <sys/cdio.h> #include <sys/ioctl.h> #include <sys/queue.h> @@ -63,6 +62,7 @@ #include <ctype.h> #include <err.h> #include <errno.h> +#include <fcntl.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/usr.bin/finger/finger.c b/usr.bin/finger/finger.c index aad0f07a107..3178b946ed8 100644 --- a/usr.bin/finger/finger.c +++ b/usr.bin/finger/finger.c @@ -1,4 +1,4 @@ -/* $OpenBSD: finger.c,v 1.26 2015/11/03 05:13:35 mmcc Exp $ */ +/* $OpenBSD: finger.c,v 1.27 2018/04/26 12:42:51 guenther Exp $ */ /* * Copyright (c) 1989 The Regents of the University of California. @@ -56,7 +56,6 @@ * well as home directory, shell, mail info, and .plan/.project files. */ -#include <sys/file.h> #include <sys/stat.h> #include <stdio.h> #include <stdlib.h> diff --git a/usr.bin/finger/lprint.c b/usr.bin/finger/lprint.c index b3dce893c89..03de1aa5cf3 100644 --- a/usr.bin/finger/lprint.c +++ b/usr.bin/finger/lprint.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lprint.c,v 1.12 2015/03/15 00:41:28 millert Exp $ */ +/* $OpenBSD: lprint.c,v 1.13 2018/04/26 12:42:51 guenther Exp $ */ /* * Copyright (c) 1989 The Regents of the University of California. @@ -32,10 +32,6 @@ * SUCH DAMAGE. */ -#include <sys/types.h> -#include <sys/file.h> -#include <sys/stat.h> -#include <sys/time.h> #include <stdio.h> #include <string.h> #include <time.h> diff --git a/usr.bin/hexdump/parse.c b/usr.bin/hexdump/parse.c index 103bf932d1c..a137696ffb3 100644 --- a/usr.bin/hexdump/parse.c +++ b/usr.bin/hexdump/parse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.c,v 1.22 2016/09/04 16:41:43 tb Exp $ */ +/* $OpenBSD: parse.c,v 1.23 2018/04/26 12:42:51 guenther Exp $ */ /* $NetBSD: parse.c,v 1.12 2001/12/07 13:37:39 bjh21 Exp $ */ /* @@ -30,13 +30,8 @@ * SUCH DAMAGE. */ -#include <sys/types.h> -#include <sys/file.h> - #include <ctype.h> #include <err.h> -#include <errno.h> -#include <fcntl.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/usr.bin/ktrace/subr.c b/usr.bin/ktrace/subr.c index 43a5717ced7..02e394a8960 100644 --- a/usr.bin/ktrace/subr.c +++ b/usr.bin/ktrace/subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr.c,v 1.13 2016/07/18 09:36:50 guenther Exp $ */ +/* $OpenBSD: subr.c,v 1.14 2018/04/26 12:42:51 guenther Exp $ */ /* $NetBSD: subr.c,v 1.6 1995/08/31 23:01:45 jtc Exp $ */ /*- @@ -31,14 +31,9 @@ */ #include <sys/param.h> /* MAXCOMLEN */ -#include <sys/file.h> -#include <sys/user.h> -#include <sys/proc.h> #include <sys/time.h> #include <sys/ktrace.h> -#include <stdio.h> - #include "ktrace.h" #include "extern.h" diff --git a/usr.bin/mail/fio.c b/usr.bin/mail/fio.c index 8f30b9acb57..0a9cd269b5a 100644 --- a/usr.bin/mail/fio.c +++ b/usr.bin/mail/fio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fio.c,v 1.36 2015/10/16 18:21:43 mmcc Exp $ */ +/* $OpenBSD: fio.c,v 1.37 2018/04/26 12:42:51 guenther Exp $ */ /* $NetBSD: fio.c,v 1.8 1997/07/07 22:57:55 phil Exp $ */ /* @@ -31,8 +31,6 @@ */ #include "rcv.h" -#include <sys/file.h> -#include <sys/wait.h> #include <unistd.h> #include <paths.h> diff --git a/usr.bin/netstat/net80211.c b/usr.bin/netstat/net80211.c index 465cbde5804..35ab41d34b5 100644 --- a/usr.bin/netstat/net80211.c +++ b/usr.bin/netstat/net80211.c @@ -1,4 +1,4 @@ -/* $OpenBSD: net80211.c,v 1.17 2016/08/27 04:13:43 guenther Exp $ */ +/* $OpenBSD: net80211.c,v 1.18 2018/04/26 12:42:51 guenther Exp $ */ /* * Copyright (c) 2005 Reyk Floeter <reyk@openbsd.org> @@ -17,10 +17,8 @@ */ #include <sys/types.h> -#include <sys/time.h> -#include <sys/select.h> +#include <sys/select.h> /* howmany() NBBY */ #include <sys/socket.h> -#include <sys/file.h> #include <sys/ioctl.h> #include <net/if.h> diff --git a/usr.bin/netstat/unix.c b/usr.bin/netstat/unix.c index 19af38ba091..2d939b667a5 100644 --- a/usr.bin/netstat/unix.c +++ b/usr.bin/netstat/unix.c @@ -1,4 +1,4 @@ -/* $OpenBSD: unix.c,v 1.31 2018/01/05 10:41:24 mpi Exp $ */ +/* $OpenBSD: unix.c,v 1.32 2018/04/26 12:42:51 guenther Exp $ */ /* $NetBSD: unix.c,v 1.13 1995/10/03 21:42:48 thorpej Exp $ */ /*- @@ -41,7 +41,6 @@ #include <sys/un.h> #include <sys/unpcb.h> #include <sys/ucred.h> -#include <sys/file.h> #include <netinet/in.h> diff --git a/usr.bin/nohup/nohup.c b/usr.bin/nohup/nohup.c index 5c629d6ad47..d411a0c3c2a 100644 --- a/usr.bin/nohup/nohup.c +++ b/usr.bin/nohup/nohup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nohup.c,v 1.16 2015/11/09 16:52:32 deraadt Exp $ */ +/* $OpenBSD: nohup.c,v 1.17 2018/04/26 12:42:51 guenther Exp $ */ /* $NetBSD: nohup.c,v 1.6 1995/08/31 23:35:25 jtc Exp $ */ /* @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#include <sys/file.h> #include <sys/stat.h> #include <fcntl.h> #include <unistd.h> diff --git a/usr.bin/patch/inp.c b/usr.bin/patch/inp.c index 45f89d29d49..178e365f144 100644 --- a/usr.bin/patch/inp.c +++ b/usr.bin/patch/inp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inp.c,v 1.47 2017/03/25 23:13:45 deraadt Exp $ */ +/* $OpenBSD: inp.c,v 1.48 2018/04/26 12:42:51 guenther Exp $ */ /* * patch - a program to apply diffs to original files @@ -26,13 +26,11 @@ * behaviour */ -#include <sys/types.h> -#include <sys/file.h> #include <sys/stat.h> #include <sys/mman.h> #include <ctype.h> -#include <libgen.h> +#include <fcntl.h> #include <stddef.h> #include <stdint.h> #include <stdio.h> diff --git a/usr.bin/quota/quota.c b/usr.bin/quota/quota.c index e75b1541c54..b73fe290079 100644 --- a/usr.bin/quota/quota.c +++ b/usr.bin/quota/quota.c @@ -1,4 +1,4 @@ -/* $OpenBSD: quota.c,v 1.38 2016/03/16 15:41:11 krw Exp $ */ +/* $OpenBSD: quota.c,v 1.39 2018/04/26 12:42:51 guenther Exp $ */ /* * Copyright (c) 1980, 1990, 1993 @@ -37,8 +37,6 @@ */ #include <sys/param.h> /* DEV_BSIZE dbtob */ #include <sys/types.h> -#include <sys/file.h> -#include <sys/stat.h> #include <sys/mount.h> #include <sys/socket.h> @@ -46,6 +44,7 @@ #include <ctype.h> #include <err.h> #include <errno.h> +#include <fcntl.h> #include <fstab.h> #include <grp.h> #include <netdb.h> diff --git a/usr.bin/rpcgen/rpc_main.c b/usr.bin/rpcgen/rpc_main.c index fca4da19308..0abb7d70263 100644 --- a/usr.bin/rpcgen/rpc_main.c +++ b/usr.bin/rpcgen/rpc_main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rpc_main.c,v 1.33 2017/01/21 08:33:07 krw Exp $ */ +/* $OpenBSD: rpc_main.c,v 1.34 2018/04/26 12:42:51 guenther Exp $ */ /* $NetBSD: rpc_main.c,v 1.9 1996/02/19 11:12:43 pk Exp $ */ /* @@ -38,8 +38,6 @@ #define RPCGEN_VERSION "199506"/* This program's version (year & month) */ -#include <sys/types.h> -#include <sys/file.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/usr.bin/showmount/showmount.c b/usr.bin/showmount/showmount.c index 0cf8db350e6..0d0483e0c83 100644 --- a/usr.bin/showmount/showmount.c +++ b/usr.bin/showmount/showmount.c @@ -1,4 +1,4 @@ -/* $OpenBSD: showmount.c,v 1.22 2018/01/05 08:13:31 mpi Exp $ */ +/* $OpenBSD: showmount.c,v 1.23 2018/04/26 12:42:51 guenther Exp $ */ /* $NetBSD: showmount.c,v 1.7 1996/05/01 18:14:10 cgd Exp $ */ /* @@ -33,8 +33,6 @@ * SUCH DAMAGE. */ -#include <sys/types.h> -#include <sys/file.h> #include <sys/socket.h> #include <netdb.h> diff --git a/usr.bin/skeyinit/skeyinit.c b/usr.bin/skeyinit/skeyinit.c index a61c3ddcf86..173b124d94f 100644 --- a/usr.bin/skeyinit/skeyinit.c +++ b/usr.bin/skeyinit/skeyinit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: skeyinit.c,v 1.72 2016/05/17 23:36:29 tb Exp $ */ +/* $OpenBSD: skeyinit.c,v 1.73 2018/04/26 12:42:51 guenther Exp $ */ /* OpenBSD S/Key (skeyinit.c) * @@ -12,14 +12,12 @@ * S/Key initialization and seed update */ -#include <sys/file.h> -#include <sys/resource.h> #include <sys/stat.h> -#include <sys/time.h> #include <ctype.h> #include <err.h> #include <errno.h> +#include <fcntl.h> #include <pwd.h> #include <readpassphrase.h> #include <stdio.h> diff --git a/usr.bin/tftp/main.c b/usr.bin/tftp/main.c index 546684b885a..0f85ecb60d3 100644 --- a/usr.bin/tftp/main.c +++ b/usr.bin/tftp/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.41 2017/01/21 11:32:04 guenther Exp $ */ +/* $OpenBSD: main.c,v 1.42 2018/04/26 12:42:51 guenther Exp $ */ /* $NetBSD: main.c,v 1.6 1995/05/21 16:54:10 mycroft Exp $ */ /* @@ -37,7 +37,6 @@ */ #include <sys/socket.h> -#include <sys/file.h> #include <netinet/in.h> #include <arpa/inet.h> @@ -46,6 +45,7 @@ #include <ctype.h> #include <err.h> #include <errno.h> +#include <fcntl.h> #include <netdb.h> #include <poll.h> #include <signal.h> diff --git a/usr.bin/tmux/client.c b/usr.bin/tmux/client.c index f3b2ed31d1c..29db814efce 100644 --- a/usr.bin/tmux/client.c +++ b/usr.bin/tmux/client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: client.c,v 1.126 2018/01/01 11:19:08 nicm Exp $ */ +/* $OpenBSD: client.c,v 1.127 2018/04/26 12:42:51 guenther Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -17,9 +17,7 @@ */ #include <sys/types.h> -#include <sys/file.h> #include <sys/socket.h> -#include <sys/stat.h> #include <sys/un.h> #include <sys/wait.h> diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c index e92a9fca2b1..4f2e862c45b 100644 --- a/usr.bin/wc/wc.c +++ b/usr.bin/wc/wc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wc.c,v 1.21 2016/09/16 09:25:23 fcambus Exp $ */ +/* $OpenBSD: wc.c,v 1.22 2018/04/26 12:42:51 guenther Exp $ */ /* * Copyright (c) 1980, 1987, 1991, 1993 @@ -31,7 +31,8 @@ #include <sys/param.h> /* MAXBSIZE */ #include <sys/stat.h> -#include <sys/file.h> + +#include <fcntl.h> #include <stdio.h> #include <stdlib.h> #include <locale.h> 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> |