[src/trunk]: src/usr.bin/ldd Add an -o option that behaves like nm -o. Implem...

[dholland <dholland%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/08c37a6d0597
branches:  trunk
changeset: 747267:08c37a6d0597
user:      dholland <dholland%NetBSD.org@localhost>
date:      Mon Sep 07 17:56:52 2009 +0000

description:
Add an -o option that behaves like nm -o. Implementation from a suggestion
by jmcneill (thanks!); ok mrg. Closes PR 41994.

diffstat:

 usr.bin/ldd/ldd.1 |  15 +++++++++++++--
 usr.bin/ldd/ldd.c |  13 +++++++++----
 2 files changed, 22 insertions(+), 6 deletions(-)

diffs (89 lines):

diff -r bcb1f6f0b1ec -r 08c37a6d0597 usr.bin/ldd/ldd.1
--- a/usr.bin/ldd/ldd.1 Mon Sep 07 17:56:23 2009 +0000
+++ b/usr.bin/ldd/ldd.1 Mon Sep 07 17:56:52 2009 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: ldd.1,v 1.16 2009/08/23 15:37:39 wiz Exp $
+.\"    $NetBSD: ldd.1,v 1.17 2009/09/07 17:56:52 dholland Exp $
 .\"
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd August 23, 2009
+.Dd September 7, 2009
 .Dt LDD 1
 .Os
 .Sh NAME
@@ -35,6 +35,7 @@
 .Nd list dynamic object dependencies
 .Sh SYNOPSIS
 .Nm
+.Op Fl o
 .Op Fl f Ar format
 .Ar program ...
 .Sh DESCRIPTION
@@ -93,6 +94,16 @@
 and
 .Sy \et
 are recognized and have their usual meaning.
+.Pp
+The
+.Fl o
+option is an alias for
+.Fl f
+.Ar \&%a:-l\&%o.\&%m =\*[Gt] \&%p\en ,
+which makes
+.Nm
+behave analogously to
+.Ic nm Fl o .
 .Sh SEE ALSO
 .Xr ld 1 ,
 .Xr ld.elf_so 1 ,
diff -r bcb1f6f0b1ec -r 08c37a6d0597 usr.bin/ldd/ldd.c
--- a/usr.bin/ldd/ldd.c Mon Sep 07 17:56:23 2009 +0000
+++ b/usr.bin/ldd/ldd.c Mon Sep 07 17:56:52 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ldd.c,v 1.9 2009/08/22 06:52:16 mrg Exp $      */
+/*     $NetBSD: ldd.c,v 1.10 2009/09/07 17:56:52 dholland Exp $        */
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: ldd.c,v 1.9 2009/08/22 06:52:16 mrg Exp $");
+__RCSID("$NetBSD: ldd.c,v 1.10 2009/09/07 17:56:52 dholland Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -114,13 +114,13 @@
 int
 main(int argc, char **argv)
 {
-       char *fmt1 = NULL, *fmt2 = NULL;
+       const char *fmt1 = NULL, *fmt2 = NULL;
        int c;
 
 #ifdef DEBUG
        debug = 1;
 #endif
-       while ((c = getopt(argc, argv, "f:")) != -1) {
+       while ((c = getopt(argc, argv, "f:o")) != -1) {
                switch (c) {
                case 'f':
                        if (fmt1) {
@@ -130,6 +130,11 @@
                        } else
                                fmt1 = optarg;
                        break;
+               case 'o':
+                       if (fmt1 || fmt2)
+                               errx(1, "Cannot use -o and -f together");
+                       fmt1 = "%a:-l%o.%m => %p\n";
+                       break;
                default:
                        usage();
                        /*NOTREACHED*/