aboutsummaryrefslogtreecommitdiff
path: root/coreutils/ls.c
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2000-10-09 17:51:25 +0000
committerEric Andersen <andersen@codepoet.org>2000-10-09 17:51:25 +0000
commit958c78f9a10f2d4e58afa5700da098dfffa4279e (patch)
tree7b4551f795279bc25e2786f4774abb2191f1c37b /coreutils/ls.c
parent13241dfbdd5c39c18296e75df118860e330417dd (diff)
downloadbusybox-w32-958c78f9a10f2d4e58afa5700da098dfffa4279e.tar.gz
busybox-w32-958c78f9a10f2d4e58afa5700da098dfffa4279e.tar.bz2
busybox-w32-958c78f9a10f2d4e58afa5700da098dfffa4279e.zip
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
Diffstat (limited to 'coreutils/ls.c')
-rw-r--r--coreutils/ls.c12
1 files changed, 11 insertions, 1 deletions
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)
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);