xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

webfs: fix url escaping so it works with torrent

Browse source
This commit is contained in:
cinap_lenrek 2011-10-24 17:12:16 +02:00
parent c50bef06dd
commit f6db05a457
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
sys/src/cmd/webfs/url.c
View file

@ -711,9 +711,9 @@ postparse_http(Url *u)
u->http.page_spec = estrdup("/"); u->http.page_spec = estrdup("/");
return 0; return 0;
} }
p = escapeurl(u->path, " \"<>#%\\"); p = escapeurl(u->path, "/");
if(u->query){ if(u->query){
q = escapeurl(u->query, " \"<>#%\\"); q = escapeurl(u->query, "&=");
u->http.page_spec = emalloc(strlen(p)+1+strlen(q)+1); u->http.page_spec = emalloc(strlen(p)+1+strlen(q)+1);
strcpy(u->http.page_spec, p); strcpy(u->http.page_spec, p);
strcat(u->http.page_spec, "?"); strcat(u->http.page_spec, "?");
@ -985,25 +985,22 @@ dhex(char c)
char* char*
escapeurl(char *s, char *special) escapeurl(char *s, char *special)
{ {
int n;
char *t, *u;
static char *hex = "0123456789abcdef"; static char *hex = "0123456789abcdef";
char *t, *u;
n = 0; t = u = emalloc(strlen(s)*3+1);
for(t=s; *t; t++)
if(*t <= 0x1F || *t >= 0x7F || strchr(special, *t))
n++;
u = emalloc(strlen(s)+2*n+1);
t = u;
for(; *s; s++){ for(; *s; s++){
if(s[0] == '%' && isxdigit(s[1]) && isxdigit(s[2])) if((s[0] == '%' && isxdigit(s[1]) && isxdigit(s[2])) ||
(*s >= '0' && *s <= '9') ||
(*s >= 'a' && *s <= 'z') ||
(*s >= 'A' && *s <= 'Z') ||
strchr(".-_~", *s) || strchr(special, *s))
*u++ = *s; *u++ = *s;
else if(*s <= 0x1F || *s >= 0x7F || strchr(special, *s)){ else {
*u++ = '%'; *u++ = '%';
*u++ = hex[(*s>>4)&0xF]; *u++ = hex[(*s>>4)&0xF];
*u++ = hex[*s&0xF]; *u++ = hex[*s&0xF];
}else }
*u++ = *s;
} }
*u = '\0'; *u = '\0';
return t; return t;
@ -1012,7 +1009,8 @@ escapeurl(char *s, char *special)
char* char*
unescapeurl(char *s, char *special) unescapeurl(char *s, char *special)
{ {
char *r, *w, x; char *r, *w;
Rune x;
s = estrdup(s); s = estrdup(s);
for(r=w=s; x = *r; r++){ for(r=w=s; x = *r; r++){