undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

url.c: simplify is_url()

Browse Source 
The function was implemented in an overly complicated way.
Rewrite it to check from left to right in a single pass.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2011-10-03 10:56:42 -07:00
parent 7ed863a85a
commit b33a1b9fe7
1 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
url.c
View File

@ -17,35 +17,15 @@ int is_urlschemechar(int first_flag, int ch)
int is_url(const char *url) int is_url(const char *url)
{ {
const char *url2, *first_slash; /* Is "scheme" part reasonable? */
if (!url || !is_urlschemechar(1, *url++))
if (!url)
return 0; return 0;
url2 = url; while (*url && *url != ':') {
first_slash = strchr(url, '/'); if (!is_urlschemechar(0, *url++))
/* Input with no slash at all or slash first can't be URL. */
if (!first_slash || first_slash == url)
return 0; return 0;
/* Character before must be : and next must be /. */
if (first_slash[-1] != ':' || first_slash[1] != '/')
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))
return 0;
url2++;
} }
/* We've seen "scheme"; we want colon-slash-slash */
/* Valid enough. */ return (url[0] == ':' && url[1] == '/' && url[2] == '/');
return 1;
} }
static int url_decode_char(const char *q) static int url_decode_char(const char *q)