From nobody Thu Mar 23 12:42:21 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 4Pj4jn3Vjdz41JJY; Thu, 23 Mar 2023 12:42:21 +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 4Pj4jn33gYz4LRj; Thu, 23 Mar 2023 12:42:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679575341; 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=FS/6nR6ZnPAwkxlMIu4A/l/gOn1k8Y7N8Muv7HEowVE=; b=QbP2qxoiF4vGpBnBxXgrRFl3g84AhOyhKylUX6rOJK+9s05i8vgEovZWphLzxUNLrH97tm 1Jw5IAvlbAs3uhWLsyielShm6WB+lv1RmKc8kiu/o5LZDSwDHQokolmo9OtgKFqOkACKKX zlH38uOVL/Qa5MjqKsxwKw3CWmopcSQXTNaAU55HgPf776bfpRHLf2HJVUYAJ9wujqcrgD C1XbV2v9VgeqyAIfWUnPKvKNAYOLZyktX8FVPANF/opn8hlqqkE/HlNMWJITykfI97t9RH K2pTk06B20WUOaRKGVJlnH+2EH7Li7ld5qp7qukEUCldRGYM08MQoJZVCoIjBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679575341; 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=FS/6nR6ZnPAwkxlMIu4A/l/gOn1k8Y7N8Muv7HEowVE=; b=VRB4yh+r2yU/rpuqqW9tZMZr0H/jMOtFBk0JkUeJ0Sll4Sd6rf7SHtR07UH/g8qidgEEmq puRMooRwzV0SnxRjBeBU9Uyj5a2Phyb1tgftr6tcnsjF7m8yDrxWFqKWmBN10MtxmaHWxQ +Zg18sl8XdgK1RacjOk3noNFCT9S0JzaBACLULYSRQhmx18JztBF4dPhaZc/kUE1MdPI3P WD+5HuTkgGIxAJEaTklVPY3n6osp918wtqDQ0nn4lvxq12KY47zxzAHFTUeD3Otq51OyCj g5UtYNfSS0jwVfcnc1qRMheSShiw6+t4I7FNp7iBQjjW5RHk84ov5x0vMwn9hQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679575341; a=rsa-sha256; cv=none; b=x0JsxmlRh+X4G+Mjhu/nyYxYAlbFUz8Y/V/mbaKpmW2qubYtIpa1ltk0523qF34XUqEOP2 w+kYpaHvBTfzJgo2D/wdym13RK/scHgaaJMtgSiDQPDWmSbxtOk+ii1s21rTTPfc/3ru9D uVQfg11XfMFOQ9Jl7cIpi0DHQUBqnKXpM86uUsqauzXOhpltE9qmHH6Vuio3xXi2MUTfC+ c5OSeTouyMWmm6peP7uzAf3Tr//fM/lQKm8o5ZF0MmYTmwzf8i4jxaWn1lBBiVWykoxOkA V3N+/+4kldAC16Q+HZkjsiIgYZZ/GRf8wVhlzZn8At9GqslJhX0v7dmka0NrGw== 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 4Pj4jn27y9zbjK; Thu, 23 Mar 2023 12:42:21 +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 32NCgL3V012388; Thu, 23 Mar 2023 12:42:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32NCgLlK012387; Thu, 23 Mar 2023 12:42:21 GMT (envelope-from git) Date: Thu, 23 Mar 2023 12:42:21 GMT Message-Id: <202303231242.32NCgLlK012387@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 7bc6ce41d833 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 7bc6ce41d83353efa088942e3f3add38b98c3ada Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7bc6ce41d83353efa088942e3f3add38b98c3ada commit 7bc6ce41d83353efa088942e3f3add38b98c3ada Author: Ed Maste AuthorDate: 2023-03-21 14:14:03 +0000 Commit: Ed Maste CommitDate: 2023-03-23 12:41:35 +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 (cherry picked from commit e9f8723c30fc390f1282f5286d57c090ed9e5925) --- 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 d263eabcf4ff..447b6c752e9f 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); }