From nobody Sat Oct 18 19:09:14 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 4cprpL5xHBz6CbFJ; Sat, 18 Oct 2025 19:09:14 +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 4cprpL5M3Lz3tns; Sat, 18 Oct 2025 19:09:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760814554; 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=WA0pTX8b7O1dmY83O6l1dpZ5fLTunngVofcJb+UYnzY=; b=ghfFho36d40pW1NeIzp8OFvoEOVeXTOx9N+kkyBDiv910Ro/guHy4sGNYF2y1SofprEWZx +VnWAxG68znC2++/g74v4/XBOLWOeOlR+Q4ADbHAxou6cfFv52uIOLIjVBdMJ6xb7TwrTE at/mks6ddWL6+tats/YoxdVzLsxsNJUwDwoKu7w/TyX1ioplYfO6CL2jzhT4VX3mncUV8W h6t2KA/eEfOQlAmkRmaYY9QyOHeRe8E1wJhOwAaysz6TeoRzePlumIfpVcTC364vwIbP7s KfwiZRyPFXnqQt/ZciN3SM2UyUc4ZwZ2LMUIfCySE3UFwhGBIgWBMHPJGV1Zeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760814554; 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=WA0pTX8b7O1dmY83O6l1dpZ5fLTunngVofcJb+UYnzY=; b=JYMcsm9IDlAZQJQxUaUnu0smVVRyT4ndW+Mr0K4a2Iv6WrEUhtMazfGBlW8pKCI37J2Fk+ c+qLTXtTVzn9lYXGhVTxdH51UOj9TqqOKoYOpWYxtbCXmGtJ96rwLyoARNxg+SpJ55gZUC 229613MHAlDjYbHLwxtZDNoR8HEa8ep6QpQvBCava4/99oe2db5nZx+2loV39PksCHj68z Tr2MUZIOEYCz4DHiup7vR/jWOKSymhoaljTDuh740X1oHj0HZfxJ4TmWLg2+3KlNjFXxbL EL+zPKNldn5EFYgIKx1zmiGaD/qZaZZ6n8n4qfSp4cbxJzU0ObssG0IdNqw4/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760814554; a=rsa-sha256; cv=none; b=mi9X8FZw4ITcrbpFdpyTOM1k7Ljumxk+nT7in5aDgqcUi87Q04Ji947j5EyO2r8pni89Oo k4fzbCHC8xosidFb6d1pFkOmIf6JbiJDMuRmKkiYigT6DJUFcHL+/OhIkMD6uAqaUi9+fB PtzC0QSekC5I/apAojR8XPaBNsWa7VMKfd8O7Q78OYt4jgEZVV8hpKeYlEDkyeQ1zJx9lq yRMVnMzG/k3mpF5oR1y0Y6D+KKo/uq5rqY8oeGQjGAhrK8KNsFSZ2inHJYJyy30klaPy1O Os9tai9AwxHDb5+gAnmBE157rOnhy7zwh7qYYoXRpTH8lRFGYBIpvULL25i6hQ== 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 4cprpL4f4XztTC; Sat, 18 Oct 2025 19:09:14 +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 59IJ9EMk024088; Sat, 18 Oct 2025 19:09:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59IJ9E1u024085; Sat, 18 Oct 2025 19:09:14 GMT (envelope-from git) Date: Sat, 18 Oct 2025 19:09:14 GMT Message-Id: <202510181909.59IJ9E1u024085@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brad Davis Subject: git: 6fa18fe74461 - main - mkimg: Add a -h option and improve usage output to be more expressive 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: brd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6fa18fe74461497f9a557af806552d246159272e Auto-Submitted: auto-generated The branch main has been updated by brd: URL: https://cgit.FreeBSD.org/src/commit/?id=6fa18fe74461497f9a557af806552d246159272e commit 6fa18fe74461497f9a557af806552d246159272e Author: Brad Davis AuthorDate: 2025-10-03 21:57:06 +0000 Commit: Brad Davis CommitDate: 2025-10-18 19:08:36 +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 --- 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[/