Merge with git+ssh://cvs.ucw.cz/projects/sherlock/GIT/sherlock.git#dev-config

(Merged the dev-config branch with the mainline.)

diff --cc lib/kmp-search.h
Simple merge

diff --cc lib/string.c
index 0000000000000000000000000000000000000000,6a1f1d2da432b7a05855c860c7f605cb8d9aca5f..454910252f57c70246579e084eb50e96c016befe
mode 000000,100644..100644
--- /dev/null
--- 2/lib/string.c
+++ b/lib/string.c
@@@ -1,0 -1,75 +1,74 @@@
 -
+ /*
+  *    UCW Library -- String Routines
+  *
+  *    (c) 2006 Pavel Charvat <pchar@ucw.cz>
+  *
+  *    This software may be freely distributed and used according to the terms
+  *    of the GNU Lesser General Public License.
+  */
+ 
+ #undef LOCAL_DEBUG
+ 
+ #include "lib/lib.h"
+ #include "lib/chartype.h"
+ #include <stdlib.h>
+ 
+ /* Expands C99-like escape sequences.
+  * It is safe to use the same buffer for both input and output. */
+ byte *
+ str_unesc(byte *d, byte *s)
+ {
+   while (*s)
+     {
+       if (*s == '\\')
+       switch (s[1])
+         {
+           case 'a': *d++ = '\a'; s += 2; break;
+           case 'b': *d++ = '\b'; s += 2; break;
+           case 'f': *d++ = '\f'; s += 2; break;
+           case 'n': *d++ = '\n'; s += 2; break;
+           case 'r': *d++ = '\r'; s += 2; break;
+           case 't': *d++ = '\t'; s += 2; break;
+           case 'v': *d++ = '\v'; s += 2; break;
+           case '\?': *d++ = '\?'; s += 2; break;
+           case '\'': *d++ = '\''; s += 2; break;
+           case '\"': *d++ = '\"'; s += 2; break;
+           case '\\': *d++ = '\\'; s += 2; break;
+           case 'x':
+             if (!Cxdigit(s[2]))
+               {
+                 s++;
+                 DBG("\\x used with no following hex digits");
+               }
+             else
+               {
+                 char *p;
+                 uns v = strtoul(s + 2, &p, 16);
+                 if (v <= 255)
+                   *d++ = v;
+                 else
+                   DBG("hex escape sequence out of range");
+                   s = (byte *)p;
+               }
+             break;
+             default:
+             if (s[1] >= '0' && s[1] <= '7')
+               {
+                 uns v = s[1] - '0';
+                 s += 2;
+                 for (uns i = 0; i < 2 && *s >= '0' && *s <= '7'; s++, i++)
+                   v = (v << 3) + *s - '0';
+                 if (v <= 255)
+                   *d++ = v;
+                 else
+                   DBG("octal escape sequence out of range");
+               }
+             *d++ = *s++;
+             break;
+         }
+       else
+       *d++ = *s++;
+     }
+   *d = 0;
+   return d;
+ }