git: 81338b4213fd - stable/12 - ldd: clarify format options

From: Ed Maste <emaste_at_FreeBSD.org>
Date: Thu, 23 Mar 2023 12:50:32 UTC
The branch stable/12 has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=81338b4213fd639bd1dea8e99b8ecd643048669a

commit 81338b4213fd639bd1dea8e99b8ecd643048669a
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2023-03-21 14:14:03 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
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);
 }