Merge branch 'maint'

diff --git a/xdiff/xutils.c b/xdiff/xutils.c
index f91b4034751df72996afbe6b4b04a9f05638d322..1b899f32c4b7c3f00c5310a161d0d9afd459f002 100644 (file)
--- a/xdiff/xutils.c
+++ b/xdiff/xutils.c
@@ -186,12 +186,57 @@ 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; ) {
+                       if (isspace(l1[i1]))
+                               while (isspace(l1[i1]) && i1 < s1)
+                                       i1++;
+                       if (isspace(l2[i2]))
+                               while (isspace(l2[i2]) && i2 < s2)
+                                       i2++;
+                       if (i1 < s1 && i2 < s2 && l1[i1++] != l2[i2++])
+                               return 0;
+               }
+               return (i1 >= s1 && i2 >= s2);
+       } else if (flags & XDF_IGNORE_WHITESPACE_CHANGE) {
+               for (i1 = i2 = 0; i1 < s1 && i2 < s2; ) {
+                       if (isspace(l1[i1])) {
+                               if (!isspace(l2[i2]))
+                                       return 0;
+                               while (isspace(l1[i1]) && i1 < s1)
+                                       i1++;
+                               while (isspace(l2[i2]) && i2 < s2)
+                                       i2++;
+                       } else if (l1[i1++] != l2[i2++])
+                               return 0;
+               }
+               return (i1 >= s1 && i2 >= s2);
+       } 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 + 1 < top && isspace(ptr[1])
+                                       && ptr[1] != '\n')
+                               ptr++;
+                       if (flags & XDF_IGNORE_WHITESPACE_CHANGE
+                                       && ptr[1] != '\n') {
+                               ha += (ha << 5);
+                               ha ^= (unsigned long) ' ';
+                       }
+                       continue;
+               }
                ha += (ha << 5);
                ha ^= (unsigned long) *ptr;
        }