From: Martin Mares <mj@ucw.cz>
Date: Sat, 29 Apr 2006 22:47:55 +0000 (+0200)
Subject: Merge with git+ssh://cvs.ucw.cz/projects/sherlock/GIT/sherlock.git#dev-config
X-Git-Tag: holmes-import~645^2~11
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=5d4c3f3f01730c49b82f9212749ce28f6f808658;p=libucw.git

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

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

5d4c3f3f01730c49b82f9212749ce28f6f808658
diff --cc lib/string.c
index 00000000,6a1f1d2d..45491025
mode 000000,100644..100644
--- a/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;
+ }
 -