Module Name: src
Committed By: sborrill
Date: Sat Mar 6 22:48:22 UTC 2010
Modified Files:
src/usr.bin/ldd [netbsd-5]: ldd.c
Log Message:
Pull up the following revisions(s) (requested by skrll in ticket #1318):
usr.bin/ldd/ldd.c: revision 1.13
Mark each object as printed as visited and then print. Fixes PR/42811.
Improve print order.
To generate a diff of this commit:
cvs rdiff -u -r1.2.12.2 -r1.2.12.3 src/usr.bin/ldd/ldd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/ldd/ldd.c
diff -u src/usr.bin/ldd/ldd.c:1.2.12.2 src/usr.bin/ldd/ldd.c:1.2.12.3
--- src/usr.bin/ldd/ldd.c:1.2.12.2 Wed Feb 25 03:09:31 2009
+++ src/usr.bin/ldd/ldd.c Sat Mar 6 22:48:22 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ldd.c,v 1.2.12.2 2009/02/25 03:09:31 snj Exp $ */
+/* $NetBSD: ldd.c,v 1.2.12.3 2010/03/06 22:48:22 sborrill 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.2.12.2 2009/02/25 03:09:31 snj Exp $");
+__RCSID("$NetBSD: ldd.c,v 1.2.12.3 2010/03/06 22:48:22 sborrill Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -283,10 +283,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);
