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

grep: fix combination of -r and -h

Browse Source
This commit is contained in:
Denis Vlasenko 2006-10-14 14:51:59 +00:00
parent 3a6755f56f
commit 3544ae6004
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
findutils/grep.c
View File

@ -430,7 +430,8 @@ int grep_main(int argc, char **argv)
if (option_mask32 & GREP_OPT_r) {
struct stat st;
if (stat(cur_file, &st) == 0 && S_ISDIR(st.st_mode)) {
print_filename = 1;
if (!(option_mask32 & GREP_OPT_h))
print_filename = 1;
matched += grep_dir(cur_file);
goto grep_done;
}