diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2016-10-07 19:12:15 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2016-10-07 19:12:15 +0000 |
| commit | 71cc9a9f0e2c19f496b5162342e845d9fc494efd (patch) | |
| tree | b62ebe0a3f02c0fa12b736bec47204565d28dd23 /usr.sbin/makefs/cd9660.c | |
| parent | 35b5ef914c1d47fc0759499ddb83458758745fab (diff) | |
| download | src-71cc9a9f0e2c19f496b5162342e845d9fc494efd.tar.gz src-71cc9a9f0e2c19f496b5162342e845d9fc494efd.zip | |
makefs: diff reduction with NetBSD
Obtained from: NetBSD usr.sbin/makefs/cd9660.c 1.33
Notes
Notes:
svn path=/head/; revision=306822
Diffstat (limited to 'usr.sbin/makefs/cd9660.c')
| -rw-r--r-- | usr.sbin/makefs/cd9660.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c index 98816a30b1c3..63d07736f425 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) |