From nobody Thu Oct 23 01:55:29 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 4csTdF2DHPz6DHdp; Thu, 23 Oct 2025 01:55:29 +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 4csTdF1g9fz3lJs; Thu, 23 Oct 2025 01:55:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761184529; 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=t3f/OStGhkqGlBSaXrEPEiUOvQ8IT2xZR8p3ef5CVCA=; b=iJAzWowyif+q+14ytkI9DDv1XEbZ4Z1eG5NlOrLQESPNUVo7glRtZPP6UEHm1EOqc/c5q3 sJUmNKhgipSjDdRsXUdKAMiLmyNhGaFeW6x/OcGNRQJf1VNOzaxYmfEIM8E83weOBGZ0Zf o/sEkfZ4WAcrHXjcrvQ6LChXFBFTp/SqJHyutiUnpSGFUd9cNpyH3kZIVMGj0M0fw1q6fx vfjSFB6fMpN8Y5vwKCNcX5cI/X9N4hWMBwG6Oz4XMGEJx5YdTSVPRl6TIdmrqpM8VOziMg a85OopiJV1olOYzy7FE37z4NjB2coufU+XvPpCAx3j+bcOOmvdqyNUd/eq3dhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761184529; 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=t3f/OStGhkqGlBSaXrEPEiUOvQ8IT2xZR8p3ef5CVCA=; b=Os9JeHMfHxWuAZSL9MyqBfL9Ru5JhSCKD5NIUhXFHO4ifI76txw5+48IZkN0txQaAlxXI5 tWwHlrVeUEwgludD4XmotPeO6cfNLvb6jI2LiIo+GCsm7HhqBGJ7kyEPuS8UecUlCVyoK1 LLhq9rzFJPlPsvh2NePMRSXNptH7NECp5Xw439JdgNCc6sgnJaOBgxYwx8o4Gi3id12l66 AsIVFvNhINrbmLak7On4qHqGbGrh24Vxr6mNRwGFyGyPDFWf3GXx/b0lzuAizt1WoEYqCo sHlf1QL3hxqUCzNVz5sO/CZPVAfWL0VRrfDnlxHyPBy/dhW6hlX+RI23Qfxsnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761184529; a=rsa-sha256; cv=none; b=qJ4K4tlO+egyR6lUrgwZXbAPtoXVYxSPqWcAFINaaf8ofK5Q5f3DfX8eppP3PaEHHkPRDT CW5UoYYU9xutXiWq3EA4jEUml8xL/VnRsua96re5/VG2dAAFV0mbaNMDSucpnO8o1bClDf Ce23IlfjtOkpck0tcE3RwkoROK1TLEgw4k5Rx8iEE9tfAgBgQO8dTXgp4HLyhgAEKOw0yY 8SKoZvP+yJ/0580E9ENcyFVGLScuSYDUprOhh8MoxbYZTz/SJ37vEn5p2OvSVu0aXJUcBC qbNe+9oud4U9GTroXPe7cxf8HuqlEswwNyg1nfGqvEvFZO0hJQFsHdo/xTHBqQ== 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 4csTdF1BXRztxn; Thu, 23 Oct 2025 01:55:29 +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 59N1tT4N072663; Thu, 23 Oct 2025 01:55:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59N1tT2G072660; Thu, 23 Oct 2025 01:55:29 GMT (envelope-from git) Date: Thu, 23 Oct 2025 01:55:29 GMT Message-Id: <202510230155.59N1tT2G072660@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brad Davis Subject: git: 6cfe0bcf7fbf - stable/15 - mkimg: Add a -h option and improve usage output to be more expressive 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: brd X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6cfe0bcf7fbf3faec6892beb15febc6bab91eb21 Auto-Submitted: auto-generated The branch stable/15 has been updated by brd: URL: https://cgit.FreeBSD.org/src/commit/?id=6cfe0bcf7fbf3faec6892beb15febc6bab91eb21 commit 6cfe0bcf7fbf3faec6892beb15febc6bab91eb21 Author: Brad Davis AuthorDate: 2025-10-03 21:57:06 +0000 Commit: Brad Davis CommitDate: 2025-10-23 01:55:20 +0000 mkimg: Add a -h option and improve usage output to be more expressive Reviewed by: imp, kp MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D52906 (cherry picked from commit 6fa18fe74461497f9a557af806552d246159272e) --- usr.bin/mkimg/mkimg.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/usr.bin/mkimg/mkimg.c b/usr.bin/mkimg/mkimg.c index a7409b686560..27b79b82ca02 100644 --- a/usr.bin/mkimg/mkimg.c +++ b/usr.bin/mkimg/mkimg.c @@ -142,8 +142,10 @@ static void usage(const char *why) { - warnx("error: %s", why); - fputc('\n', stderr); + if (why != NULL) { + warnx("error: %s", why); + fputc('\n', stderr); + } fprintf(stderr, "usage: %s \n", getprogname()); fprintf(stderr, " options:\n"); @@ -171,19 +173,19 @@ usage(const char *why) print_schemes(1); fputc('\n', stderr); fprintf(stderr, " partition specification:\n"); - fprintf(stderr, "\t[/]::[:[+]]\t- " + fprintf(stderr, "\t[/