Skip to content
Snippets Groups Projects
Commit aec9d5a3 authored by rswindell's avatar rswindell
Browse files

Using uchar* for proper ex-ASCII conversion. 

html_encode() no longer encodes space chars.
parent ef035b44
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 6 additions and 6 deletions
src/sbbs3/js_global.c
+ 6
− 6
View file @ aec9d5a3
...@@ -574,8 +574,8 @@ js_html_encode(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rva ...@@ -574,8 +574,8 @@ js_html_encode(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rva
{ {
int ch; int ch;
ulong i,j; ulong i,j;
char* inbuf; uchar* inbuf;
char* outbuf; uchar* outbuf;
JSBool exascii=JS_FALSE; JSBool exascii=JS_FALSE;
JSString* js_str; JSString* js_str;
...@@ -617,7 +617,7 @@ js_html_encode(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rva ...@@ -617,7 +617,7 @@ js_html_encode(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rva
j+=sprintf(outbuf+j,"§"); j+=sprintf(outbuf+j,"§");
break; break;
default: default:
if(inbuf[i]>' ' && inbuf[i]<DEL) if(inbuf[i]>=' ' && inbuf[i]<DEL)
outbuf[j++]=inbuf[i]; outbuf[j++]=inbuf[i];
else if(exascii && inbuf[i]&0x80) { else if(exascii && inbuf[i]&0x80) {
ch=inbuf[i]^0x80; ch=inbuf[i]^0x80;
...@@ -626,7 +626,7 @@ js_html_encode(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rva ...@@ -626,7 +626,7 @@ js_html_encode(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rva
else else
j+=sprintf(outbuf+j,"&#%u;",exasctbl[ch].value); j+=sprintf(outbuf+j,"&#%u;",exasctbl[ch].value);
} }
else if((uchar)inbuf[i]>=' ') /* strip unknown control chars */ else if(inbuf[i]>' ') /* strip unknown control chars */
j+=sprintf(outbuf+j,"&#%u;",inbuf[i]); j+=sprintf(outbuf+j,"&#%u;",inbuf[i]);
break; break;
} }
...@@ -648,8 +648,8 @@ js_html_decode(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rva ...@@ -648,8 +648,8 @@ js_html_decode(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rva
int ch; int ch;
int val; int val;
ulong i,j; ulong i,j;
char* inbuf; uchar* inbuf;
char* outbuf; uchar* outbuf;
char token[16]; char token[16];
size_t t; size_t t;
JSString* js_str; JSString* js_str;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment