gitweb: Run in FastCGI mode if gitweb script has .fcgi extension

diff --git a/xdiff/xutils.c b/xdiff/xutils.c
index f91b4034751df72996afbe6b4b04a9f05638d322..bc12f298953a4e72b323f73607278028ec4a2805 100644 (file)
--- a/xdiff/xutils.c
+++ b/xdiff/xutils.c
@@ -186,11 +186,118 @@ 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_WHITESPACE_FLAGS))
+               return s1 == s2 && !memcmp(l1, l2, s1);
+
+       i1 = 0;
+       i2 = 0;
+
+       /*
+        * -w matches everything that matches with -b, and -b in turn
+        * matches everything that matches with --ignore-space-at-eol.
+        *
+        * Each flavor of ignoring needs different logic to skip whitespaces
+        * while we have both sides to compare.
+        */
+       if (flags & XDF_IGNORE_WHITESPACE) {
+               goto skip_ws;
+               while (i1 < s1 && i2 < s2) {
+                       if (l1[i1++] != l2[i2++])
+                               return 0;
+               skip_ws:
+                       while (i1 < s1 && isspace(l1[i1]))
+                               i1++;
+                       while (i2 < s2 && isspace(l2[i2]))
+                               i2++;
+               }
+       } else if (flags & XDF_IGNORE_WHITESPACE_CHANGE) {
+               while (i1 < s1 && i2 < s2) {
+                       if (isspace(l1[i1]) && isspace(l2[i2])) {
+                               /* Skip matching spaces and try again */
+                               while (i1 < s1 && isspace(l1[i1]))
+                                       i1++;
+                               while (i2 < s2 && isspace(l2[i2]))
+                                       i2++;
+                               continue;
+                       }
+                       if (l1[i1++] != l2[i2++])
+                               return 0;
+               }
+       } else if (flags & XDF_IGNORE_WHITESPACE_AT_EOL) {
+               while (i1 < s1 && i2 < s2 && l1[i1++] == l2[i2++])
+                       ; /* keep going */
+       }
+
+       /*
+        * After running out of one side, the remaining side must have
+        * nothing but whitespace for the lines to match.  Note that
+        * ignore-whitespace-at-eol case may break out of the loop
+        * while there still are characters remaining on both lines.
+        */
+       if (i1 < s1) {
+               while (i1 < s1 && isspace(l1[i1]))
+                       i1++;
+               if (s1 != i1)
+                       return 0;
+       }
+       if (i2 < s2) {
+               while (i2 < s2 && isspace(l2[i2]))
+                       i2++;
+               return (s2 == i2);
+       }
+       return 1;
+}
+
+static unsigned long xdl_hash_record_with_whitespace(char const **data,
+               char const *top, long flags) {
+       unsigned long ha = 5381;
+       char const *ptr = *data;
 
-unsigned long xdl_hash_record(char const **data, char const *top) {
+       for (; ptr < top && *ptr != '\n'; ptr++) {
+               if (isspace(*ptr)) {
+                       const char *ptr2 = ptr;
+                       int at_eol;
+                       while (ptr + 1 < top && isspace(ptr[1])
+                                       && ptr[1] != '\n')
+                               ptr++;
+                       at_eol = (top <= ptr + 1 || ptr[1] == '\n');
+                       if (flags & XDF_IGNORE_WHITESPACE)
+                               ; /* already handled */
+                       else if (flags & XDF_IGNORE_WHITESPACE_CHANGE
+                                && !at_eol) {
+                               ha += (ha << 5);
+                               ha ^= (unsigned long) ' ';
+                       }
+                       else if (flags & XDF_IGNORE_WHITESPACE_AT_EOL
+                                && !at_eol) {
+                               while (ptr2 != ptr + 1) {
+                                       ha += (ha << 5);
+                                       ha ^= (unsigned long) *ptr2;
+                                       ptr2++;
+                               }
+                       }
+                       continue;
+               }
+               ha += (ha << 5);
+               ha ^= (unsigned long) *ptr;
+       }
+       *data = ptr < top ? ptr + 1: ptr;
+
+       return ha;
+}
+
+
+unsigned long xdl_hash_record(char const **data, char const *top, long flags) {
        unsigned long ha = 5381;
        char const *ptr = *data;
 
+       if (flags & XDF_WHITESPACE_FLAGS)
+               return xdl_hash_record_with_whitespace(data, top, flags);
+
        for (; ptr < top && *ptr != '\n'; ptr++) {
                ha += (ha << 5);
                ha ^= (unsigned long) *ptr;
@@ -293,4 +400,3 @@ int xdl_emit_hunk_hdr(long s1, long c1, long s2, long c2,
 
        return 0;
 }
-