diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index 9cf3a5083852bff2e2bf09335e792b40af8e3d73..50e46ab863f71574622df4790ea33a8e521f2471 100644 (file)
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
#include "cache.h"
#include "diff.h"
#include "diffcore.h"
#include "cache.h"
#include "diff.h"
#include "diffcore.h"
-#include "delta.h"
-static int contains(struct diff_filespec *one,
- const char *needle, unsigned long len)
+static unsigned int contains(struct diff_filespec *one,
+ const char *needle, unsigned long len)
{
{
+ unsigned int cnt;
unsigned long offset, sz;
const char *data;
unsigned long offset, sz;
const char *data;
- if (diff_populate_filespec(one))
+ if (diff_populate_filespec(one, 0))
return 0;
return 0;
+
sz = one->size;
data = one->data;
sz = one->size;
data = one->data;
- for (offset = 0; offset + len <= sz; offset++)
- if (!strncmp(needle, data + offset, len))
- return 1;
- return 0;
+ cnt = 0;
+
+ /* 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++;
+ }
+ }
+ return cnt;
}
void diffcore_pickaxe(const char *needle, int opts)
}
void diffcore_pickaxe(const char *needle, int opts)