svn commit: r306822 - head/usr.sbin/makefs

[Ed Maste]

Author: emaste
Date: Fri Oct  7 19:12:15 2016
New Revision: 306822
URL: https://svnweb.freebsd.org/changeset/base/306822

Log:
  makefs: diff reduction with NetBSD
  
  Obtained from:	NetBSD usr.sbin/makefs/cd9660.c 1.33

Modified:
  head/usr.sbin/makefs/cd9660.c

Modified: head/usr.sbin/makefs/cd9660.c
==============================================================================
--- head/usr.sbin/makefs/cd9660.c	Fri Oct  7 19:02:39 2016	(r306821)
+++ head/usr.sbin/makefs/cd9660.c	Fri Oct  7 19:12:15 2016	(r306822)
@@ -1622,6 +1622,7 @@ cd9660_level1_convert_filename(const cha
 			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 cha
 			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 cha
 			else
 				namelen++;
 		}
-		oldname ++;
+		oldname++;
 	}
 	if (is_file) {
 		if (!found_ext && !diskStructure.omit_trailing_period)