diff options
| author |   deraadt <deraadt@openbsd.org> | 2015-01-16 06:39:28 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2015-01-16 06:39:28 +0000 |
| commit | b9fc9a728fce9c4289b7e9a992665e28d5629a54 (patch) | |
| tree | 72b2433e418dfa1aef5fcf8305617b97979a25d8 /sbin/fsck_ext2fs/inode.c | |
| parent | improve checksum parsing slightly. now handles filenames with spaces. (diff) | |
| download | wireguard-openbsd-b9fc9a728fce9c4289b7e9a992665e28d5629a54.tar.xz wireguard-openbsd-b9fc9a728fce9c4289b7e9a992665e28d5629a54.zip | |
Replace <sys/param.h> with <limits.h> and other less dirty headers where
possible. Annotate <sys/param.h> lines with their current reasons. Switch
to PATH_MAX, NGROUPS_MAX, HOST_NAME_MAX+1, LOGIN_NAME_MAX, etc. Change
MIN() and MAX() to local definitions of MINIMUM() and MAXIMUM() where
sensible to avoid pulling in the pollution. These are the files confirmed
through binary verification.
ok guenther, millert, doug (helped with the verification protocol)
Diffstat (limited to 'sbin/fsck_ext2fs/inode.c')
| -rw-r--r-- | sbin/fsck_ext2fs/inode.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sbin/fsck_ext2fs/inode.c b/sbin/fsck_ext2fs/inode.c index 9327388906e..f3a78a8750d 100644 --- a/sbin/fsck_ext2fs/inode.c +++ b/sbin/fsck_ext2fs/inode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inode.c,v 1.24 2014/10/29 06:31:58 deraadt Exp $ */ +/* $OpenBSD: inode.c,v 1.25 2015/01/16 06:39:57 deraadt Exp $ */ /* $NetBSD: inode.c,v 1.8 2000/01/28 16:01:46 bouyer Exp $ */ /* @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ -#include <sys/param.h> +#include <sys/param.h> /* btodb */ #include <sys/time.h> #include <ufs/ext2fs/ext2fs_dinode.h> #include <ufs/ext2fs/ext2fs_dir.h> @@ -45,6 +45,7 @@ #include <stdlib.h> #include <string.h> #include <time.h> +#include <limits.h> #include "fsck.h" #include "fsutil.h" @@ -118,7 +119,7 @@ ckinode(struct ext2fs_dinode *dp, struct inodesc *idesc) struct ext2fs_dinode dino; u_int64_t remsize, sizepb; mode_t mode; - char pathbuf[MAXPATHLEN + 1]; + char pathbuf[PATH_MAX + 1]; if (idesc->id_fix != IGNORE) idesc->id_fix = DONTKNOW; @@ -204,7 +205,7 @@ iblock(struct inodesc *idesc, long ilevel, u_int64_t isize) int i, n, (*func)(struct inodesc *), nif; u_int64_t sizepb; char buf[BUFSIZ]; - char pathbuf[MAXPATHLEN + 1]; + char pathbuf[PATH_MAX + 1]; struct ext2fs_dinode *dp; if (idesc->id_type == ADDR) { |