builtin-grep: support '-l' option.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/builtin-grep.c b/builtin-grep.c
index 653b65ea1040a6d4e41f0c32df6c6766e04bc8d0..c3e6701aa0d29e13421fb47bdcb7bdfcad7d5438 100644 (file)
--- a/builtin-grep.c
+++ b/builtin-grep.c
@@ -81,6 +81,7 @@ struct grep_opt {
        regex_t regexp;
        unsigned linenum:1;
        unsigned invert:1;
        regex_t regexp;
        unsigned linenum:1;
        unsigned invert:1;

+       unsigned name_only:1;

        int regflags;
        unsigned pre_context;
        unsigned post_context;
        int regflags;
        unsigned pre_context;
        unsigned post_context;


@@ -139,6 +140,10 @@ static int grep_buffer(struct grep_opt *opt, const char *name,
                if (opt->invert)
                        hit = !hit;
                if (hit) {
                if (opt->invert)
                        hit = !hit;
                if (hit) {

+                       if (opt->name_only) {
+                               printf("%s\n", name);
+                               return 1;
+                       }

                        /* Hit at this line.  If we haven't shown the
                         * pre-context lines, we would need to show them.
                         */
                        /* Hit at this line.  If we haven't shown the
                         * pre-context lines, we would need to show them.
                         */


@@ -406,6 +411,11 @@ int cmd_grep(int argc, const char **argv, char **envp)
                                 */
                                continue;
                        }
                                 */
                                continue;
                        }

+                       if (!strcmp("-l", arg) ||
+                           !strcmp("--files-with-matches", arg)) {
+                               opt.name_only = 1;
+                               continue;
+                       }

                        if (!strcmp("-A", arg) ||
                            !strcmp("-B", arg) ||
                            !strcmp("-C", arg)) {
                        if (!strcmp("-A", arg) ||
                            !strcmp("-B", arg) ||
                            !strcmp("-C", arg)) {