Bug fix. grep wasn't printing file names they way it was supposed to.

 -Erik

1 files changed, 6 insertions, 3 deletions

diff --git a/findutils/grep.c b/findutils/grep.c
index fdfc959af..287d9f80d 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -90,8 +90,8 @@ extern int grep_main (int argc, char **argv)
     char *cp;
     char *needle;
     char *fileName;
-    int tellName=FALSE;
-    int ignoreCase=FALSE;
+    int tellName=TRUE;
+    int ignoreCase=TRUE;
     int tellLine=FALSE;
 
 
@@ -115,7 +115,7 @@ extern int grep_main (int argc, char **argv)
                 break;
 
             case 'h':
-                tellName = TRUE;
+                tellName = FALSE;
                 break;
 
             case 'n':
@@ -137,6 +137,9 @@ extern int grep_main (int argc, char **argv)
     if (argc==0) {
         do_grep( stdin, needle, "stdin", FALSE, ignoreCase, tellLine);
     } else {
+        /* Never print the filename for just one file */ 
+        if (argc==1)
+            tellName=FALSE;
         while (argc-- > 0) {
             fileName = *argv++;