From nobody Tue Jan 14 21:08:03 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YXhYH3tFXz5kQh6; Tue, 14 Jan 2025 21:08:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YXhYH0t16z4Nf4; Tue, 14 Jan 2025 21:08:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736888883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qr1kwfDHAcT2HltvJF66VUeYwY4Ix5+Cvl5rW+25coA=; b=vQ4J7WPvkWX4wtE2Rl8LH3UqJvtEYhtetenBM1btv+h/nhG64zwv06N61nKdG8AhoXsQBx lplY/xJHnH0JQp7WfaZK+z8RJfyy3/KdO/8FhiDgM2Dkm8C8MTRmxT+Z5gW9GyjEVKiGjA iCWlsDIerkZbPvdC9lazoH/XBJoTI6IrWETPEEegwraJHPXMHriAnF0eEoquh9JnfkyLDv pL0DHq0y0fwQK0ikHSEEMF5qPK1ZjJ0vdo4PiYcfA6UCP8CQ3lt/L1h1L3pivDqmGcrop0 QMXqEQ5VR7CMaQJ3dhvENavcCTzTBLys7rH6LDz8YpDfNkXkoVDsXKr5jWFPUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736888883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qr1kwfDHAcT2HltvJF66VUeYwY4Ix5+Cvl5rW+25coA=; b=KF56ZmWGxpjt8pBrHEL3RaHp+M6Nn92wE8fXc6AB4y/1VEOGRtfe9qVN4RR+KnV7/tt7TN ffUdIlU9XWP6J83qR96P3CoIvnZ/dxJI9TepzQW9TVFWEsGrHkYwK/oNFedtV37iM/Gjtt Mq9zoE9PGABd9mS8FZK3pG3nvd0YO6lA0rRnQUzVh36nHh6LDqVW0lKRnlv4YVC67Ifh9F fdTg8MHB1Uhk0sbGTUZxxB5rbqEFE3pMM/XTQbHr4jvxiT0DYM7MD5cCmHKEmLmcDM4Ttb FFN0wE2E1sTxLuZEEB67vU0g4aGEGPeLKDUzOuE/gc+Hb55kuBlXmI/FuHQFkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736888883; a=rsa-sha256; cv=none; b=Y2KI45pvSMddtRDcraS62J7y3biXFcSKYipsd4ZW9oI7KoU/ma+ytuaAYkJfttyq7GE4SE 92felb1nTo0GgVMUD+nn1VQhvjzmyL524CIT8twakNJr/dhWMeDxSxuIPdcNCDVTmqBnu7 G3DT0M3NrEGiqzhw9Pb+CsBS3T3Gb3PzNIxb8F5LEK/Fb5Mkz0yxzPo6Yy7ynOnf75ubwk 3Kv8Pppw2Oofd1ApQQWp0irmcVo3teXCqwqeF57B+niL3UW6jQwjrYj0DLYcxpQFlXmYZZ d/sa4Wu9aMnuZHG+S/8obf5pqhjnAubtoXZ+uy19WNPlky6hHikS1GGgdHZDhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YXhYH0Tb2z2YD; Tue, 14 Jan 2025 21:08:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50EL83Ts029946; Tue, 14 Jan 2025 21:08:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50EL830S029943; Tue, 14 Jan 2025 21:08:03 GMT (envelope-from git) Date: Tue, 14 Jan 2025 21:08:03 GMT Message-Id: <202501142108.50EL830S029943@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 302be497fc03 - stable/14 - makefs: Remove impossible if condition List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 302be497fc0349979df05b700a7d27ffdac941f4 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=302be497fc0349979df05b700a7d27ffdac941f4 commit 302be497fc0349979df05b700a7d27ffdac941f4 Author: Ed Maste AuthorDate: 2024-12-24 01:58:37 +0000 Commit: Ed Maste CommitDate: 2025-01-14 21:07:39 +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) --- 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 5fc3ae4d8b2a..440b1d6d26b7 100644 --- a/usr.sbin/makefs/cd9660.c +++ b/usr.sbin/makefs/cd9660.c @@ -1683,12 +1683,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++;