mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/url-decode'

Browse Source 
* jk/url-decode:
  url.c: "<scheme>://" part at the beginning should not be URL decoded
This commit is contained in:
Junio C Hamano
2010-06-23 10:43:28 -07:00
parent 6f426c74a4 ce83eda155
commit ba4d01bd74
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
url.c
View File

@ -67,12 +67,10 @@ static int url_decode_char(const char *q)
return val; return val;
} }
static char *url_decode_internal(const char **query, const char *stop_at) static char *url_decode_internal(const char **query, const char *stop_at, struct strbuf *out)
{ {
const char *q = *query; const char *q = *query;
struct strbuf out;
strbuf_init(&out, 16);
do { do {
unsigned char c = *q; unsigned char c = *q;
@ -86,33 +84,43 @@ static char *url_decode_internal(const char **query, const char *stop_at)
if (c == '%') { if (c == '%') {
int val = url_decode_char(q + 1); int val = url_decode_char(q + 1);
if (0 <= val) { if (0 <= val) {
strbuf_addch(&out, val); strbuf_addch(out, val);
q += 3; q += 3;
continue; continue;
} }
} }
if (c == '+') if (c == '+')
strbuf_addch(&out, ' '); strbuf_addch(out, ' ');
else else
strbuf_addch(&out, c); strbuf_addch(out, c);
q++; q++;
} while (1); } while (1);
*query = q; *query = q;
return strbuf_detach(&out, NULL); return strbuf_detach(out, NULL);
} }
char *url_decode(const char *url) char *url_decode(const char *url)
{ {
return url_decode_internal(&url, NULL); struct strbuf out = STRBUF_INIT;
const char *slash = strchr(url, '/');
/* Skip protocol part if present */
if (slash && url < slash) {
strbuf_add(&out, url, slash - url);
url = slash;
}
return url_decode_internal(&url, NULL, &out);
} }
char *url_decode_parameter_name(const char **query) char *url_decode_parameter_name(const char **query)
{ {
return url_decode_internal(query, "&="); struct strbuf out = STRBUF_INIT;
return url_decode_internal(query, "&=", &out);
} }
char *url_decode_parameter_value(const char **query) char *url_decode_parameter_value(const char **query)
{ {
return url_decode_internal(query, "&"); struct strbuf out = STRBUF_INIT;
return url_decode_internal(query, "&", &out);
} }