git: 94652c10c07a - stable/13 - makefs: Remove impossible if condition
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 15 Jan 2025 02:33:44 UTC
The branch stable/13 has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=94652c10c07abecb1d799145807cc0e01bad8b36
commit 94652c10c07abecb1d799145807cc0e01bad8b36
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2024-12-24 01:58:37 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2025-01-15 02:33:30 +0000
makefs: Remove impossible if condition
This test is inside the else block for `if (*oldname == '.')`, so
*oldname cannot be '.' here.
Reviewed by: kevans
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D48243
(cherry picked from commit 788e1eb7c199297aa438fc5cb6caabc9be01b419)
(cherry picked from commit 302be497fc0349979df05b700a7d27ffdac941f4)
---
usr.sbin/makefs/cd9660.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/usr.sbin/makefs/cd9660.c b/usr.sbin/makefs/cd9660.c
index 283879df16ae..6c917deaa6a0 100644
--- a/usr.sbin/makefs/cd9660.c
+++ b/usr.sbin/makefs/cd9660.c
@@ -1680,12 +1680,8 @@ cd9660_level2_convert_filename(iso9660_disk *diskStructure, const char *oldname,
else if (isupper((unsigned char)*oldname) ||
isdigit((unsigned char)*oldname))
*newname++ = *oldname;
- else if (diskStructure->allow_multidot &&
- *oldname == '.') {
- *newname++ = '.';
- } else {
+ else
*newname++ = '_';
- }
if (found_ext)
extlen++;