From nobody Sun Jan 16 06:59:30 2022 X-Original-To: dev-commits-src-main@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 E02DB1956CB0; Sun, 16 Jan 2022 06:59:30 +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 4Jc5W65PwLz55jL; Sun, 16 Jan 2022 06:59:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642316370; 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=v0akuS3ynOFtqrRmVnZ47E3xP7QsEU6ZlSAdTlyKm3M=; b=qW9+hP7r5oDFOF/o6nmi09lXQ/nW5t8Mny+XQCd0/swRZutuuw2n/kYCP6GaClN0bo2eTj gRsrro2s0yehXv9whdWgzRSYALUMr7wdk4KmSv4t4uHDP/n7LockyWV+JXRLuAgjD4lvsW ni393wYlmGN8hAx+3BlIXOsQOqFNHWyJf38PqkxXaeXYb010URbAnb6flNV4YvmFH/g7Du 6KYaIhEJbroyGHfVmj9oRezjmT/guZsOBXRBoTfzvZQtGTbR0t8tv05/hOew4f2oo6SBJv uDAKS5rCjugA6qPsPSW1jzqhLw5ie1vpkRmMY147Vcq7lQXzF548Sfi27ZVofg== 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 97DCC16121; Sun, 16 Jan 2022 06:59:30 +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 20G6xU63035531; Sun, 16 Jan 2022 06:59:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20G6xUmi035530; Sun, 16 Jan 2022 06:59:30 GMT (envelope-from git) Date: Sun, 16 Jan 2022 06:59:30 GMT Message-Id: <202201160659.20G6xUmi035530@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 340cebe9902d - main - etdump: Fix the file name included in the could not open error message List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 340cebe9902d71e0b57dfa60af98504f5f71984d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642316370; 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=v0akuS3ynOFtqrRmVnZ47E3xP7QsEU6ZlSAdTlyKm3M=; b=OzmHt35v7iPn1sPBlhpF80wJEnhFFBHy5hG5NwD5d9LznuVMMFDo+BGlxUQRyu2Yk2Yhrg DMJhNuA7BkShZ8hTFiD5USFjjbIIYFMVPL6IRmL2md7WZ73dcwulGlg0wfMey16t8Imtdx XI+pUFuLUqyowmtzC5V/s4juS8GGbdqFu6dsEHTHvH+K/2maeu/LZGMAb9dg5oBNqHrmGa 4Vd8i1Qay/9STbGc5pBVoa6k4+QDSuwFiuHIdpUTrbsETPs87+MazbMoGDAzKxizuI2wCv ZKZYdBqfo5/6g32ZHU5E+KfCWbTGbxkVd5f4VIyAoV44WISEmDGcPSbPahjqxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642316370; a=rsa-sha256; cv=none; b=UNXRcH0mM59GtOC5TwUMvxRE+4552rOintbZAkvPhBdtSyzs7h86beLGyZeC5xVtWoPOBM 69dmC65ZE+N4rEhkQdqN3kpYb66FsGF6Z2qjXL//nCYybjtU0eB1HVqcElGfGWoxK1Z4vI ikbwuf+I2/6DHCUnZMCgeUohSbhEtejnY9Md8G9y4xY6q7+1k+kQNJgaqgWXQwAVRqYZ1u hCTjx8/yHQMCnmlGEo/1osjGnZWPyAoLrZXHClmguw76O7KalHqyVEF2YWHm59lVEet/9n DDymp0OhPuvaQcMIMRNJQxZgZTMsB/IUncIeg7XmSiKHeuV1UZYTln/PjnBaoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=340cebe9902d71e0b57dfa60af98504f5f71984d commit 340cebe9902d71e0b57dfa60af98504f5f71984d Author: Jessica Clarke AuthorDate: 2022-01-16 06:55:39 +0000 Commit: Jessica Clarke CommitDate: 2022-01-16 06:55:39 +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 --- 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); }