grep: fix combination of -r and -h
authorDenis Vlasenko <vda.linux@googlemail.com>
Sat, 14 Oct 2006 14:51:59 +0000 (14:51 -0000)
committerDenis Vlasenko <vda.linux@googlemail.com>
Sat, 14 Oct 2006 14:51:59 +0000 (14:51 -0000)
findutils/grep.c

index 1285d21..12cad34 100644 (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;
                                }