Merge branch 'jc/count' into next

diff --git a/builtin-grep.c b/builtin-grep.c
index f1800a54d482d94d04f872f62d6d8ae0121ab8cb..2124fa62e8900754615bf7eb49228a4d2b790d52 100644 (file)
--- a/builtin-grep.c
+++ b/builtin-grep.c
@@ -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;
@@ -89,6 +94,7 @@ struct grep_opt {
        unsigned invert:1;
        unsigned name_only:1;
        unsigned count:1;
+       unsigned word_regexp:1;
        int regflags;
        unsigned pre_context;
        unsigned post_context;
@@ -128,6 +134,11 @@ static char *end_of_line(char *cp, unsigned long *left)
        return cp;
 }
 
+static int word_char(char ch)
+{
+       return isalnum(ch) || ch == '_';
+}
+
 static void show_line(struct grep_opt *opt, const char *bol, const char *eol,
                      const char *name, unsigned lno, char sign)
 {
@@ -171,6 +182,25 @@ static int grep_buffer(struct grep_opt *opt, const char *name,
                        regex_t *exp = &p->regexp;
                        hit = !regexec(exp, bol, ARRAY_SIZE(pmatch),
                                       pmatch, 0);
+
+                       if (hit && opt->word_regexp) {
+                               /* Match beginning must be either
+                                * beginning of the line, or at word
+                                * boundary (i.e. the last char must
+                                * not be alnum or underscore).
+                                */
+                               if ((pmatch[0].rm_so < 0) ||
+                                   (eol - bol) <= pmatch[0].rm_so ||
+                                   (pmatch[0].rm_eo < 0) ||
+                                   (eol - bol) < pmatch[0].rm_eo)
+                                       die("regexp returned nonsense");
+                               if (pmatch[0].rm_so != 0 &&
+                                   word_char(bol[pmatch[0].rm_so-1]))
+                                       continue; /* not a word boundary */
+                               if ((eol-bol) < pmatch[0].rm_eo &&
+                                   word_char(bol[pmatch[0].rm_eo]))
+                                       continue; /* not a word boundary */
+                       }
                        if (hit)
                                break;
                }
@@ -461,6 +491,11 @@ int cmd_grep(int argc, const char **argv, char **envp)
                        opt.count = 1;
                        continue;
                }
+               if (!strcmp("-w", arg) ||
+                   !strcmp("--word-regexp", arg)) {
+                       opt.word_regexp = 1;
+                       continue;
+               }
                if (!strncmp("-A", arg, 2) ||
                    !strncmp("-B", arg, 2) ||
                    !strncmp("-C", arg, 2) ||