Merge branch 'js/checkout-untracked-symlink'

diff --git a/url.c b/url.c
index cd32b927a4caaa141a56e415ac42c7a52d40e8ee..3e06fd34c46a00b41f4843ea87a151314ce0789c 100644 (file)
--- a/url.c
+++ b/url.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "url.h"
 
 int is_urlschemechar(int first_flag, int ch)
 {
@@ -67,12 +68,11 @@ 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, int decode_plus)
 {
        const char *q = *query;
-       struct strbuf out;
 
-       strbuf_init(&out, 16);
        do {
                unsigned char c = *q;
 
@@ -86,33 +86,57 @@ 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, ' ');
+               if (decode_plus && c == '+')
+                       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 *colon = strchr(url, ':');
+
+       /* Skip protocol part if present */
+       if (colon && url < colon) {
+               strbuf_add(&out, url, colon - url);
+               url = colon;
+       }
+       return url_decode_internal(&url, NULL, &out, 0);
 }
 
 char *url_decode_parameter_name(const char **query)
 {
-       return url_decode_internal(query, "&=");
+       struct strbuf out = STRBUF_INIT;
+       return url_decode_internal(query, "&=", &out, 1);
 }
 
 char *url_decode_parameter_value(const char **query)
 {
-       return url_decode_internal(query, "&");
+       struct strbuf out = STRBUF_INIT;
+       return url_decode_internal(query, "&", &out, 1);
+}
+
+void end_url_with_slash(struct strbuf *buf, const char *url)
+{
+       strbuf_addstr(buf, url);
+       if (buf->len && buf->buf[buf->len - 1] != '/')
+               strbuf_addstr(buf, "/");
+}
+
+void str_end_url_with_slash(const char *url, char **dest) {
+       struct strbuf buf = STRBUF_INIT;
+       end_url_with_slash(&buf, url);
+       free(*dest);
+       *dest = strbuf_detach(&buf, NULL);
 }