grep: fix combination of -r and -h

git-svn-id: svn://busybox.net/trunk/busybox@16382 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 2 insertions, 1 deletions

diff --git a/findutils/grep.c b/findutils/grep.c
index 1285d21f8..12cad34aa 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -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;
                                 }