updated with utils.c

Author: liquidaty

jsonwriter.c

@@ -1,5 +1,10 @@
+#include <stdio.h>
+#include <string.h>
 #include <jsonwriter.h>
-#include <scan.h>
+
+#ifdef INCLUDE_UTILS
+#include "utils.c"
+#endif
 
 #define JSONWRITER_MAX_NESTING 256
 struct jsonwriter_data {
@@ -198,4 +203,3 @@ int jsonwriter_start_object(jsonwriter_handle h) {
 int jsonwriter_start_array(jsonwriter_handle h) {
   return jsonwriter_go_deeper((struct jsonwriter_data *)h, '[', ']');
 }
-

utils.c

@@ -0,0 +1,110 @@
+void str2hex(char *to, const unsigned char *p, size_t len) {
+  static const char *hex = "0123456789abcdef";
+
+  for (; len--; p++) {
+    *to++ = hex[p[0] >> 4];
+    *to++ = hex[p[0] & 0x0f];
+  }
+}
+
+static char UTF8_charLenC(int firstChar) { /* return 0 on eof, -1 on error, > 0 if char read) */
+  char len;
+  if(firstChar == EOF) len = 0;
+  else if(!(firstChar & 128)) len = 1;
+  else if((firstChar & 224) == 192) len = 2; /* 110xxxxx */
+  else if((firstChar & 240) == 224) len = 3; /* 1110xxxx */
+  else if((firstChar & 248) == 240) len = 4; /* 11110xxx */
+  else if((firstChar & 252) == 248) len = 5; /* 111110xx */
+  else if((firstChar & 254) == 252) len = 6; /* 1111110x */
+  else len = -1; /* error */
+  return len;
+}
+
+#define JSON_ESC_CHAR(c) (c == '"' || c == '\\' || c < 32)
+
+static unsigned int json_esc1(const char *s, unsigned int slen,
+                              unsigned int *replacelen,
+                              char replace[], // replace buff should be at least 8 bytes long
+                              const char **new_s,
+                              size_t max_output_size) {
+  unsigned char c;
+  char c_len;
+  const char *orig_s = s;
+
+  if(!max_output_size) {
+    *new_s = s + slen;
+    *replacelen = 0;
+    return 0;
+  }
+
+  while(slen && (c = (unsigned char)*s) && (size_t)(s - orig_s) < max_output_size) {
+    c_len = UTF8_charLenC(*s);
+
+    if(c_len > 0 && ((unsigned char)c_len > slen || (size_t)((s - orig_s) + c_len) > max_output_size))
+      break; // roll back and return
+
+    if(c_len > 1) {
+      s += c_len;
+      slen -= c_len;
+      continue;
+    } else if(c_len < 0) { // bad utf8
+      *replacelen = 0;
+      *new_s = s + 1;
+      return (unsigned int)(s - orig_s);
+    } else if(JSON_ESC_CHAR(c)) {
+      char hex = 0;
+      switch(c) {
+      case '"':
+	replace[1] = '"';
+	break;
+      case '\\':
+	replace[1] = '\\';
+	break;
+      case '\b':
+	replace[1] = 'b';
+	break;
+      case '\f':
+	replace[1] = 'f';
+	break;
+      case '\n':
+	replace[1] = 'n';
+	break;
+      case '\r':
+	replace[1] = 'r';
+	break;
+      case '\t':
+	replace[1] = 't';
+	break;
+      default:
+	hex=1;
+      }
+
+      replace[0] = '\\';
+      if(hex) {
+	// unicode-hex: but 2/3 are not always zeroes...
+	replace[1] = 'u';
+	replace[2] = '0';
+	replace[3] = '0';
+	str2hex(replace+4, &c, 1);
+	*replacelen = 6;
+	replace[6] = '\0';
+      } else {
+	*replacelen = 2;
+	replace[2] = '\0';
+      }
+
+      if((size_t)((s - orig_s) + *replacelen) > max_output_size) {
+        *replacelen = 0; // roll back and return
+        break;
+      }
+
+      *new_s = s+1;
+      return (unsigned int)(s - orig_s);
+    }
+    s++, slen--;
+  }
+
+  *replacelen = 0;
+  *new_s = s;
+  return (unsigned int)(s - orig_s);
+}