Merge branch 'js/merge-base'

diff --git a/xdiff/xutils.c b/xdiff/xutils.c
index 21ab8e7e263983b54c07e44150cedc5c43963a35..f7bdd395ad1f69067654a754b4d60fcc7c359275 100644 (file)
--- a/xdiff/xutils.c
+++ b/xdiff/xutils.c
@@ -44,21 +44,18 @@ long xdl_bogosqrt(long n) {
 
 int xdl_emit_diffrec(char const *rec, long size, char const *pre, long psize,
                     xdemitcb_t *ecb) {
+       int i = 2;
        mmbuffer_t mb[3];
-       int i;
 
        mb[0].ptr = (char *) pre;
        mb[0].size = psize;
        mb[1].ptr = (char *) rec;
        mb[1].size = size;
-       i = 2;
-
-       if (!size || rec[size-1] != '\n') {
-               mb[2].ptr = "\n\\ No newline at end of file\n";
+       if (size > 0 && rec[size - 1] != '\n') {
+               mb[2].ptr = (char *) "\n\\ No newline at end of file\n";
                mb[2].size = strlen(mb[2].ptr);
-               i = 3;
+               i++;
        }
-
        if (ecb->outf(ecb->priv, mb, i) < 0) {
 
                return -1;
@@ -189,12 +186,61 @@ long xdl_guess_lines(mmfile_t *mf) {
        return nl + 1;
 }
 
+int xdl_recmatch(const char *l1, long s1, const char *l2, long s2, long flags)
+{
+       int i1, i2;
+
+       if (flags & XDF_IGNORE_WHITESPACE) {
+               for (i1 = i2 = 0; i1 < s1 && i2 < s2; i1++, i2++) {
+                       if (isspace(l1[i1]))
+                               while (isspace(l1[i1]) && i1 < s1)
+                                       i1++;
+                       else if (isspace(l2[i2]))
+                               while (isspace(l2[i2]) && i2 < s2)
+                                       i2++;
+                       else if (l1[i1] != l2[i2])
+                               return l2[i2] - l1[i1];
+               }
+               if (i1 >= s1)
+                       return 1;
+               else if (i2 >= s2)
+                       return -1;
+       } else if (flags & XDF_IGNORE_WHITESPACE_CHANGE) {
+               for (i1 = i2 = 0; i1 < s1 && i2 < s2; i1++, i2++) {
+                       if (isspace(l1[i1])) {
+                               if (!isspace(l2[i2]))
+                                       return -1;
+                               while (isspace(l1[i1]) && i1 < s1)
+                                       i1++;
+                               while (isspace(l2[i2]) && i2 < s2)
+                                       i2++;
+                       } else if (l1[i1] != l2[i2])
+                               return l2[i2] - l1[i1];
+               }
+               if (i1 >= s1)
+                       return 1;
+               else if (i2 >= s2)
+                       return -1;
+       } else
+               return s1 == s2 && !memcmp(l1, l2, s1);
+
+       return 0;
+}
 
-unsigned long xdl_hash_record(char const **data, char const *top) {
+unsigned long xdl_hash_record(char const **data, char const *top, long flags) {
        unsigned long ha = 5381;
        char const *ptr = *data;
 
        for (; ptr < top && *ptr != '\n'; ptr++) {
+               if (isspace(*ptr) && (flags & XDF_WHITESPACE_FLAGS)) {
+                       while (ptr < top && isspace(*ptr) && ptr[1] != '\n')
+                               ptr++;
+                       if (flags & XDF_IGNORE_WHITESPACE_CHANGE) {
+                               ha += (ha << 5);
+                               ha ^= (unsigned long) ' ';
+                       }
+                       continue;
+               }
                ha += (ha << 5);
                ha ^= (unsigned long) *ptr;
        }