Fix warnings from 'make check'. - These files don't include 'builtin.h' causing sparse to complain that cmd_* isn't declared: builtin/clone.c:364, builtin/fetch-pack.c:797, builtin/fmt-merge-msg.c:34, builtin/hash-object.c:78, builtin/merge-index.c:69, builtin/merge-recursive.c:22 builtin/merge-tree.c:341, builtin/mktag.c:156, builtin/notes.c:426 builtin/notes.c:822, builtin/pack-redundant.c:596, builtin/pack-refs.c:10, builtin/patch-id.c:60, builtin/patch-id.c:149, builtin/remote.c:1512, builtin/remote-ext.c:240, builtin/remote-fd.c:53, builtin/reset.c:236, builtin/send-pack.c:384, builtin/unpack-file.c:25, builtin/var.c:75 - These files have symbols which should be marked static since they're only file scope: submodule.c:12, diff.c:631, replace_object.c:92, submodule.c:13, submodule.c:14, trace.c:78, transport.c:195, transport-helper.c:79, unpack-trees.c:19, url.c:3, url.c:18, url.c:104, url.c:117, url.c:123, url.c:129, url.c:136, thread-utils.c:21, thread-utils.c:48 - These files redeclare symbols to be different types: builtin/index-pack.c:210, parse-options.c:564, parse-options.c:571, usage.c:49, usage.c:58, usage.c:63, usage.c:72 - These files use a literal integer 0 when they really should use a NULL pointer: daemon.c:663, fast-import.c:2942, imap-send.c:1072, notes-merge.c:362 While we're in the area, clean up some unused #includes in builtin files (mostly exec_cmd.h). Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
			
				
	
	
		
			143 lines
		
	
	
		
			3.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			143 lines
		
	
	
		
			3.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
#include "cache.h"
 | 
						|
#include "url.h"
 | 
						|
 | 
						|
int is_urlschemechar(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);
 | 
						|
}
 | 
						|
 | 
						|
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] != '/')
 | 
						|
		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++;
 | 
						|
	}
 | 
						|
 | 
						|
	/* 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;
 | 
						|
}
 | 
						|
 | 
						|
static char *url_decode_internal(const char **query, const char *stop_at,
 | 
						|
				 struct strbuf *out, int decode_plus)
 | 
						|
{
 | 
						|
	const char *q = *query;
 | 
						|
 | 
						|
	do {
 | 
						|
		unsigned char c = *q;
 | 
						|
 | 
						|
		if (!c)
 | 
						|
			break;
 | 
						|
		if (stop_at && strchr(stop_at, c)) {
 | 
						|
			q++;
 | 
						|
			break;
 | 
						|
		}
 | 
						|
 | 
						|
		if (c == '%') {
 | 
						|
			int val = url_decode_char(q + 1);
 | 
						|
			if (0 <= val) {
 | 
						|
				strbuf_addch(out, val);
 | 
						|
				q += 3;
 | 
						|
				continue;
 | 
						|
			}
 | 
						|
		}
 | 
						|
 | 
						|
		if (decode_plus && c == '+')
 | 
						|
			strbuf_addch(out, ' ');
 | 
						|
		else
 | 
						|
			strbuf_addch(out, c);
 | 
						|
		q++;
 | 
						|
	} while (1);
 | 
						|
	*query = q;
 | 
						|
	return strbuf_detach(out, NULL);
 | 
						|
}
 | 
						|
 | 
						|
char *url_decode(const char *url)
 | 
						|
{
 | 
						|
	struct strbuf out = STRBUF_INIT;
 | 
						|
	const char *colon = strchr(url, ':');
 | 
						|
 | 
						|
	/* Skip protocol part if present */
 | 
						|
	if (colon && url < colon) {
 | 
						|
		strbuf_add(&out, url, colon - url);
 | 
						|
		url = colon;
 | 
						|
	}
 | 
						|
	return url_decode_internal(&url, NULL, &out, 0);
 | 
						|
}
 | 
						|
 | 
						|
char *url_decode_parameter_name(const char **query)
 | 
						|
{
 | 
						|
	struct strbuf out = STRBUF_INIT;
 | 
						|
	return url_decode_internal(query, "&=", &out, 1);
 | 
						|
}
 | 
						|
 | 
						|
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);
 | 
						|
}
 |