[src/netbsd-1-6]: src/usr.sbin/makefs Pull up revision 1.15 (requested by tho...

[tv <tv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0e31374536e8
branches:  netbsd-1-6
changeset: 527635:0e31374536e8
user:      tv <tv%NetBSD.org@localhost>
date:      Thu May 30 21:09:38 2002 +0000

description:
Pull up revision 1.15 (requested by thorpej in ticket #87):
d_namlen is a uint8_t, and thus will always be < MAXMANLEN + 1 (256),
so there is no need to assert it.

diffstat:

 usr.sbin/makefs/ffs.c |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r da75e36468c0 -r 0e31374536e8 usr.sbin/makefs/ffs.c
--- a/usr.sbin/makefs/ffs.c     Thu May 30 21:07:26 2002 +0000
+++ b/usr.sbin/makefs/ffs.c     Thu May 30 21:09:38 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs.c,v 1.14 2002/02/15 04:04:57 lukem Exp $   */
+/*     $NetBSD: ffs.c,v 1.14.2.1 2002/05/30 21:09:38 tv Exp $  */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -71,7 +71,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: ffs.c,v 1.14 2002/02/15 04:04:57 lukem Exp $");
+__RCSID("$NetBSD: ffs.c,v 1.14.2.1 2002/05/30 21:09:38 tv Exp $");
 #endif /* !__lint */
 
 #include <sys/param.h>
@@ -860,7 +860,6 @@
        de.d_ino = ufs_rw32(node->inode->ino, needswap);
        de.d_type = IFTODT(node->type);
        de.d_namlen = (uint8_t)strlen(name);
-       assert (de.d_namlen < (sizeof(de.d_name)));
        strcpy(de.d_name, name);
        reclen = DIRSIZ(0, &de, needswap);
        de.d_reclen = ufs_rw16(reclen, needswap);