kill MFSNAMELEN

This commit is contained in:
christos 2007-07-17 20:17:52 +00:00
parent a6e0a40b9f
commit 27e0d2b78b
2 changed files with 7 additions and 6 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: umount.c,v 1.39 2007/07/16 17:06:55 pooka Exp $ */
/* $NetBSD: umount.c,v 1.40 2007/07/17 20:17:52 christos Exp $ */
/*-
* Copyright (c) 1980, 1989, 1993
@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1989, 1993\n\
#if 0
static char sccsid[] = "@(#)umount.c 8.8 (Berkeley) 5/8/95";
#else
__RCSID("$NetBSD: umount.c,v 1.39 2007/07/16 17:06:55 pooka Exp $");
__RCSID("$NetBSD: umount.c,v 1.40 2007/07/17 20:17:52 christos Exp $");
#endif
#endif /* not lint */
@ -238,7 +238,8 @@ umountfs(const char *name, const char **typelist, int raw)
return 1;
(void)memset(&hints, 0, sizeof hints);
if (!strncmp(type, MOUNT_NFS, MFSNAMELEN)) {
if (!strncmp(type, MOUNT_NFS,
sizeof(((struct statvfs *)NULL)->f_fstypename))) {
char *delimp;
/* look for host:mountpoint */
if ((delimp = strrchr(name, ':')) != NULL) {

View File

@ -1,4 +1,4 @@
/* $NetBSD: installboot.c,v 1.11 2005/12/11 12:18:19 christos Exp $ */
/* $NetBSD: installboot.c,v 1.12 2007/07/17 20:18:58 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -280,8 +280,8 @@ int devfd;
if (fstatvfs(fd, &statvfsbuf) != 0)
err(1, "statfs: %s", boot);
if (strncmp(statvfsbuf.f_fstypename, "ffs", MFSNAMELEN) &&
strncmp(statvfsbuf.f_fstypename, "ufs", MFSNAMELEN) ) {
if (strncmp(statvfsbuf.f_fstypename, "ffs", sizeof(statvfsbuf.f_fstypename)) &&
strncmp(statvfsbuf.f_fstypename, "ufs", sizeof(statvfsbuf.f_fstypename)) ) {
errx(1, "%s: must be on an FFS filesystem", boot);
}