grep: -r didn't close files, producing "Too many open files"

diff --git a/findutils/grep.c b/findutils/grep.c
index 12cad34aafb3416871c0d35259ab9612cc62be45..04dd2b0e4c9a9f2eeaf323ead594949d173fd9b9 100644 (file)
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -301,6 +301,7 @@ static int file_action_grep(const char *filename, struct stat *statbuf, void* ma
        }
        cur_file = filename;
        *(int*)matched += grep_file(file);
+       fclose(file);
        return 1;
 }
 
@@ -446,13 +447,13 @@ int grep_main(int argc, char **argv)
                        }
                }
                matched += grep_file(file);
+               bb_fclose_nonstdin(file);
  grep_done:
                if (matched < 0) {
                        /* we found a match but were told to be quiet, stop here and
                        * return success */
                        break;
                }
-               bb_fclose_nonstdin(file);
        }
 
        /* destroy all the elments in the pattern list */