From nobody Wed Jan 15 02:33:44 2025 X-Original-To: dev-commits-src-branches@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 4YXqn50BmLz5kmSq; Wed, 15 Jan 2025 02:33:45 +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 4YXqn44mFXz3ffH; Wed, 15 Jan 2025 02:33:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736908424; 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=2SlmGoHEYk9BstFuAu/SdWMxPfLpDyz8Mpr9D5dLhQE=; b=V78k3WL0dl+7+tnJtGyOdXLzGb/M+TvSju4sqJU+nAupcHlwxne1/yEjHSe/hBDvv7piN/ S+4O3G4mTDvHFPIDbj2csQIfSqtX9msKAEh5WwlKacY/4QYOWc7N6q44qeJiVnYj/5tSs+ Vpcq/TCi15lBG1LlCQ+g+n0E0Q7UFbpctGW3T62OCfkq88bzP011lqq2dybJ+2a2prZ8UQ jF5qHtDiZP2iQ4WkQXJrvGpVF0noOXcoT1MJ5EyejdOR5KrflwZThCzebBdXUqzlRxgWMw cKGoR6KtltYGvmwBakWfCBlnlBfZ4ueBEv9Bwrcmg2jF1AxZdymoRxkgRx2oRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736908424; 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=2SlmGoHEYk9BstFuAu/SdWMxPfLpDyz8Mpr9D5dLhQE=; b=MjL06fHeF30qjWJ7go0BbH5NWsUZYQP6cZFuzwxx06PDxm9DKtGwtK0OLseZflqbTkwLL5 8J3Vrn5+eje5gY3XqZApDAJyklaWZjyuPZqUzSnPhp127CrUGHYbEFZr+w3P9b4ccCEG3F u/7YnJKWevRzcBtQ5wfuvX/kfiLNIzbsmKaSDcSBuxjrkpPKuqT+cB0yFOVcpFYTNKRkFu eOS8zcS51Bv8l92JAH8j5o3HCHxOjnrFwpHSp1ARfGalcEaza0PEj1Ho8r0WV7LpLBi23I T9nSN7kP5AtsqjV6GefRpwzkWqJU6tb1GRVyZF5gnQtSF8YZiiKBEvyXdQ7OLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736908424; a=rsa-sha256; cv=none; b=Q3sDU7FfaeQ5+4+dbTFRjKAHNlWuuWp2lS6WgSlRdHiH/Pe9OvN6/G7vxL2BdvRbkgHS6t QRH+G4FW6I8d/f2fEJvc4+JK5bIvgk/rqKTk3mQeOXU6Owscsdxy/feIcCBCtZLghO+jJk hvqOIfwwAqoZNqzygQVjf1LMDTXIgkLT/rMhbvgACClJRZ0yvV2jBtH447YM8YMVQbwSa7 YsVdi3TJPQj8FLGnBUINUrREfsPitWW3sxdKtZ4pc4OB20FFsRaL43degxbdny4fAAcrQC pEV06e1jOYrnEF6y5BLJvzmEuwrd+YO/s0qq5cbhnA/xyml3NYUq0LpC54piwA== 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 4YXqn44MRSzBwC; Wed, 15 Jan 2025 02:33:44 +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 50F2XiP0046546; Wed, 15 Jan 2025 02:33:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50F2XiB3046543; Wed, 15 Jan 2025 02:33:44 GMT (envelope-from git) Date: Wed, 15 Jan 2025 02:33:44 GMT Message-Id: <202501150233.50F2XiB3046543@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: 94652c10c07a - stable/13 - makefs: Remove impossible if condition List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 94652c10c07abecb1d799145807cc0e01bad8b36 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=94652c10c07abecb1d799145807cc0e01bad8b36 commit 94652c10c07abecb1d799145807cc0e01bad8b36 Author: Ed Maste AuthorDate: 2024-12-24 01:58:37 +0000 Commit: Ed Maste 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++;