diff options
| author | Ron Yorston <rmy@pobox.com> | 2019-01-10 08:38:15 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2019-01-10 08:38:15 +0000 |
| commit | f99a280743e877c14ee90a3f9e93a34ca3476a27 (patch) | |
| tree | 60ca3d17596e190c8c7cbca587168946598bee8a /coreutils/ls.c | |
| parent | 40d5dd07ea1f290eaed30a03fd598e33a8eaf495 (diff) | |
| parent | 6ca8e347fed8c24655df692f22694baf7c572770 (diff) | |
| download | busybox-w32-f99a280743e877c14ee90a3f9e93a34ca3476a27.tar.gz busybox-w32-f99a280743e877c14ee90a3f9e93a34ca3476a27.tar.bz2 busybox-w32-f99a280743e877c14ee90a3f9e93a34ca3476a27.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'coreutils/ls.c')
| -rw-r--r-- | coreutils/ls.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c index fb4f998be..48927c964 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c | |||
| @@ -1206,8 +1206,8 @@ int ls_main(int argc UNUSED_PARAM, char **argv) | |||
| 1206 | nfiles = 0; | 1206 | nfiles = 0; |
| 1207 | do { | 1207 | do { |
| 1208 | cur = my_stat(*argv, *argv, | 1208 | cur = my_stat(*argv, *argv, |
| 1209 | /* follow links on command line unless -l, -s or -F: */ | 1209 | /* follow links on command line unless -l, -i, -s or -F: */ |
| 1210 | !(option_mask32 & (OPT_l|OPT_s|OPT_F)) | 1210 | !(option_mask32 & (OPT_l|OPT_i|OPT_s|OPT_F)) |
| 1211 | /* ... or if -H: */ | 1211 | /* ... or if -H: */ |
| 1212 | || (option_mask32 & OPT_H) | 1212 | || (option_mask32 & OPT_H) |
| 1213 | /* ... or if -L, but my_stat always follows links if -L */ | 1213 | /* ... or if -L, but my_stat always follows links if -L */ |