From 4caa8ade915e91da526320d5bde2440333fc8eb7 Mon Sep 17 00:00:00 2001
From: Adam Chlipala <adam@chlipala.net>
Date: Tue, 10 Aug 2010 16:02:55 -0400
Subject: Fix C-side jsification of UTF-8 strings

---
 src/c/urweb.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/c/urweb.c b/src/c/urweb.c
index 0a41c474..74e1b12e 100644
--- a/src/c/urweb.c
+++ b/src/c/urweb.c
@@ -1336,7 +1336,7 @@ uw_Basis_string uw_Basis_jsifyString(uw_context ctx, uw_Basis_string s) {
   *s2++ = '"';
 
   for (; *s; s++) {
-    char c = *s;
+    unsigned char c = *s;
 
     switch (c) {
     case '"':
@@ -1352,7 +1352,7 @@ uw_Basis_string uw_Basis_jsifyString(uw_context ctx, uw_Basis_string s) {
       s2 += 2;
       break;
     default:
-      if (isprint((int)c))
+      if (isprint((int)c) || c >= 128)
         *s2++ = c;
       else {
         sprintf(s2, "\\%3o", c);
@@ -1366,7 +1366,8 @@ uw_Basis_string uw_Basis_jsifyString(uw_context ctx, uw_Basis_string s) {
   return r;
 }
 
-uw_Basis_string uw_Basis_jsifyChar(uw_context ctx, uw_Basis_char c) {
+uw_Basis_string uw_Basis_jsifyChar(uw_context ctx, uw_Basis_char c1) {
+  unsigned char c = c1;
   char *r, *s2;
 
   uw_check_heap(ctx, 6);
@@ -1388,10 +1389,10 @@ uw_Basis_string uw_Basis_jsifyChar(uw_context ctx, uw_Basis_char c) {
     s2 += 2;
     break;
   default:
-    if (isprint((int)c))
+    if (isprint((int)c) || c >= 128)
       *s2++ = c;
     else {
-      sprintf(s2, "\\%3o", c);
+      sprintf(s2, "\\%3o", (unsigned char)c);
       s2 += 4;
     }
   }
@@ -1410,7 +1411,7 @@ uw_Basis_string uw_Basis_jsifyString_ws(uw_context ctx, uw_Basis_string s) {
   *s2++ = '"';
 
   for (; *s; s++) {
-    char c = *s;
+    unsigned char c = *s;
 
     switch (c) {
     case '\'':
@@ -1422,7 +1423,7 @@ uw_Basis_string uw_Basis_jsifyString_ws(uw_context ctx, uw_Basis_string s) {
       s2 += 2;
       break;
     default:
-      if (isprint((int)c))
+      if (isprint((int)c) || c >= 128)
         *s2++ = c;
       else {
         sprintf(s2, "\\%3o", c);
-- 
cgit v1.2.3