From nobody Thu Mar 23 12:50:32 2023 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 4Pj4vF4qJLz41K1x; Thu, 23 Mar 2023 12:50:33 +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 4Pj4vF0p1Qz4N3D; Thu, 23 Mar 2023 12:50:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679575833; 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=uIEOzsdve/0Z9o+003xsT1wwl+hNHZcnxO/O85xWIDk=; b=RkQyv46Wqlqy169rcBdyE2SXaiMplo3kJ1kUc9q73iHjWPk6CA7bA6Q+8oGWZ4xrdy0lTs EtRCwdnoFfrCUr8zjphKShOhPRahqlh6I62ZgrCpyZx02O3NhpOImxmN9OTmKRt2erwXek pKom6jz4VBUz3ul4H8nNTPuSfzXSNSOqPwVuASha1MuXWsMwOYE3ILxAmCs21wr6x6d8aN SnsoDoe8rDi+vK1c1k0n+J+Sb7QO2nSTD7dBbJtXnvNabv71dVO/c92ISGGCnkEvUAtVAV 0ZgHikFDRSHhR7zcX/f4IOmhbn1sxRUb5jlLf5Hv/BK4M7P8Kwq7VI17IEmHIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679575833; 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=uIEOzsdve/0Z9o+003xsT1wwl+hNHZcnxO/O85xWIDk=; b=RCos7Iy8cjpBGSrwHZcPODeGthmYe84+V2YYw2u4QiMB0VV9AApBx7f1ZvZ9A+A3LgUm0+ w+2rh7YtmiiCxemt9OenBNH31Kj8jQW55XUceHn63D86LNfMNnE9jXvxbL/gP+vQHk+3bq d4bYtq3UBfaRFYA+uSqKuDw+f7jXUG3eoOw1wQyfZQ9XROMNZqRVbp1M6FBBL7IsUY1YmK moMIHNCnaR+4/pMjaMGQNfQN3bsdx/ak2gU70AJBJT6tfvaQK9+T7vh+NszO1DTedYj8eL VWF9SUzcu5qbBg4fZwjc7Afws4SNiImfciYQqPjTwVrJI5ybuJPdfFQn5FsIvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679575833; a=rsa-sha256; cv=none; b=k4AQ4WUPcpPurC61nuajvvGaK7PNO+Nk/R6PhjDMzH2rzMJ58kxECT0efaILFmbePOXZT0 MT94eL57/S9uqLw+BSRgB12s15AoSObgO/CnZyOxKZpmXVi3UpJsla60jqkrZgEPiyAq6m clTsobruGCFhZp+GDLcUcL4pzg89FnBWOV3Ik+qX+YV6zoxdpA/EENk9Q3o/YW0ds5A8H8 PBt4jLuhPEP2pe0kV8gNPj+iLAlgagHqZ5BIEYLlen2eQWuYLI88s4ZyVjXMLDSSdl4gFS Uwpkj9a5uhhLgmAHPuV77cg3lN4M74p0Md3qfJT03NsJ5U2P9o7JGVyJSadQvQ== 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 4Pj4vD6qL4zcF9; Thu, 23 Mar 2023 12:50:32 +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 32NCoW6v022993; Thu, 23 Mar 2023 12:50:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32NCoWjB022992; Thu, 23 Mar 2023 12:50:32 GMT (envelope-from git) Date: Thu, 23 Mar 2023 12:50:32 GMT Message-Id: <202303231250.32NCoWjB022992@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: 81338b4213fd - stable/12 - ldd: clarify format options 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/12 X-Git-Reftype: branch X-Git-Commit: 81338b4213fd639bd1dea8e99b8ecd643048669a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=81338b4213fd639bd1dea8e99b8ecd643048669a commit 81338b4213fd639bd1dea8e99b8ecd643048669a Author: Ed Maste AuthorDate: 2023-03-21 14:14:03 +0000 Commit: Ed Maste CommitDate: 2023-03-23 12:49:44 +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) (cherry picked from commit 7bc6ce41d83353efa088942e3f3add38b98c3ada) --- 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 2a90d5ac537d..882cf6f5b9c3 100644 --- a/usr.bin/ldd/ldd.1 +++ b/usr.bin/ldd/ldd.1 @@ -1,6 +1,6 @@ .\" $FreeBSD$ .\" -.Dd October 23, 2018 +.Dd March 21, 2023 .Dt LDD 1 .Os .Sh NAME @@ -10,7 +10,7 @@ .Nm .Op Fl a .Op Fl v -.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 7db8875ed2e3..50c0b62c52d2 100644 --- a/usr.bin/ldd/ldd.c +++ b/usr.bin/ldd/ldd.c @@ -273,7 +273,8 @@ static void usage(void) { - fprintf(stderr, "usage: ldd [-a] [-v] [-f format] program ...\n"); + fprintf(stderr, + "usage: ldd [-a] [-v] [-f format [-f format]] program ...\n"); exit(1); }