From nobody Tue Mar 21 14:34:45 2023 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 4PgvJQ1gCKz40NqW; Tue, 21 Mar 2023 14:34:46 +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 4PgvJQ1B0Yz3Krg; Tue, 21 Mar 2023 14:34:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679409286; 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=9SmPYwyY3UjHeyRpZNAjsJ5J/7QKK0Vq2h4osC4FlDo=; b=pPwcjDlBz1Pyw3E/M4a0PFJCU1rbnkzEb+XJ5zZfnmNCN5RLpiHyBIGg1mq/qRaJmnNPtj 2QivKUaFt781WB8F6nCF4S1fCtCP1j4MPIet7uDEB0s3KtVy7JCQTnAd0ACMqYloH8LoTb MrasKt2WPHyPJ6uOPZeQijusmEkW6exZXesHKSz/9EYvELRDmnQKzyRtS0icE/JcP+u+9Z 0ByJfjQanSUZs7wpMIkohoZcR7E80uHmovmS3UdpkbbwWaXy/zGdMxCw1iUNboZcMsFzAT BynRiUn880O2tZp2Wvaa7lWKmo0IVKfNC3YfJj2yxLrpPjHVkjq1JnIa0PHhKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679409286; 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=9SmPYwyY3UjHeyRpZNAjsJ5J/7QKK0Vq2h4osC4FlDo=; b=fZ5nAYK+s+5BDg0QZrLbVpHYFE9O/OEZXaS3hHti8OcnXOXHHljEDvd3sr2M6xUpFF2W11 2dFge2bFUnccO0Cm2ibevc2T+WrCBZ/bvewhgX4rfOBnwYrKugAwinqUpaw0xix7NDrCQI AaHk/scSF8g/v3pqnykROvv+cEcGZnTpr8vX3FuPlwEekCQYIbiaFIFG7pbpjVph5nWM4W 37Qcsvk4KC9yetJFtbjpUGvZ8uD1aTHr9202flC5l5zdrrhpQc5GJzFChcqUd49dIGbBP+ /dOpi3ZahWrjrTKG6LF++5O/2WQdxRLfHDgt6vMDGuwHE25Yxm+1FN2wqkr3+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679409286; a=rsa-sha256; cv=none; b=b5F2vK4SLzGs/dqgZ9QUEnFEVDsQnxXF0sdxaCoV+sEO5iH3fLD7SB3mBvqgzXUxka7ng5 YwlMpO0l9NHY1Gr3yYZn56olaBPwKgOj4mCpKh/gQmWGXXRb6uixhGmiDGgkMGHo9PuJlp Wy0ygH7aolu/E9I7u/Jj8jQ6AGC+sLaFdDveAdFwPN5kEwduxZnAf9a3oI/EMWWZb941OC f3RunQt2mB3yL4qs6HRG2JXZ2JDj18TlWHmjdIBlNHI8EajtHvhIUaWovEtDHrtYvbuKkg 1NQbQExv93IK304+fJTefYTxA53CFumfkOaw1wyX1ll5U9IyNHXpcFlJpr1OMA== 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 4PgvJQ0FQjzGCY; Tue, 21 Mar 2023 14:34:46 +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 32LEYj1d043340; Tue, 21 Mar 2023 14:34:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32LEYjTr043339; Tue, 21 Mar 2023 14:34:45 GMT (envelope-from git) Date: Tue, 21 Mar 2023 14:34:45 GMT Message-Id: <202303211434.32LEYjTr043339@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e9f8723c30fc - main - ldd: clarify format options 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e9f8723c30fc390f1282f5286d57c090ed9e5925 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e9f8723c30fc390f1282f5286d57c090ed9e5925 commit e9f8723c30fc390f1282f5286d57c090ed9e5925 Author: Ed Maste AuthorDate: 2023-03-21 14:14:03 +0000 Commit: Ed Maste CommitDate: 2023-03-21 14:14:03 +0000 ldd: clarify format options -f may be specified zero, one, or two times. Make this clear in the usage. Reviewed by: markj, kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34733 --- usr.bin/ldd/ldd.1 | 4 ++-- usr.bin/ldd/ldd.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/usr.bin/ldd/ldd.1 b/usr.bin/ldd/ldd.1 index 47a7fff9f778..1e4ccf441c53 100644 --- a/usr.bin/ldd/ldd.1 +++ b/usr.bin/ldd/ldd.1 @@ -1,6 +1,6 @@ .\" $FreeBSD$ .\" -.Dd August 28, 2021 +.Dd March 21, 2023 .Dt LDD 1 .Os .Sh NAME @@ -9,7 +9,7 @@ .Sh SYNOPSIS .Nm .Op Fl a -.Op Fl f Ar format +.Op Fl f Ar format Op Fl f Ar format .Ar program ... .Sh DESCRIPTION The diff --git a/usr.bin/ldd/ldd.c b/usr.bin/ldd/ldd.c index 2cd2a4c72324..4f5555e34610 100644 --- a/usr.bin/ldd/ldd.c +++ b/usr.bin/ldd/ldd.c @@ -260,7 +260,8 @@ static void usage(void) { - fprintf(stderr, "usage: ldd [-a] [-f format] program ...\n"); + fprintf(stderr, + "usage: ldd [-a] [-f format [-f format]] program ...\n"); exit(1); }