From nobody Sat Oct 4 19:35:11 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 4cfG2m1mRMz69ftq; Sat, 04 Oct 2025 19:35:12 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cfG2l6n6Fz3r5K; Sat, 04 Oct 2025 19:35:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759606512; 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=um9GzLSHTGl+N5CyFeUP8YJWK7nhLRTLR5crEQ54wNg=; b=k5Qia4kkP1ADDLBmwi7Jkt+REp8XnWOEPOl8c9goN6c4kewbOv+FtS79diGUBz/ccfQfgb oWR3xmPLI3MYJtUH6AKRU3ZAw9/41ZKNRgubsXgnD7vLKWeXfgFvpr3GY4UqSfYn0Re76c lzQWFDtUOozG3Tr5JpMvhlI7pqB1AfsGXVN3HP+bfyJ812gAP+QbfrcDyy49+P/Ugm+lY7 Ft0NT0TlY/1S7Odhonx06JDfuAJgSkX5r0L2RI6bc0bueFQmo9wTFhjCtsItyisNbicuit n6NYQdeJs5rb9TETzlpFQS7aW955WQmIX2Qw+icDXDEy74swDpi4CzZCFqTJkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759606512; 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=um9GzLSHTGl+N5CyFeUP8YJWK7nhLRTLR5crEQ54wNg=; b=MzNPUFA+chKduitH8uMrdS+5hbYkDLpL7adsbVmKJwngaZ8MC3j5h31S5Fj1/iVOJZxuBd VHO++omw0MkZ1F1MXMkSa9R0jty/PXGr3OLICCgi1wtwgrxVuCLqTVklnjArCuIb09kaB6 RoQaGHhYeHxsYU6pRvnHeqdY5dlQ9rAHv0041ITdA2ruvN9fmuJx0I47Dxya7IY+KPR43K wDsOaxzXyUjWSETQ9MZQ3umShyQQ8eUlAjttTZYNuj0ZWc3zdo2jyh/Egj2i65LujgeFms 3UjXsd5t5IFACBy7f/rQpwf3ZQR5+G7V7tZMR0OjwpoBpdh60Qj5UnlyIv7TQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759606512; a=rsa-sha256; cv=none; b=qrWWa2+qraoTNrzlY13mOAMqCX//cgpJNSTHxUjeibkP5SESsORu3GVHa0iA/R9vnVrr2F tQZVM6XMTsntuHi3/83Hs0Jnp2M4VoFr+aj+NUL3iTUDRcdMFsBcQ5oDIbuS/2sdZ/t2R7 Av2ftR2e1H6XffjVZ1Wy6wPyVCL+ZL1XzmwaeFpt64L2B1GF+0NuPIRw1xjoCa1/8tWj1p kv3gWD+qpFvEfROoHwuVngwaKYDMO0n3MkXs5Y2s0pN1UqMhSFrLt5Pk8GF5szQCZ78pcg tdjQ4tLRRtLymRW8FXhgk7lpcwity6Ig09ESKg/YDSQ6AfsqQC+iancBOi+Gaw== 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 4cfG2l6NV3zwDH; Sat, 04 Oct 2025 19:35:11 +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 594JZBDf079075; Sat, 4 Oct 2025 19:35:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 594JZBJ7079072; Sat, 4 Oct 2025 19:35:11 GMT (envelope-from git) Date: Sat, 4 Oct 2025 19:35:11 GMT Message-Id: <202510041935.594JZBJ7079072@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 240acee90234 - stable/15 - pw: Clean up a couple of errx() calls 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 240acee902341371aa73687f6ae22dcb36cb643b Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=240acee902341371aa73687f6ae22dcb36cb643b commit 240acee902341371aa73687f6ae22dcb36cb643b Author: Mark Johnston AuthorDate: 2025-09-18 22:38:45 +0000 Commit: Mark Johnston CommitDate: 2025-10-04 19:34:57 +0000 pw: Clean up a couple of errx() calls - Remove a stray backslash. - Make an error message fit on one line. No functional change intended. MFC after: 1 week Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. (cherry picked from commit bc69d5dffa21cdf228e481b5502fd0f053d65e6d) --- usr.sbin/pw/pw.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/usr.sbin/pw/pw.c b/usr.sbin/pw/pw.c index fc778b16c7e5..18f1a17ba942 100644 --- a/usr.sbin/pw/pw.c +++ b/usr.sbin/pw/pw.c @@ -143,12 +143,13 @@ main(int argc, char *argv[]) optarg = &argv[1][2]; if (*optarg == '\0') { if (stat(argv[2], &st) != 0) - errx(EX_OSFILE, \ + errx(EX_OSFILE, "no such directory `%s'", argv[2]); if (!S_ISDIR(st.st_mode)) - errx(EX_OSFILE, "`%s' not a " - "directory", argv[2]); + errx(EX_OSFILE, + "`%s' not a directory", + argv[2]); optarg = argv[2]; ++argv; --argc;