From nobody Tue Jan 25 01:40:21 2022 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 ECB2119731FB; Tue, 25 Jan 2022 01:40:22 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JjV0k110Jz4ZjL; Tue, 25 Jan 2022 01:40:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643074822; 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=MHxJqvs+UC7varKAC2hxvRFrScs3kXchqzGmAMSFx/c=; b=ve9AIKyAvcJFScu4lPTWhsEVJsnfIwoVMstaoJ9YZ/m7arhWUW0GPp+mijKIGcBNxXZlz3 ypeiHuEj8s2UGPSgDHFdg6eu6+nTLUHLrMs8QfsoEnZNUOBqbi0/oDs7iHWfywf5B5huS4 tZtqcl8ns21n28WVKf20fmGUgvff8uf6sEWtsaWEQukFsmhQpy+WoU6u5SkoK0GhEhziDv NFHEPyy23N9q6pVglI9QxtU2JDlvcjboITmc2KhF4L/kwqDmnW+dB+3WC2TCyHAt2rL7WK LrNwBne2jVym+UNGMIuy2qdopYKcw6EMTDt8IsAjk2gdYhLhpbXaMvkC7tVjyw== 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 7C015205D5; Tue, 25 Jan 2022 01:40:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20P1eLGJ051325; Tue, 25 Jan 2022 01:40:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20P1eLuu051322; Tue, 25 Jan 2022 01:40:21 GMT (envelope-from git) Date: Tue, 25 Jan 2022 01:40:21 GMT Message-Id: <202201250140.20P1eLuu051322@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 8599e69d5697 - stable/13 - etdump: Fix the file name included in the could not open error message 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8599e69d56970d5a22fd477af8d2eaa350e9e9ea Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643074822; 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=MHxJqvs+UC7varKAC2hxvRFrScs3kXchqzGmAMSFx/c=; b=avO0JKPh3IyJ4RLA1MAjhA8RHmMB/aQvWTlMqlQ2azJV44A2er5/lCACEE/RESHtZu7Ur2 yrQoObx+lIRw4wSI3pvKMePYU78ut5tnMj04QrzTTpmX9kWKAXeoCnF9ntTzw8de/kisq3 ds+gh3FUWNBq+sU6wXz2VadUUzt3zTtuLDOXaPlDFySVB9/UHjdc2nV1otqh7LKMGHTeWK tURms4MYqfL9gomuSwJLnVnFwYRiWw9LEDDwWGsAdklCCTyFoCQyNhMhzFrKTB/jtvKnUu IssFfMTiiEc5QibkeiYxXVJpNGCdEIEZjahh/NJBPVHiFiDKOXaudRoR6SL5fA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643074822; a=rsa-sha256; cv=none; b=cTFpWtzdPD2nzHXowV+vP1B9ofzvj6s+434j6r3W+9aa42Ck1AFOk7bjfoFaqkn/r//UO6 i15PLswmZO/a9mVH9DhKbTi4F6ixJEHCL0yqw/24JF3kH7CbWlhZ1QIwnsLkeWDnLhhymt zio0MOC/ofaLvCKba5mJTXNjpg/Ps8QZR/eR/AEj803iM/q8BhoD2twai5RGeF+du0L3tr vFfpswdDrPp+p3Rx9nGpw/9uqlMkzpUkL2SawG5LWiH6oYKFNq2Qtbk3EeUYssZ8MoDKW7 rIdfirp9KiLjXC0NFEcIfS1JZqDY5VDdItvyWOJ9pznPoOFaqEgp2kOo7ePTEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=8599e69d56970d5a22fd477af8d2eaa350e9e9ea commit 8599e69d56970d5a22fd477af8d2eaa350e9e9ea Author: Jessica Clarke AuthorDate: 2022-01-16 06:55:39 +0000 Commit: Jessica Clarke CommitDate: 2022-01-25 00:00:05 +0000 etdump: Fix the file name included in the could not open error message If only one file is passed, this reads the terminating NULL and so prints (null). If multiple files are passed then this always prints the second file, which may or may not exist (and will be particularly confusing if it does exist since the output will include the dump of the second file). MFC after: 1 week (cherry picked from commit 340cebe9902d71e0b57dfa60af98504f5f71984d) --- usr.bin/etdump/etdump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/etdump/etdump.c b/usr.bin/etdump/etdump.c index aedd53a9f6d1..e536aa5e51cb 100644 --- a/usr.bin/etdump/etdump.c +++ b/usr.bin/etdump/etdump.c @@ -262,7 +262,7 @@ main(int argc, char **argv) } else { iso = fopen(argv[i], "r"); if (iso == NULL) - err(1, "could not open %s", argv[1]); + err(1, "could not open %s", argv[i]); } dump_eltorito(iso, argv[i], outfile, outputter); }