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

Allow '+', '-' and '.' in remote helper names

Browse Source 
According to relevant RFCs, in addition to alphanumerics, the following
characters are valid in URL scheme parts: '+', '-' and '.', but
currently only alphanumerics are allowed in remote helper names.

Allow those three characters in remote helper names (both 'foo://' and
'foo::' syntax).

Signed-off-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ilari Liusvaara 2010-02-23 14:33:48 +02:00 committed by Junio C Hamano
parent e923eaeb90
commit 53a52ff33d
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
transport.c
View File

@ -872,6 +872,21 @@ static int is_file(const char *url)
return S_ISREG(buf.st_mode); return S_ISREG(buf.st_mode);
} }
static int isurlschemechar(int first_flag, int ch)
{
/*
* The set of valid URL schemes, as per STD66 (RFC3986) is
* '[A-Za-z][A-Za-z0-9+.-]*'. But use sightly looser check
* of '[A-Za-z0-9][A-Za-z0-9+.-]*' because earlier version
* of check used '[A-Za-z0-9]+' so not to break any remote
* helpers.
*/
int alphanumeric, special;
alphanumeric = ch > 0 && isalnum(ch);
special = ch == '+' || ch == '-' || ch == '.';
return alphanumeric || (!first_flag && special);
}
static int is_url(const char *url) static int is_url(const char *url)
{ {
const char *url2, *first_slash; const char *url2, *first_slash;
@ -896,7 +911,7 @@ static int is_url(const char *url)
*/ */
url2 = url; url2 = url;
while (url2 < first_slash - 1) { while (url2 < first_slash - 1) {
if (!isalnum((unsigned char)*url2)) if (!isurlschemechar(url2 == url, (unsigned char)*url2))
return 0; return 0;
url2++; url2++;
} }
@ -929,7 +944,7 @@ struct transport *transport_get(struct remote *remote, const char *url)
if (url) { if (url) {
const char *p = url; const char *p = url;
while (isalnum(*p)) while (isurlschemechar(p == url, *p))
p++; p++;
if (!prefixcmp(p, "::")) if (!prefixcmp(p, "::"))
helper = xstrndup(url, p - url); helper = xstrndup(url, p - url);