[PATCH] http: use strbuf API in quote_ref_url
From: Tay Ray Chuan <hidden>
Date: 2016-06-15 22:46:21
Subsystem:
the rest · Maintainer:
Linus Torvalds
In addition, ''quote_ref_url'' inserts a slash between the base URL and remote ref path only if needed. Previously, this insertion wasn't contingent on the lack of a separating slash. Signed-off-by: Tay Ray Chuan <redacted> Acked-by: Johannes Schindelin <redacted> --- http.c | 29 ++++++++++------------------- 1 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/http.c b/http.c
index cdedeb6..9de4130 100644
--- a/http.c
+++ b/http.c@@ -577,31 +577,22 @@ static inline int hex(int v) static char *quote_ref_url(const char *base, const char *ref) { + struct strbuf buf = STRBUF_INIT; const char *cp; - char *dp, *qref; - int len, baselen, ch; + int ch; + + strbuf_addstr(&buf, base); + if (strcmp(base+strlen(base)-1, "/") && strcmp(ref, "/")) + strbuf_addstr(&buf, "/"); - baselen = strlen(base); - len = baselen + 2; /* '/' after base and terminating NUL */ - for (cp = ref; (ch = *cp) != 0; cp++, len++) - if (needs_quote(ch)) - len += 2; /* extra two hex plus replacement % */ - qref = xmalloc(len); - memcpy(qref, base, baselen); - dp = qref + baselen; - *(dp++) = '/'; for (cp = ref; (ch = *cp) != 0; cp++) { - if (needs_quote(ch)) { - *dp++ = '%'; - *dp++ = hex((ch >> 4) & 0xF); - *dp++ = hex(ch & 0xF); - } + if (needs_quote(ch)) + strbuf_addf(&buf, "%%%02x", ch); else - *dp++ = ch; + strbuf_addch(&buf, *cp); } - *dp = 0; - return qref; + return strbuf_detach(&buf, NULL); } int http_fetch_ref(const char *base, struct ref *ref)
--
1.6.2.rc1