1 files changed, 11 insertions, 1 deletions
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);

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)
790	for (oi=0 ; oi < ac; oi++) {	790	for (oi=0 ; oi < ac; oi++) {
791	cur= (struct dnode *)xmalloc(sizeof(struct dnode));	791	cur= (struct dnode *)xmalloc(sizeof(struct dnode));
792	cur->fullname= xstrdup(av[oi]);	792	cur->fullname= xstrdup(av[oi]);
793	cur->name= cur->fullname ;	793	cur->name= cur->fullname;
		794	#ifdef BB_FEATURE_LS_FOLLOWLINKS
		795	if (follow_links == TRUE) {
		796	if (stat(av[oi], &cur->dstat)) {
		797	errorMsg("%s: %s\n", av[oi], strerror(errno));
		798	free(cur->fullname);
		799	free(cur);
		800	continue;
		801	}
		802	} else
		803	#endif
794	if (lstat(av[oi], &cur->dstat)) { /* get file info into node */	804	if (lstat(av[oi], &cur->dstat)) { /* get file info into node */
795	errorMsg("%s: %s\n", av[oi], strerror(errno));	805	errorMsg("%s: %s\n", av[oi], strerror(errno));
796	free(cur->fullname);	806	free(cur->fullname);