consume the newline (overwritten with 0-byte) after receiving cgi process headers

[project/uhttpd.git] / utils.c

diff --git a/utils.c b/utils.c
index ec0b3aa..e3de061 100644 (file)
--- a/utils.c
+++ b/utils.c
@@ -99,31 +99,18 @@ int uh_urldecode(char *buf, int blen, const char *src, int slen)
 
        for (i = 0; (i < slen) && (len < blen); i++)
        {
-               if (src[i] == '%')
-               {
-                       if (((i+2) < slen) && isxdigit(src[i+1]) && isxdigit(src[i+2]))
-                       {
-                               buf[len++] = (char)(16 * hex(src[i+1]) + hex(src[i+2]));
-                               i += 2;
-                       }
-                       else
-                       {
-                               /* Encoding error: it's hard to think of a
-                               ** scenario in which returning an incorrect
-                               ** 'decoding' of the malformed string is
-                               ** preferable to signaling an error condition. */
-                               #if 0 /* WORSE_IS_BETTER */
-                                   buf[len++] = '%';
-                               #else
-                                   return -2;
-                               #endif
-                       }
-               }
-               else
-               {
+               if (src[i] != '%') {
                        buf[len++] = src[i];
+                       continue;
                }
+
+               if (i + 2 >= slen || !isxdigit(src[i + 1]) || !isxdigit(src[i + 2]))
+                       return -2;
+
+               buf[len++] = (char)(16 * hex(src[i+1]) + hex(src[i+2]));
+               i += 2;
        }
+       buf[len] = 0;
 
        return (i == slen) ? len : -1;
 }
@@ -162,12 +149,10 @@ int uh_urlencode(char *buf, int blen, const char *src, int slen)
 
 int uh_b64decode(char *buf, int blen, const unsigned char *src, int slen)
 {
-       int i = 0;
-       int len = 0;
-
-       unsigned int cin  = 0;
        unsigned int cout = 0;
-
+       unsigned int cin  = 0;
+       int len = 0;
+       int i = 0;
 
        for (i = 0; (i <= slen) && (src[i] != 0); i++)
        {
@@ -190,21 +175,44 @@ int uh_b64decode(char *buf, int blen, const unsigned char *src, int slen)
 
                cout = (cout << 6) | cin;
 
-               if ((i % 4) == 3)
-               {
-                       if ((len + 3) < blen)
-                       {
-                               buf[len++] = (char)(cout >> 16);
-                               buf[len++] = (char)(cout >> 8);
-                               buf[len++] = (char)(cout);
-                       }
-                       else
-                       {
-                               break;
-                       }
-               }
+               if ((i % 4) != 3)
+                       continue;
+
+               if ((len + 3) >= blen)
+                       break;
+
+               buf[len++] = (char)(cout >> 16);
+               buf[len++] = (char)(cout >> 8);
+               buf[len++] = (char)(cout);
        }
 
        buf[len++] = 0;
        return len;
 }
+
+bool uh_path_match(const char *prefix, const char *url)
+{
+       int len = strlen(prefix);
+
+       if (strncmp(url, prefix, len) != 0)
+               return false;
+
+       return url[len] == '/' || url[len] == 0;
+}
+
+char *uh_split_header(char *str)
+{
+       char *val;
+
+       val = strchr(str, ':');
+       if (!val)
+               return NULL;
+
+       *val = 0;
+       val++;
+
+       while (isspace(*val))
+               val++;
+
+       return val;
+}