table-drive UTF-8 validity checker

[disorder] / server / cgi.c

diff --git a/server/cgi.c b/server/cgi.c
index ce04563575f7a09d5a30071e986bae06f32d7d5a..37ac724dd867946d79efa58428f619fabed2ce44 100644 (file)
--- a/server/cgi.c
+++ b/server/cgi.c
@@ -52,7 +52,7 @@
 #include "cgi.h"
 #include "printf.h"
 #include "mime.h"
 #include "cgi.h"
 #include "printf.h"
 #include "mime.h"

-#include "utf8.h"
+#include "unicode.h"

 
 struct kvp *cgi_args;
 
 
 struct kvp *cgi_args;
 


@@ -187,8 +187,8 @@ void cgi_parse(void) {
   else
     fatal(0, "unknown request method %s", p);
   for(k = cgi_args; k; k = k->next)
   else
     fatal(0, "unknown request method %s", p);
   for(k = cgi_args; k; k = k->next)

-    if(!validutf8(k->name)
-       || !validutf8(k->value))
+    if(!utf8_valid(k->name, strlen(k->name))
+       || !utf8_valid(k->value, strlen(k->value)))

       fatal(0, "invalid UTF-8 sequence in cgi argument");
 }
 
       fatal(0, "invalid UTF-8 sequence in cgi argument");
 }