2 files changed, 19 insertions, 5 deletions

diff --git a/usr.bin/ldd/ldd.1 b/usr.bin/ldd/ldd.1
index 470fd4211975..a631df2ce579 100644
--- a/usr.bin/ldd/ldd.1
+++ b/usr.bin/ldd/ldd.1
@@ -8,6 +8,7 @@
 .Nd list dynamic object dependencies
 .Sh SYNOPSIS
 .Nm
+.Op Fl a
 .Op Fl v
 .Op Fl f Ar format
 .Ar program ...
@@ -35,6 +36,13 @@ See
 for a list of recognized conversion characters.
 .Pp
 The
+.Fl a
+option displays the list of all objects that are needed by each loaded
+object. This option does not work with
+.Xr a.out 5
+binaries.
+.Pp
+The
 .Fl v
 option displays an verbose listing of the dynamic linking headers
 encoded in the executable.  See the source code and include
diff --git a/usr.bin/ldd/ldd.c b/usr.bin/ldd/ldd.c
index fc204672f4a2..19db2f1b5d37 100644
--- a/usr.bin/ldd/ldd.c
+++ b/usr.bin/ldd/ldd.c
@@ -49,7 +49,7 @@ extern int	error_count;
 void
 usage()
 {
-	fprintf(stderr, "usage: ldd [-v] [-f format] program ...\n");
+	fprintf(stderr, "usage: ldd [-a] [-v] [-f format] program ...\n");
 	exit(1);
 }
 
@@ -61,10 +61,15 @@ char	*argv[];
 	char		*fmt1 = NULL, *fmt2 = NULL;
 	int		rval;
 	int		c;
-	int		vflag = 0;
+	int		aflag, vflag;
 
-	while ((c = getopt(argc, argv, "vf:")) != -1) {
+	aflag = vflag = 0;
+
+	while ((c = getopt(argc, argv, "avf:")) != -1) {
 		switch (c) {
+		case 'a':
+			aflag++;
+			break;
 		case 'v':
 			vflag++;
 			break;
@@ -101,7 +106,7 @@ char	*argv[];
 #endif
 
 	/* ld.so magic */
-	setenv("LD_TRACE_LOADED_OBJECTS", "1", 1);
+	setenv("LD_TRACE_LOADED_OBJECTS", "yes", 1);
 	if (fmt1)
 		setenv("LD_TRACE_LOADED_OBJECTS_FMT1", fmt1, 1);
 	if (fmt2)
@@ -190,7 +195,8 @@ char	*argv[];
 		}
 
 		setenv("LD_TRACE_LOADED_OBJECTS_PROGNAME", *argv, 1);
-		if (fmt1 == NULL && fmt2 == NULL)
+		if (aflag) setenv("LD_TRACE_LOADED_OBJECTS_ALL", "1", 1);
+		else if (fmt1 == NULL && fmt2 == NULL)
 			/* Default formats */
 			printf("%s:\n", *argv);