Merge branch 'jc/reupdate' into next
[gitweb.git] / builtin-grep.c
index 09e3677824595d71d02fc7bfc03eef0428df8b90..c89ee33a1ede4e032cae850315ee2b2185a64457 100644 (file)
@@ -26,7 +26,7 @@ static int pathspec_matches(const char **paths, const char *name)
        for (i = 0; paths[i]; i++) {
                const char *match = paths[i];
                int matchlen = strlen(match);
-               const char *slash, *cp;
+               const char *cp, *meta;
 
                if ((matchlen <= namelen) &&
                    !strncmp(name, match, matchlen) &&
@@ -38,38 +38,43 @@ static int pathspec_matches(const char **paths, const char *name)
                if (name[namelen-1] != '/')
                        continue;
 
-               /* We are being asked if the name directory is worth
+               /* We are being asked if the directory ("name") is worth
                 * descending into.
                 *
                 * Find the longest leading directory name that does
                 * not have metacharacter in the pathspec; the name
                 * we are looking at must overlap with that directory.
                 */
-               for (cp = match, slash = NULL; cp - match < matchlen; cp++) {
+               for (cp = match, meta = NULL; cp - match < matchlen; cp++) {
                        char ch = *cp;
-                       if (ch == '/')
-                               slash = cp;
-                       if (ch == '*' || ch == '[')
+                       if (ch == '*' || ch == '[' || ch == '?') {
+                               meta = cp;
                                break;
+                       }
                }
-               if (!slash)
-                       slash = match; /* toplevel */
-               else
-                       slash++;
-               if (namelen <= slash - match) {
+               if (!meta)
+                       meta = cp; /* fully literal */
+
+               if (namelen <= meta - match) {
                        /* Looking at "Documentation/" and
                         * the pattern says "Documentation/howto/", or
-                        * "Documentation/diff*.txt".
+                        * "Documentation/diff*.txt".  The name we
+                        * have should match prefix.
                         */
                        if (!memcmp(match, name, namelen))
                                return 1;
+                       continue;
                }
-               else {
+
+               if (meta - match < namelen) {
                        /* Looking at "Documentation/howto/" and
-                        * the pattern says "Documentation/h*".
+                        * the pattern says "Documentation/h*";
+                        * match up to "Do.../h"; this avoids descending
+                        * into "Documentation/technical/".
                         */
-                       if (!memcmp(match, name, slash - match))
+                       if (!memcmp(match, name, meta - match))
                                return 1;
+                       continue;
                }
        }
        return 0;
@@ -88,8 +93,13 @@ struct grep_opt {
        unsigned linenum:1;
        unsigned invert:1;
        unsigned name_only:1;
+       unsigned unmatch_name_only:1;
        unsigned count:1;
        unsigned word_regexp:1;
+#define GREP_BINARY_DEFAULT    0
+#define GREP_BINARY_NOMATCH    1
+#define GREP_BINARY_TEXT       2
+       unsigned binary:2;
        int regflags;
        unsigned pre_context;
        unsigned post_context;
@@ -143,6 +153,19 @@ static void show_line(struct grep_opt *opt, const char *bol, const char *eol,
        printf("%.*s\n", (int)(eol-bol), bol);
 }
 
+/*
+ * NEEDSWORK: share code with diff.c
+ */
+#define FIRST_FEW_BYTES 8000
+static int buffer_is_binary(const char *ptr, unsigned long size)
+{
+       if (FIRST_FEW_BYTES < size)
+               size = FIRST_FEW_BYTES;
+       if (memchr(ptr, 0, size))
+               return 1;
+       return 0;
+}
+
 static int grep_buffer(struct grep_opt *opt, const char *name,
                       char *buf, unsigned long size)
 {
@@ -155,9 +178,23 @@ static int grep_buffer(struct grep_opt *opt, const char *name,
        } *prev = NULL, *pcl;
        unsigned last_hit = 0;
        unsigned last_shown = 0;
+       int binary_match_only = 0;
        const char *hunk_mark = "";
        unsigned count = 0;
 
+       if (buffer_is_binary(buf, size)) {
+               switch (opt->binary) {
+               case GREP_BINARY_DEFAULT:
+                       binary_match_only = 1;
+                       break;
+               case GREP_BINARY_NOMATCH:
+                       return 0; /* Assume unmatch */
+                       break;
+               default:
+                       break;
+               }
+       }
+
        if (opt->pre_context)
                prev = xcalloc(opt->pre_context, sizeof(*prev));
        if (opt->pre_context || opt->post_context)
@@ -205,8 +242,17 @@ static int grep_buffer(struct grep_opt *opt, const char *name,
                 */
                if (opt->invert)
                        hit = !hit;
+               if (opt->unmatch_name_only) {
+                       if (hit)
+                               return 0;
+                       goto next_line;
+               }
                if (hit) {
                        count++;
+                       if (binary_match_only) {
+                               printf("Binary file %s matches\n", name);
+                               return 1;
+                       }
                        if (opt->name_only) {
                                printf("%s\n", name);
                                return 1;
@@ -257,11 +303,22 @@ static int grep_buffer(struct grep_opt *opt, const char *name,
                        prev->bol = bol;
                        prev->eol = eol;
                }
+
+       next_line:
                *eol = ch;
                bol = eol + 1;
+               if (!left)
+                       break;
                left--;
                lno++;
        }
+
+       if (opt->unmatch_name_only) {
+               /* We did not see any hit, so we want to show this */
+               printf("%s\n", name);
+               return 1;
+       }
+
        /* NEEDSWORK:
         * The real "grep -c foo *.c" gives many "bar.c:0" lines,
         * which feels mostly useless but sometimes useful.  Maybe
@@ -446,11 +503,20 @@ int cmd_grep(int argc, const char **argv, char **envp)
                        cached = 1;
                        continue;
                }
+               if (!strcmp("-a", arg) ||
+                   !strcmp("--text", arg)) {
+                       opt.binary = GREP_BINARY_TEXT;
+                       continue;
+               }
                if (!strcmp("-i", arg) ||
                    !strcmp("--ignore-case", arg)) {
                        opt.regflags |= REG_ICASE;
                        continue;
                }
+               if (!strcmp("-I", arg)) {
+                       opt.binary = GREP_BINARY_NOMATCH;
+                       continue;
+               }
                if (!strcmp("-v", arg) ||
                    !strcmp("--invert-match", arg)) {
                        opt.invert = 1;
@@ -481,6 +547,11 @@ int cmd_grep(int argc, const char **argv, char **envp)
                        opt.name_only = 1;
                        continue;
                }
+               if (!strcmp("-L", arg) ||
+                   !strcmp("--files-without-match", arg)) {
+                       opt.unmatch_name_only = 1;
+                       continue;
+               }
                if (!strcmp("-c", arg) ||
                    !strcmp("--count", arg)) {
                        opt.count = 1;