Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/ldd Mark each object as printed as visited and then ...



details:   https://anonhg.NetBSD.org/src/rev/7e7c833bd974
branches:  trunk
changeset: 752326:7e7c833bd974
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue Feb 23 08:23:24 2010 +0000

description:
Mark each object as printed as visited and then print.

Fixes PR/42811.

As a side effect the libraries are printed in, imo, a better order.

diffstat:

 usr.bin/ldd/ldd.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r 2dccd19d0f5d -r 7e7c833bd974 usr.bin/ldd/ldd.c
--- a/usr.bin/ldd/ldd.c Tue Feb 23 07:02:23 2010 +0000
+++ b/usr.bin/ldd/ldd.c Tue Feb 23 08:23:24 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ldd.c,v 1.12 2009/12/13 08:50:56 mrg Exp $     */
+/*     $NetBSD: ldd.c,v 1.13 2010/02/23 08:23:24 skrll 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.12 2009/12/13 08:50:56 mrg Exp $");
+__RCSID("$NetBSD: ldd.c,v 1.13 2010/02/23 08:23:24 skrll Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -290,10 +290,10 @@
                const char *libname = obj->strtab + needed->name;
 
                if (needed->obj != NULL) {
-                       print_needed(needed->obj, fmt1, fmt2);
                        if (!needed->obj->printed) {
                                fmtprint(libname, needed->obj, fmt1, fmt2);
                                needed->obj->printed = 1;
+                               print_needed(needed->obj, fmt1, fmt2);
                        }
                } else {
                        fmtprint(libname, needed->obj, fmt1, fmt2);



Home | Main Index | Thread Index | Old Index