[src/trunk]: src/usr.sbin/makefs more fixes from martin

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

details:   https://anonhg.NetBSD.org/src/rev/464fb9a03fd2
branches:  trunk
changeset: 768654:464fb9a03fd2
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Aug 23 19:57:24 2011 +0000

description:
more fixes from martin

diffstat:

 usr.sbin/makefs/cd9660.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r b18cce13610d -r 464fb9a03fd2 usr.sbin/makefs/cd9660.c
--- a/usr.sbin/makefs/cd9660.c  Tue Aug 23 19:17:07 2011 +0000
+++ b/usr.sbin/makefs/cd9660.c  Tue Aug 23 19:57:24 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cd9660.c,v 1.33 2011/08/23 19:17:07 christos Exp $     */
+/*     $NetBSD: cd9660.c,v 1.34 2011/08/23 19:57:24 christos Exp $     */
 
 /*
  * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -103,7 +103,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: cd9660.c,v 1.33 2011/08/23 19:17:07 christos Exp $");
+__RCSID("$NetBSD: cd9660.c,v 1.34 2011/08/23 19:57:24 christos Exp $");
 #endif  /* !__lint */
 
 #include <string.h>
@@ -1635,9 +1635,9 @@
        int extlen = 0;
        int found_ext = 0;
 
-       while (*oldname != '\0') {
+       while (*oldname != '\0' && extlen < 3) {
                /* Handle period first, as it is special */
-               if (*oldname == '.' && extlen < 3) {
+               if (*oldname == '.') {
                        if (found_ext) {
                                *newname++ = '_';
                                extlen ++;