version --build-options: report commit, too, if possible

diff --git a/url.c b/url.c
index 389d9dab10e72b8fd94e38828fcf999e78494bdc..eaf4f07081eae122fbc38e05f60ee2f11a0c65a6 100644 (file)
--- a/url.c
+++ b/url.c
@@ -18,54 +18,15 @@ int is_urlschemechar(int first_flag, int ch)
 
 int is_url(const char *url)
 {
-       const char *url2, *first_slash;
-
-       if (!url)
-               return 0;
-       url2 = url;
-       first_slash = strchr(url, '/');
-
-       /* Input with no slash at all or slash first can't be URL. */
-       if (!first_slash || first_slash == url)
-               return 0;
-       /* Character before must be : and next must be /. */
-       if (first_slash[-1] != ':' || first_slash[1] != '/')
+       /* Is "scheme" part reasonable? */
+       if (!url || !is_urlschemechar(1, *url++))
                return 0;
-       /* There must be something before the :// */
-       if (first_slash == url + 1)
-               return 0;
-       /*
-        * Check all characters up to first slash - 1. Only alphanum
-        * is allowed.
-        */
-       url2 = url;
-       while (url2 < first_slash - 1) {
-               if (!is_urlschemechar(url2 == url, (unsigned char)*url2))
+       while (*url && *url != ':') {
+               if (!is_urlschemechar(0, *url++))
                        return 0;
-               url2++;
-       }
-
-       /* Valid enough. */
-       return 1;
-}
-
-static int url_decode_char(const char *q)
-{
-       int i;
-       unsigned char val = 0;
-       for (i = 0; i < 2; i++) {
-               unsigned char c = *q++;
-               val <<= 4;
-               if (c >= '0' && c <= '9')
-                       val += c - '0';
-               else if (c >= 'a' && c <= 'f')
-                       val += c - 'a' + 10;
-               else if (c >= 'A' && c <= 'F')
-                       val += c - 'A' + 10;
-               else
-                       return -1;
        }
-       return val;
+       /* We've seen "scheme"; we want colon-slash-slash */
+       return (url[0] == ':' && url[1] == '/' && url[2] == '/');
 }
 
 static char *url_decode_internal(const char **query, int len,
@@ -86,7 +47,7 @@ static char *url_decode_internal(const char **query, int len,
                }
 
                if (c == '%') {
-                       int val = url_decode_char(q + 1);
+                       int val = hex2chr(q + 1);
                        if (0 <= val) {
                                strbuf_addch(out, val);
                                q += 3;
@@ -140,8 +101,7 @@ char *url_decode_parameter_value(const char **query)
 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, "/");
+       strbuf_complete(buf, '/');
 }
 
 void str_end_url_with_slash(const char *url, char **dest) {