Fix escaping of paths with spaces

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
Jonathon Mah 2011-04-10 04:10:03 -07:00 committed by Lars Hjemli
parent facca560d9
commit 74152744f0

10
html.c
View File

@ -18,7 +18,7 @@ static const char* url_escape_table[256] = {
"%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07", "%08", "%09", "%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07", "%08", "%09",
"%0a", "%0b", "%0c", "%0d", "%0e", "%0f", "%10", "%11", "%12", "%13", "%0a", "%0b", "%0c", "%0d", "%0e", "%0f", "%10", "%11", "%12", "%13",
"%14", "%15", "%16", "%17", "%18", "%19", "%1a", "%1b", "%1c", "%1d", "%14", "%15", "%16", "%17", "%18", "%19", "%1a", "%1b", "%1c", "%1d",
"%1e", "%1f", "+", 0, "%22", "%23", 0, "%25", "%26", "%27", 0, 0, 0, "%1e", "%1f", "%20", 0, "%22", "%23", 0, "%25", "%26", "%27", 0, 0, 0,
"%2b", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "%3c", "%3d", "%2b", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "%3c", "%3d",
"%3e", "%3f", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "%3e", "%3f", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, "%5c", 0, "%5e", 0, "%60", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "%5c", 0, "%5e", 0, "%60", 0, 0, 0, 0, 0,
@ -162,9 +162,9 @@ void html_url_path(const char *txt)
while(t && *t){ while(t && *t){
int c = *t; int c = *t;
const char *e = url_escape_table[c]; const char *e = url_escape_table[c];
if (e && c!='+' && c!='&' && c!='+') { if (e && c!='+' && c!='&') {
html_raw(txt, t - txt); html_raw(txt, t - txt);
html_raw(e, 3); html(e);
txt = t+1; txt = t+1;
} }
t++; t++;
@ -179,9 +179,11 @@ void html_url_arg(const char *txt)
while(t && *t){ while(t && *t){
int c = *t; int c = *t;
const char *e = url_escape_table[c]; const char *e = url_escape_table[c];
if (c == ' ')
e = "+";
if (e) { if (e) {
html_raw(txt, t - txt); html_raw(txt, t - txt);
html_raw(e, strlen(e)); html(e);
txt = t+1; txt = t+1;
} }
t++; t++;