git grep: Add "-z/--null" option as in GNU's grep.

Here's a trivial patch that adds "-z" and "--null" options to "git
grep". It was discussed on the mailing-list that git's "-z"
convention should be used instead of GNU grep's "-Z".
So things like 'git grep -l -z "$FOO" | xargs -0 sed -i "s/$FOO/$BOO/"'
do work now.

Signed-off-by: Raphael Zimmerer <killekulla@rdrz.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index fa4d133c1bccc088d3c8da65bce4e15cafd394aa..553da6cbb1777a94cb3d6b48dc77c445e18ca2b0 100644 (file)
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -15,6 +15,7 @@ SYNOPSIS
           [-E | --extended-regexp] [-G | --basic-regexp]
           [-F | --fixed-strings] [-n]
           [-l | --files-with-matches] [-L | --files-without-match]
           [-E | --extended-regexp] [-G | --basic-regexp]
           [-F | --fixed-strings] [-n]
           [-l | --files-with-matches] [-L | --files-without-match]

+          [-z | --null]

           [-c | --count] [--all-match]
           [-A <post-context>] [-B <pre-context>] [-C <context>]
           [-f <file>] [-e] <pattern>
           [-c | --count] [--all-match]
           [-A <post-context>] [-B <pre-context>] [-C <context>]
           [-f <file>] [-e] <pattern>


@@ -94,6 +95,11 @@ OPTIONS
        For better compatibility with 'git-diff', --name-only is a
        synonym for --files-with-matches.
 
        For better compatibility with 'git-diff', --name-only is a
        synonym for --files-with-matches.
 

+-z::
+--null::
+       Output \0 instead of the character that normally follows a
+       file name.
+

 -c::
 --count::
        Instead of showing every matched line, show the number of
 -c::
 --count::
        Instead of showing every matched line, show the number of

diff --git a/builtin-grep.c b/builtin-grep.c
index 3a51662a35878ae6b5965c90abb747b5b27c5493..624f86e287cf6304d122850f8258444c5f916702 100644 (file)
--- a/builtin-grep.c
+++ b/builtin-grep.c
@@ -295,6 +295,9 @@ static int external_grep(struct grep_opt *opt, const char **paths, int cached)
                push_arg("-l");
        if (opt->unmatch_name_only)
                push_arg("-L");
                push_arg("-l");
        if (opt->unmatch_name_only)
                push_arg("-L");

+       if (opt->null_following_name)
+               /* in GNU grep git's "-z" translates to "-Z" */
+               push_arg("-Z");

        if (opt->count)
                push_arg("-c");
        if (opt->post_context || opt->pre_context) {
        if (opt->count)
                push_arg("-c");
        if (opt->post_context || opt->pre_context) {


@@ -599,6 +602,11 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
                        opt.unmatch_name_only = 1;
                        continue;
                }
                        opt.unmatch_name_only = 1;
                        continue;
                }

+               if (!strcmp("-z", arg) ||
+                   !strcmp("--null", arg)) {
+                       opt.null_following_name = 1;
+                       continue;
+               }

                if (!strcmp("-c", arg) ||
                    !strcmp("--count", arg)) {
                        opt.count = 1;
                if (!strcmp("-c", arg) ||
                    !strcmp("--count", arg)) {
                        opt.count = 1;

diff --git a/grep.c b/grep.c
index 706351197fc26efa10c4666d38433f8fbdf1d6b5..e2c190a7f66f9e9311f91d9a41b7dc3f295f00fb 100644 (file)
--- a/grep.c
+++ b/grep.c
@@ -239,6 +239,8 @@ static int word_char(char ch)
 static void show_line(struct grep_opt *opt, const char *bol, const char *eol,
                      const char *name, unsigned lno, char sign)
 {
 static void show_line(struct grep_opt *opt, const char *bol, const char *eol,
                      const char *name, unsigned lno, char sign)
 {

+       if (opt->null_following_name)
+               sign = '\0';

        if (opt->pathname)
                printf("%s%c", name, sign);
        if (opt->linenum)
        if (opt->pathname)
                printf("%s%c", name, sign);
        if (opt->linenum)


@@ -246,6 +248,11 @@ static void show_line(struct grep_opt *opt, const char *bol, const char *eol,
        printf("%.*s\n", (int)(eol-bol), bol);
 }
 
        printf("%.*s\n", (int)(eol-bol), bol);
 }
 

+static void show_name(struct grep_opt *opt, const char *name)
+{
+       printf("%s%c", name, opt->null_following_name ? '\0' : '\n');
+}
+

 static int fixmatch(const char *pattern, char *line, regmatch_t *match)
 {
        char *hit = strstr(line, pattern);
 static int fixmatch(const char *pattern, char *line, regmatch_t *match)
 {
        char *hit = strstr(line, pattern);


@@ -489,7 +496,7 @@ static int grep_buffer_1(struct grep_opt *opt, const char *name,
                                return 1;
                        }
                        if (opt->name_only) {
                                return 1;
                        }
                        if (opt->name_only) {

-                               printf("%s\n", name);
+                               show_name(opt, name);

                                return 1;
                        }
                        /* Hit at this line.  If we haven't shown the
                                return 1;
                        }
                        /* Hit at this line.  If we haven't shown the


@@ -555,7 +562,7 @@ static int grep_buffer_1(struct grep_opt *opt, const char *name,
                return 0;
        if (opt->unmatch_name_only) {
                /* We did not see any hit, so we want to show this */
                return 0;
        if (opt->unmatch_name_only) {
                /* We did not see any hit, so we want to show this */

-               printf("%s\n", name);
+               show_name(opt, name);

                return 1;
        }
 
                return 1;
        }
 


@@ -565,7 +572,8 @@ static int grep_buffer_1(struct grep_opt *opt, const char *name,
         * make it another option?  For now suppress them.
         */
        if (opt->count && count)
         * make it another option?  For now suppress them.
         */
        if (opt->count && count)

-               printf("%s:%u\n", name, count);
+               printf("%s%c%u\n", name,
+                      opt->null_following_name ? '\0' : ':', count);

        return !!last_hit;
 }
 
        return !!last_hit;
 }
 

diff --git a/grep.h b/grep.h
index 59b3f871ea63619f8d3caae74c41b4da1e9a2b9f..45a222d904b5898758c3c84f6ef1e0119c81f6b2 100644 (file)
--- a/grep.h
+++ b/grep.h
@@ -74,6 +74,7 @@ struct grep_opt {
        unsigned extended:1;
        unsigned relative:1;
        unsigned pathname:1;
        unsigned extended:1;
        unsigned relative:1;
        unsigned pathname:1;

+       unsigned null_following_name:1;

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