diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-04-13 23:59:52 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-04-13 23:59:52 +0000 |
commit | 16abcd90aefae8bdb9f7d80a555982dba6ca59b5 (patch) | |
tree | b7e23fd3c844849d188813323076c93105a57d4d /coreutils/ls.c | |
parent | 334fa9bcb50df9a03288be252096750dcec14404 (diff) | |
download | busybox-w32-16abcd90aefae8bdb9f7d80a555982dba6ca59b5.tar.gz busybox-w32-16abcd90aefae8bdb9f7d80a555982dba6ca59b5.tar.bz2 busybox-w32-16abcd90aefae8bdb9f7d80a555982dba6ca59b5.zip |
teach find_root_device to deal with /dev/ subdirs
(by "Kirill K. Smirnov" <lich@math.spbu.ru>)
Diffstat (limited to 'coreutils/ls.c')
-rw-r--r-- | coreutils/ls.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c index 7bbb19d6c..b9c07adf8 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c | |||
@@ -504,11 +504,11 @@ static struct dnode **list_dir(const char *path) | |||
504 | 504 | ||
505 | /* are we going to list the file- it may be . or .. or a hidden file */ | 505 | /* are we going to list the file- it may be . or .. or a hidden file */ |
506 | if (entry->d_name[0] == '.') { | 506 | if (entry->d_name[0] == '.') { |
507 | if ((entry->d_name[1] == 0 || ( | 507 | if ((!entry->d_name[1] || (entry->d_name[1] == '.' && !entry->d_name[2])) |
508 | entry->d_name[1] == '.' | 508 | && !(all_fmt & DISP_DOT) |
509 | && entry->d_name[2] == 0)) | 509 | ) { |
510 | && !(all_fmt & DISP_DOT)) | ||
511 | continue; | 510 | continue; |
511 | } | ||
512 | if (!(all_fmt & DISP_HIDDEN)) | 512 | if (!(all_fmt & DISP_HIDDEN)) |
513 | continue; | 513 | continue; |
514 | } | 514 | } |