From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Sat, 14 Oct 2006 14:51:59 +0000 (-0000)
Subject: grep: fix combination of -r and -h
X-Git-Tag: 1_4_0~508
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3544ae60047f9bb94d5ce8c699c9c2b444a73f35;p=platform%2Fupstream%2Fbusybox.git

grep: fix combination of -r and -h
---

diff --git a/findutils/grep.c b/findutils/grep.c
index 1285d21..12cad34 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;
 				}