From: Eric Andersen <andersen@codepoet.org>
Date: Mon, 9 Oct 2000 17:51:25 +0000 (-0000)
Subject: Apply a patch from Matt Kraai:
X-Git-Tag: 0_48~166
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=958c78f9a10f2d4e58afa5700da098dfffa4279e;p=oweals%2Fbusybox.git

Apply a patch from Matt Kraai:
    "The -L option to ls doesn't behave correctly for files listed explicitly
    on the command line, only those in directories that are listed.  The
    appended patch fixes this problem.  Would someone please commit it?"
 -Erik
---

diff --git a/coreutils/ls.c b/coreutils/ls.c
index 385d6b2de..8d975fd13 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -790,7 +790,17 @@ extern int ls_main(int argc, char **argv)
 	for (oi=0 ; oi < ac; oi++) {
 		cur= (struct dnode *)xmalloc(sizeof(struct dnode));
 		cur->fullname= xstrdup(av[oi]);
-		cur->name= cur->fullname ;
+		cur->name= cur->fullname;
+#ifdef BB_FEATURE_LS_FOLLOWLINKS
+		if (follow_links == TRUE) {
+			if (stat(av[oi], &cur->dstat)) {
+				errorMsg("%s: %s\n", av[oi], strerror(errno));
+				free(cur->fullname);
+				free(cur);
+				continue;
+			}
+		} else
+#endif
 		if (lstat(av[oi], &cur->dstat)) {  /* get file info into node */
 			errorMsg("%s: %s\n", av[oi], strerror(errno));
 			free(cur->fullname);
diff --git a/ls.c b/ls.c
index 385d6b2de..8d975fd13 100644
--- a/ls.c
+++ b/ls.c
@@ -790,7 +790,17 @@ extern int ls_main(int argc, char **argv)
 	for (oi=0 ; oi < ac; oi++) {
 		cur= (struct dnode *)xmalloc(sizeof(struct dnode));
 		cur->fullname= xstrdup(av[oi]);
-		cur->name= cur->fullname ;
+		cur->name= cur->fullname;
+#ifdef BB_FEATURE_LS_FOLLOWLINKS
+		if (follow_links == TRUE) {
+			if (stat(av[oi], &cur->dstat)) {
+				errorMsg("%s: %s\n", av[oi], strerror(errno));
+				free(cur->fullname);
+				free(cur);
+				continue;
+			}
+		} else
+#endif
 		if (lstat(av[oi], &cur->dstat)) {  /* get file info into node */
 			errorMsg("%s: %s\n", av[oi], strerror(errno));
 			free(cur->fullname);