Merge branches 'sp/maint-fetch-pack-stop-early' and 'sp/maint-upload-pack-stop-early'

diff --git a/url.c b/url.c
index cd8f74f00c345294f94cb25e4e00849a0618168b..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)
 {
@@ -125,3 +126,17 @@ char *url_decode_parameter_value(const char **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);
+}