From 71cc9a9f0e2c19f496b5162342e845d9fc494efd Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Fri, 7 Oct 2016 19:12:15 +0000 Subject: [PATCH] makefs: diff reduction with NetBSD Obtained from: NetBSD usr.sbin/makefs/cd9660.c 1.33 --- usr.sbin/makefs/cd9660.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c index 98816a30b1c..63d07736f42 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -1622,6 +1622,7 @@ cd9660_level1_convert_filename(const char *oldname, char *newname, int is_file) if (diskStructure.archimedes_enabled && *oldname == ',' && strlen(oldname) == 4) break; + /* Enforce 12.3 / 8 */ if (namelen == 8 && !found_ext) break; @@ -1629,7 +1630,7 @@ cd9660_level1_convert_filename(const char *oldname, char *newname, int is_file) if (islower((unsigned char)*oldname)) *newname++ = toupper((unsigned char)*oldname); else if (isupper((unsigned char)*oldname) - || isdigit((unsigned char)*oldname)) + || isdigit((unsigned char)*oldname)) *newname++ = *oldname; else *newname++ = '_'; @@ -1639,7 +1640,7 @@ cd9660_level1_convert_filename(const char *oldname, char *newname, int is_file) else namelen++; } - oldname ++; + oldname++; } if (is_file) { if (!found_ext && !diskStructure.omit_trailing_period)