From nobody Mon Apr 28 03:45:44 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 4Zm8Vc4P7Gz5tm02; Mon, 28 Apr 2025 03:45:44 +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 4Zm8Vc1sm2z3pgl; Mon, 28 Apr 2025 03:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745811944; 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=U/YQW3aAgssBVcKbWqy6Wnsq4ctEaqOGX6eFSDsRgcU=; b=wXG9ytgkDPDU9GdCGRx1ZkPg086mwBxjw2MOaQv+NJc6qjfhha3SfeoCRV1BNId+r28NdD QBRV3dfL2HbYYiIz6UrIowMaRSkd8zfoDv+TDFJzZ2iK2MaeJN4goDgoJt56dtIYwyyQ7E EBimadzCMLK/gj3AIDJMlF/ueuM08Gf+LBD/HA6sRj9iFYVdYfFWMnNR5NApfSJPuaQt82 5kkFuaJ2mD6IMkdJUMxrnKYdntriaQxlFIrxpMUXbpLCduApOoGw7Lees5kTra+H3ygXLT xBbV1nlsgOYkvpram0lKPvgt7Um6XDILdnfcqebcZgQtY5Eczj1plaqmkwm9gQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745811944; a=rsa-sha256; cv=none; b=OFnMLGJP9BQqCKlHRjAEDCfV5svFMe+H/vPYTwXMRCpGP7b/W+w4M430lPu7r+JtILXBEG tw/CbUnonDsyrBApbbDE1pr99uvhCrIO342E6Y9WvcO4WRaOeKupi8uWmaIYW33JsVXbCS UWPbZSMNhGxnynsL9/A1mjPD5IUrUsxDiCcKgOar/7DzeY1PoVQN+67tM/ZxzMJiGUT4hj MDXZKrxTRP1fY6IfFz8lbzKc7f4PVZK5OXEYQWIuQMSFGoknKuOQRHfVjQJvxlAt2U/2eN +ej3+MaaWe0b5/hDpkq/CsSWTXHkSP+hA20mMMu2HdQouSCCQrfuYkGvO7NtMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745811944; 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=U/YQW3aAgssBVcKbWqy6Wnsq4ctEaqOGX6eFSDsRgcU=; b=udTDlE1nFyiQ+Q4p2tLY1m+EbV7fibTryElpetsrLhVE0k1sMLYQZGBDyCBhXgPGuSjYdS j/b3ja2JnKAmKREnc5hgLdTBlw0Ui9RuwMwXG8q2fWSzhuhPfYZ0A0P1l+lYT38mzg6vRv MwK1P6sCPSWSd+K2FA7mG69EtWWPpw/WO2MNIyvaSrwm0Vn1m2A9Cj403auL2J5AeYktSQ jbf1gYr767vgAq+EDV0wZaU6JtkUum29pWaYP9XAtujl0Za7lMSF0WaGonX4YNcjp/iIbx eDuKAAX4MQusxocjPDTG8sl4rxZeu6Ki+4n3qVcqjdyhdv5uvcZLniaSBMFLZg== 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 4Zm8Vc1HdYz3nQ; Mon, 28 Apr 2025 03:45: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 53S3jit6052845; Mon, 28 Apr 2025 03:45:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53S3jian052842; Mon, 28 Apr 2025 03:45:44 GMT (envelope-from git) Date: Mon, 28 Apr 2025 03:45:44 GMT Message-Id: <202504280345.53S3jian052842@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 1d111b39e547 - stable/14 - loader: provide error message in command_errmsg instead of printing 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1d111b39e5471e62fbdf84a4be9f271f81fa5865 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1d111b39e5471e62fbdf84a4be9f271f81fa5865 commit 1d111b39e5471e62fbdf84a4be9f271f81fa5865 Author: Ahmad Khalifa AuthorDate: 2024-08-12 12:11:06 +0000 Commit: Warner Losh CommitDate: 2025-04-28 03:43:31 +0000 loader: provide error message in command_errmsg instead of printing Also provide an error message when argc is too long instead of printing "no error message". Reviewed by: imp, kib Pull Request: https://github.com/freebsd/freebsd-src/pull/1381 (cherry picked from commit 6fdb07d5b7e9293a6851a23b7ecb26636cf1ec1e) --- stand/efi/loader/copy.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/stand/efi/loader/copy.c b/stand/efi/loader/copy.c index 3e466e875af8..90a55089ffc4 100644 --- a/stand/efi/loader/copy.c +++ b/stand/efi/loader/copy.c @@ -223,7 +223,7 @@ command_copy_staging(int argc, char *argv[]) int prev; if (argc > 2) { - return (CMD_ERROR); + goto usage; } else if (argc == 2) { prev = copy_staging; if (strcmp(argv[1], "enable") == 0) @@ -232,10 +232,8 @@ command_copy_staging(int argc, char *argv[]) copy_staging = COPY_STAGING_DISABLE; else if (strcmp(argv[1], "auto") == 0) copy_staging = COPY_STAGING_AUTO; - else { - printf("usage: copy_staging enable|disable|auto\n"); - return (CMD_ERROR); - } + else + goto usage; if (prev != copy_staging) { printf("changed copy_staging, unloading kernel\n"); unload(); @@ -246,6 +244,10 @@ command_copy_staging(int argc, char *argv[]) printf("copy staging: %s\n", mode[copy_staging]); } return (CMD_OK); + +usage: + command_errmsg = "usage: copy_staging enable|disable|auto"; + return (CMD_ERROR); } COMMAND_SET(copy_staging, "copy_staging", "copy staging", command_copy_staging); #endif @@ -257,13 +259,11 @@ command_staging_slop(int argc, char *argv[]) u_long new, prev; if (argc > 2) { - return (CMD_ERROR); + goto err; } else if (argc == 2) { new = strtoul(argv[1], &endp, 0); - if (*endp != '\0') { - printf("invalid slop value\n"); - return (CMD_ERROR); - } + if (*endp != '\0') + goto err; if (staging_slop != new) { staging_slop = new; printf("changed slop, unloading kernel\n"); @@ -276,6 +276,10 @@ command_staging_slop(int argc, char *argv[]) printf("staging slop %#lx\n", staging_slop); } return (CMD_OK); + +err: + command_errmsg = "invalid slop value"; + return (CMD_ERROR); } COMMAND_SET(staging_slop, "staging_slop", "set staging slop", command_staging_slop);