From: Junio C Hamano Date: Wed, 23 Jun 2010 17:27:39 +0000 (-0700) Subject: url.c: "://" part at the beginning should not be URL decoded X-Git-Tag: v1.7.2-rc0~8^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ce83eda15554ffd859ecc9f4c427303d460dab60;p=git.git url.c: "://" part at the beginning should not be URL decoded When using the protocol git+ssh:// for example we do not want to decode the '+' as a space. The url decoding must take place only for the server name and parameters. This fixes a regression introduced in 9d2e942. Initial-fix-by: Pascal Obry Acked-by: Jeff King Signed-off-by: Junio C Hamano --- diff --git a/url.c b/url.c index cd32b927a..bf5bb9c88 100644 --- a/url.c +++ b/url.c @@ -67,12 +67,10 @@ static int url_decode_char(const char *q) 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; - struct strbuf out; - strbuf_init(&out, 16); do { unsigned char c = *q; @@ -86,33 +84,43 @@ static char *url_decode_internal(const char **query, const char *stop_at) if (c == '%') { int val = url_decode_char(q + 1); if (0 <= val) { - strbuf_addch(&out, val); + strbuf_addch(out, val); q += 3; continue; } } if (c == '+') - strbuf_addch(&out, ' '); + strbuf_addch(out, ' '); else - strbuf_addch(&out, c); + strbuf_addch(out, c); q++; } while (1); *query = q; - return strbuf_detach(&out, NULL); + return strbuf_detach(out, NULL); } 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) { - return url_decode_internal(query, "&="); + struct strbuf out = STRBUF_INIT; + return url_decode_internal(query, "&=", &out); } char *url_decode_parameter_value(const char **query) { - return url_decode_internal(query, "&"); + struct strbuf out = STRBUF_INIT; + return url_decode_internal(query, "&", &out); }