Git 1.7.2.5

diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index af9fffe6e8e145b066157da8791c749257e7c8e9..929de15aa9228099b3a772be788d746e440a9e8c 100644 (file)
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -10,7 +10,7 @@ static unsigned int contains(struct diff_filespec *one,
                             regex_t *regexp)
 {
        unsigned int cnt;
-       unsigned long offset, sz;
+       unsigned long sz;
        const char *data;
        if (diff_populate_filespec(one, 0))
                return 0;
@@ -25,23 +25,23 @@ static unsigned int contains(struct diff_filespec *one,
                regmatch_t regmatch;
                int flags = 0;
 
+               assert(data[sz] == '\0');
                while (*data && !regexec(regexp, data, 1, &regmatch, flags)) {
                        flags |= REG_NOTBOL;
-                       data += regmatch.rm_so;
-                       if (*data) data++;
+                       data += regmatch.rm_eo;
+                       if (*data && regmatch.rm_so == regmatch.rm_eo)
+                               data++;
                        cnt++;
                }
 
        } else { /* Classic exact string match */
-               /* Yes, I've heard of strstr(), but the thing is *data may
-                * not be NUL terminated.  Sue me.
-                */
-               for (offset = 0; offset + len <= sz; offset++) {
-                       /* we count non-overlapping occurrences of needle */
-                       if (!memcmp(needle, data + offset, len)) {
-                               offset += len - 1;
-                               cnt++;
-                       }
+               while (sz) {
+                       const char *found = memmem(data, sz, needle, len);
+                       if (!found)
+                               break;
+                       sz -= found - data + len;
+                       data = found + len;
+                       cnt++;
                }
        }
        diff_free_filespec_data(one);
@@ -55,8 +55,7 @@ void diffcore_pickaxe(const char *needle, int opts)
        int i, has_changes;
        regex_t regex, *regexp = NULL;
        struct diff_queue_struct outq;
-       outq.queue = NULL;
-       outq.nr = outq.alloc = 0;
+       DIFF_QUEUE_CLEAR(&outq);
 
        if (opts & DIFF_PICKAXE_REGEX) {
                int err;