diff options
| -rw-r--r-- | sbin/ifconfig/ifconfig.c | 6 | ||||
| -rw-r--r-- | usr.bin/ctfconv/ctfconv.c | 3 | ||||
| -rw-r--r-- | usr.bin/ctfconv/elf.c | 4 | ||||
| -rw-r--r-- | usr.bin/ctfconv/parse.c | 6 | ||||
| -rw-r--r-- | usr.bin/ctfconv/pool.c | 4 | ||||
| -rw-r--r-- | usr.bin/ctfdump/ctfdump.c | 3 | ||||
| -rw-r--r-- | usr.bin/ctfdump/elf.c | 4 | ||||
| -rw-r--r-- | usr.sbin/tcpdump/print-enc.c | 4 | ||||
| -rw-r--r-- | usr.sbin/vmctl/vmctl.c | 4 | ||||
| -rw-r--r-- | usr.sbin/vmd/disklabel.c | 4 | ||||
| -rw-r--r-- | usr.sbin/vmd/ufs.c | 12 | ||||
| -rw-r--r-- | usr.sbin/vmd/vmboot.c | 4 |
12 files changed, 29 insertions, 29 deletions
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index bb52ac90458..0d2bedbabe2 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ifconfig.c,v 1.347 2017/08/29 20:06:51 stsp Exp $ */ +/* $OpenBSD: ifconfig.c,v 1.348 2017/08/29 21:10:20 deraadt Exp $ */ /* $NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $ */ /* @@ -60,10 +60,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/types.h> +#include <sys/param.h> /* NBBY isset */ #include <sys/socket.h> #include <sys/ioctl.h> -#include <sys/param.h> +#include <sys/time.h> #include <net/if.h> #include <net/if_dl.h> diff --git a/usr.bin/ctfconv/ctfconv.c b/usr.bin/ctfconv/ctfconv.c index 5d95ee2334f..1d3b3921c7d 100644 --- a/usr.bin/ctfconv/ctfconv.c +++ b/usr.bin/ctfconv/ctfconv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ctfconv.c,v 1.7 2017/08/12 19:00:08 jasper Exp $ */ +/* $OpenBSD: ctfconv.c,v 1.8 2017/08/29 21:10:20 deraadt Exp $ */ /* * Copyright (c) 2016-2017 Martin Pieuchot @@ -16,7 +16,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/param.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/exec_elf.h> diff --git a/usr.bin/ctfconv/elf.c b/usr.bin/ctfconv/elf.c index 2f040c4e66e..3dad0174b3b 100644 --- a/usr.bin/ctfconv/elf.c +++ b/usr.bin/ctfconv/elf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: elf.c,v 1.2 2017/08/11 14:58:56 jasper Exp $ */ +/* $OpenBSD: elf.c,v 1.3 2017/08/29 21:10:20 deraadt Exp $ */ /* * Copyright (c) 2016 Martin Pieuchot <mpi@openbsd.org> @@ -16,7 +16,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/param.h> +#include <sys/types.h> #include <sys/exec_elf.h> #include <machine/reloc.h> diff --git a/usr.bin/ctfconv/parse.c b/usr.bin/ctfconv/parse.c index e91616f7163..e634082ec9f 100644 --- a/usr.bin/ctfconv/parse.c +++ b/usr.bin/ctfconv/parse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.c,v 1.4 2017/08/11 16:55:46 mpi Exp $ */ +/* $OpenBSD: parse.c,v 1.5 2017/08/29 21:10:20 deraadt Exp $ */ /* * Copyright (c) 2016-2017 Martin Pieuchot @@ -21,13 +21,13 @@ * DWARF to IT (internal type) representation parser. */ -#include <sys/param.h> -#include <sys/types.h> +#include <sys/param.h> /* nitems() */ #include <sys/queue.h> #include <sys/tree.h> #include <sys/ctf.h> #include <assert.h> +#include <limits.h> #include <err.h> #include <stdlib.h> #include <string.h> diff --git a/usr.bin/ctfconv/pool.c b/usr.bin/ctfconv/pool.c index a05cbab30df..24129248527 100644 --- a/usr.bin/ctfconv/pool.c +++ b/usr.bin/ctfconv/pool.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pool.c,v 1.2 2017/08/11 14:58:56 jasper Exp $ */ +/* $OpenBSD: pool.c,v 1.3 2017/08/29 21:10:20 deraadt Exp $ */ /* * Copyright (c) 2017 Martin Pieuchot @@ -18,7 +18,7 @@ #ifndef NOPOOL -#include <sys/param.h> +#include <sys/types.h> #include <sys/types.h> #include <sys/queue.h> diff --git a/usr.bin/ctfdump/ctfdump.c b/usr.bin/ctfdump/ctfdump.c index d5108f56f07..8eec639bb48 100644 --- a/usr.bin/ctfdump/ctfdump.c +++ b/usr.bin/ctfdump/ctfdump.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ctfdump.c,v 1.4 2017/08/11 20:42:59 jasper Exp $ */ +/* $OpenBSD: ctfdump.c,v 1.5 2017/08/29 21:10:20 deraadt Exp $ */ /* * Copyright (c) 2016 Martin Pieuchot <mpi@openbsd.org> @@ -16,7 +16,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/param.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/exec_elf.h> diff --git a/usr.bin/ctfdump/elf.c b/usr.bin/ctfdump/elf.c index 93d1125bd5c..3dad0174b3b 100644 --- a/usr.bin/ctfdump/elf.c +++ b/usr.bin/ctfdump/elf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: elf.c,v 1.2 2017/08/11 15:00:00 jasper Exp $ */ +/* $OpenBSD: elf.c,v 1.3 2017/08/29 21:10:20 deraadt Exp $ */ /* * Copyright (c) 2016 Martin Pieuchot <mpi@openbsd.org> @@ -16,7 +16,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/param.h> +#include <sys/types.h> #include <sys/exec_elf.h> #include <machine/reloc.h> diff --git a/usr.sbin/tcpdump/print-enc.c b/usr.sbin/tcpdump/print-enc.c index 98220bed5d0..836742e01a6 100644 --- a/usr.sbin/tcpdump/print-enc.c +++ b/usr.sbin/tcpdump/print-enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-enc.c,v 1.15 2016/04/04 16:26:00 sthen Exp $ */ +/* $OpenBSD: print-enc.c,v 1.16 2017/08/29 21:10:20 deraadt Exp $ */ /* * Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996 @@ -21,7 +21,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#include <sys/param.h> +#include <sys/types.h> #include <sys/time.h> #include <sys/socket.h> #include <sys/file.h> diff --git a/usr.sbin/vmctl/vmctl.c b/usr.sbin/vmctl/vmctl.c index 65bfd623845..1088803a9fe 100644 --- a/usr.sbin/vmctl/vmctl.c +++ b/usr.sbin/vmctl/vmctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmctl.c,v 1.38 2017/08/18 07:01:29 mlarkin Exp $ */ +/* $OpenBSD: vmctl.c,v 1.39 2017/08/29 21:10:20 deraadt Exp $ */ /* * Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org> @@ -16,7 +16,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/param.h> +#include <sys/param.h> /* PAGE_SIZE */ #include <sys/queue.h> #include <sys/uio.h> #include <sys/stat.h> diff --git a/usr.sbin/vmd/disklabel.c b/usr.sbin/vmd/disklabel.c index 125f701a08a..00dd83b7831 100644 --- a/usr.sbin/vmd/disklabel.c +++ b/usr.sbin/vmd/disklabel.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.c,v 1.1 2016/11/26 20:03:42 reyk Exp $ */ +/* $OpenBSD: disklabel.c,v 1.2 2017/08/29 21:10:20 deraadt Exp $ */ /* $NetBSD: disklabel.c,v 1.3 1994/10/26 05:44:42 cgd Exp $ */ /*- @@ -32,7 +32,7 @@ * @(#)disklabel.c 8.1 (Berkeley) 6/11/93 */ -#include <sys/param.h> +#include <sys/param.h> /* DEV_BSIZE */ #include <sys/disklabel.h> #include "vmboot.h" diff --git a/usr.sbin/vmd/ufs.c b/usr.sbin/vmd/ufs.c index 2faa44572cf..a9967c15f3a 100644 --- a/usr.sbin/vmd/ufs.c +++ b/usr.sbin/vmd/ufs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ufs.c,v 1.4 2016/11/25 17:03:59 reyk Exp $ */ +/* $OpenBSD: ufs.c,v 1.5 2017/08/29 21:10:20 deraadt Exp $ */ /* $NetBSD: ufs.c,v 1.16 1996/09/30 16:01:22 ws Exp $ */ /*- @@ -63,13 +63,15 @@ * Stand-alone file reading package. */ -#include <sys/param.h> +#include <sys/param.h> /* DEV_BSIZE MAXBSIZE */ #include <sys/time.h> #include <sys/stat.h> #include <ufs/ffs/fs.h> #include <ufs/ufs/dinode.h> #include <ufs/ufs/dir.h> +#include <limits.h> + #include "vmboot.h" /* Used in the kernel by libsa */ @@ -364,7 +366,7 @@ search_directory(char *name, struct open_file *f, ufsino_t *inumber_p) int ufs_open(char *path, struct open_file *f) { - char namebuf[MAXPATHLEN+1], *cp, *ncp, *buf = NULL; + char namebuf[PATH_MAX+1], *cp, *ncp, *buf = NULL; ufsino_t inumber, parent_inumber; int rc, c, nlinks = 0; struct file *fp; @@ -475,8 +477,8 @@ ufs_open(char *path, struct open_file *f) len = strlen(cp); - if (link_len + len > MAXPATHLEN || - ++nlinks > MAXSYMLINKS) { + if (link_len + len > PATH_MAX || + ++nlinks > SYMLOOP_MAX) { rc = ENOENT; goto out; } diff --git a/usr.sbin/vmd/vmboot.c b/usr.sbin/vmd/vmboot.c index b7275a9a6b8..f17ae24ed34 100644 --- a/usr.sbin/vmd/vmboot.c +++ b/usr.sbin/vmd/vmboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmboot.c,v 1.3 2016/11/26 20:03:42 reyk Exp $ */ +/* $OpenBSD: vmboot.c,v 1.4 2017/08/29 21:10:20 deraadt Exp $ */ /* * Copyright (c) 2016 Reyk Floeter <reyk@openbsd.org> @@ -16,7 +16,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/param.h> +#include <sys/param.h> /* DEV_BSIZE roundup */ #include <sys/reboot.h> #include <sys/time.h> #include <sys/stat.h> |