mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2024-12-21 23:18:00 -08:00
Code

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

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

ok deraadt@ krw@
This commit is contained in:
guenther 2018-04-26 12:42:50 +00:00
parent e4ca1de84a
commit f414793931
50 changed files with 90 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
distrib/common/elfrd_size.c
View File

@ -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>

5
distrib/common/elfrdsetroot.c
View File

@ -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"

5
distrib/special/more/more.c
View File

@ -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>

7
libexec/ld.so/ldconfig/ldconfig.c
View File

@ -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>

10
libexec/ld.so/ldconfig/shlib.c
View File

@ -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>

13
libexec/login_chpass/login_chpass.c
View File

@ -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"

15
libexec/login_lchpass/login_lchpass.c
View File

@ -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 <sys/resource.h>
#include <sys/uio.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>

14
libexec/login_reject/login_reject.c
View File

@ -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 <sys/resource.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>

5
libexec/rpc.rusersd/rusersd.c
View File

@ -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>

4
usr.bin/cdio/cdio.c
View File

@ -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>

3
usr.bin/finger/finger.c
View File

@ -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>

6
usr.bin/finger/lprint.c
View File

@ -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>

7
usr.bin/hexdump/parse.c
View File

@ -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>

7
usr.bin/ktrace/subr.c
View File

@ -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"

4
usr.bin/mail/fio.c
View File

@ -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>

6
usr.bin/netstat/net80211.c
View File

@ -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>

3
usr.bin/netstat/unix.c
View File

@ -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>

3
usr.bin/nohup/nohup.c
View File

@ -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>

6
usr.bin/patch/inp.c
View File

@ -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>

5
usr.bin/quota/quota.c
View File

@ -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>

4
usr.bin/rpcgen/rpc_main.c
View File

@ -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>

4
usr.bin/showmount/showmount.c
View File

@ -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>

6
usr.bin/skeyinit/skeyinit.c
View File

@ -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>

4
usr.bin/tftp/main.c
View File

@ -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>

4
usr.bin/tmux/client.c
View File

@ -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>

5
usr.bin/wc/wc.c
View File

@ -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>

3
usr.sbin/ac/ac.c
View File

@ -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>

5
usr.sbin/arp/arp.c
View File

@ -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>

4
usr.sbin/authpf/authpf.c
View File

@ -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>

2
usr.sbin/edquota/edquota.c
View File

@ -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>

4
usr.sbin/hostapd/print-802_11.c
View File

@ -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>

4
usr.sbin/inetd/inetd.c
View File

@ -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>

7
usr.sbin/kgmon/kgmon.c
View File

@ -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[] = {

12
usr.sbin/kvm_mkdb/nlist.c
View File

@ -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

3
usr.sbin/ldapd/uuid.c
View File

@ -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>

3
usr.sbin/lpr/common_source/displayq.c
View File

@ -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>

3
usr.sbin/lpr/lpc/cmds.c
View File

@ -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>

6
usr.sbin/lpr/lpd/lpd.c
View File

@ -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>

5
usr.sbin/lpr/lpd/printjob.c
View File

@ -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>

3
usr.sbin/lpr/lpr/lpr.c
View File

@ -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>

3
usr.sbin/makefs/msdos/msdosfs_fat.c
View File

@ -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"

9
usr.sbin/mopd/common/pf.c
View File

@ -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"

4
usr.sbin/ndp/ndp.c
View File

@ -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>

3
usr.sbin/quotaon/quotaon.c
View File

@ -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>

6
usr.sbin/rarpd/arptab.c
View File

@ -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>

6
usr.sbin/rarpd/rarpd.c
View File

@ -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.

5
usr.sbin/rmt/rmt.c
View File

@ -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>

4
usr.sbin/trpt/trpt.c
View File

@ -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>

4
usr.sbin/ypbind/ypbind.c
View File

@ -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>

8
usr.sbin/ypserv/common/yplib_host.c
View File

@ -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>