emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

teach find_root_device to deal with /dev/ subdirs

Browse Source 
(by "Kirill K. Smirnov" <lich@math.spbu.ru>)
This commit is contained in:
Denis Vlasenko
2007-04-13 23:59:52 +00:00
parent 334fa9bcb5
commit 16abcd90ae
9 changed files with 71 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
coreutils/ls.c
View File

@ -504,11 +504,11 @@ static struct dnode **list_dir(const char *path)
/* are we going to list the file- it may be . or .. or a hidden file */
if (entry->d_name[0] == '.') {
if ((entry->d_name[1] == 0 || (
entry->d_name[1] == '.'
&& entry->d_name[2] == 0))
&& !(all_fmt & DISP_DOT))
if ((!entry->d_name[1] || (entry->d_name[1] == '.' && !entry->d_name[2]))
&& !(all_fmt & DISP_DOT)
) {
continue;
}
if (!(all_fmt & DISP_HIDDEN))
continue;
}

2
coreutils/rm.c
View File

@ -40,7 +40,7 @@ int rm_main(int argc, char **argv)
do {
const char *base = bb_get_last_path_component(*argv);
if ((base[0] == '.') && (!base[1] || ((base[1] == '.') && !base[2]))) {
if (DOT_OR_DOTDOT(base)) {
bb_error_msg("cannot remove '.' or '..'");
} else if (remove_file(*argv, flags) >= 0) {
continue;