mirror of
https://github.com/sheumann/hush.git
synced 2024-09-12 00:55:11 +00:00
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
This commit is contained in:
parent
13241dfbdd
commit
958c78f9a1
@ -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);
|
||||
|
12
ls.c
12
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);
|
||||
|
Loading…
Reference in New Issue
Block a user