From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Mar 2014 21:00:15 +0000 (-0700)
Subject: Merge branch 'jk/config-path-include-fix' into maint
X-Git-Tag: v1.9.1~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6f0166771aadeb069b8952255414d67b643db1bf?hp=-c

Merge branch 'jk/config-path-include-fix' into maint

include.path variable (or any variable that expects a path that can
use ~username expansion) in the configuration file is not a boolean,
but the code failed to check it.

* jk/config-path-include-fix:
handle_path_include: don't look at NULL value
expand_user_path: do not look at NULL path
---

6f0166771aadeb069b8952255414d67b643db1bf
diff --combined config.c
index d969a5aefc,47ce8d8b8e..314d8ee740
--- a/config.c
+++ b/config.c
@@@ -10,69 -10,22 +10,69 @@@
  #include "strbuf.h"
  #include "quote.h"
  
 -#define MAXNAME (256)
 -
 -typedef struct config_file {
 -	struct config_file *prev;
 -	FILE *f;
 +struct config_source {
 +	struct config_source *prev;
 +	union {
 +		FILE *file;
 +		struct config_buf {
 +			const char *buf;
 +			size_t len;
 +			size_t pos;
 +		} buf;
 +	} u;
  	const char *name;
 +	int die_on_error;
  	int linenr;
  	int eof;
  	struct strbuf value;
 -	char var[MAXNAME];
 -} config_file;
 +	struct strbuf var;
 +
 +	int (*do_fgetc)(struct config_source *c);
 +	int (*do_ungetc)(int c, struct config_source *conf);
 +	long (*do_ftell)(struct config_source *c);
 +};
  
 -static config_file *cf;
 +static struct config_source *cf;
  
  static int zlib_compression_seen;
  
 +static int config_file_fgetc(struct config_source *conf)
 +{
 +	return fgetc(conf->u.file);
 +}
 +
 +static int config_file_ungetc(int c, struct config_source *conf)
 +{
 +	return ungetc(c, conf->u.file);
 +}
 +
 +static long config_file_ftell(struct config_source *conf)
 +{
 +	return ftell(conf->u.file);
 +}
 +
 +
 +static int config_buf_fgetc(struct config_source *conf)
 +{
 +	if (conf->u.buf.pos < conf->u.buf.len)
 +		return conf->u.buf.buf[conf->u.buf.pos++];
 +
 +	return EOF;
 +}
 +
 +static int config_buf_ungetc(int c, struct config_source *conf)
 +{
 +	if (conf->u.buf.pos > 0)
 +		return conf->u.buf.buf[--conf->u.buf.pos];
 +
 +	return EOF;
 +}
 +
 +static long config_buf_ftell(struct config_source *conf)
 +{
 +	return conf->u.buf.pos;
 +}
 +
  #define MAX_INCLUDE_DEPTH 10
  static const char include_depth_advice[] =
  "exceeded maximum include depth (%d) while including\n"
@@@ -84,8 -37,12 +84,12 @@@ static int handle_path_include(const ch
  {
  	int ret = 0;
  	struct strbuf buf = STRBUF_INIT;
- 	char *expanded = expand_user_path(path);
+ 	char *expanded;
  
+ 	if (!path)
+ 		return config_error_nonbool("include.path");
+ 
+ 	expanded = expand_user_path(path);
  	if (!expanded)
  		return error("Could not expand include path '%s'", path);
  	path = expanded;
@@@ -107,7 -64,7 +111,7 @@@
  		path = buf.buf;
  	}
  
 -	if (!access(path, R_OK)) {
 +	if (!access_or_die(path, R_OK, 0)) {
  		if (++inc->depth > MAX_INCLUDE_DEPTH)
  			die(include_depth_advice, MAX_INCLUDE_DEPTH, path,
  			    cf && cf->name ? cf->name : "the command line");
@@@ -217,22 -174,27 +221,22 @@@ int git_config_from_parameters(config_f
  
  static int get_next_char(void)
  {
 -	int c;
 -	FILE *f;
 -
 -	c = '\n';
 -	if (cf && ((f = cf->f) != NULL)) {
 -		c = fgetc(f);
 -		if (c == '\r') {
 -			/* DOS like systems */
 -			c = fgetc(f);
 -			if (c != '\n') {
 -				ungetc(c, f);
 -				c = '\r';
 -			}
 -		}
 -		if (c == '\n')
 -			cf->linenr++;
 -		if (c == EOF) {
 -			cf->eof = 1;
 -			c = '\n';
 +	int c = cf->do_fgetc(cf);
 +
 +	if (c == '\r') {
 +		/* DOS like systems */
 +		c = cf->do_fgetc(cf);
 +		if (c != '\n') {
 +			cf->do_ungetc(c, cf);
 +			c = '\r';
  		}
  	}
 +	if (c == '\n')
 +		cf->linenr++;
 +	if (c == EOF) {
 +		cf->eof = 1;
 +		c = '\n';
 +	}
  	return c;
  }
  
@@@ -302,7 -264,7 +306,7 @@@ static inline int iskeychar(int c
  	return isalnum(c) || c == '-';
  }
  
 -static int get_value(config_fn_t fn, void *data, char *name, unsigned int len)
 +static int get_value(config_fn_t fn, void *data, struct strbuf *name)
  {
  	int c;
  	char *value;
@@@ -314,9 -276,11 +318,9 @@@
  			break;
  		if (!iskeychar(c))
  			break;
 -		name[len++] = tolower(c);
 -		if (len >= MAXNAME)
 -			return -1;
 +		strbuf_addch(name, tolower(c));
  	}
 -	name[len] = 0;
 +
  	while (c == ' ' || c == '\t')
  		c = get_next_char();
  
@@@ -328,10 -292,10 +332,10 @@@
  		if (!value)
  			return -1;
  	}
 -	return fn(name, value, data);
 +	return fn(name->buf, value, data);
  }
  
 -static int get_extended_base_var(char *name, int baselen, int c)
 +static int get_extended_base_var(struct strbuf *name, int c)
  {
  	do {
  		if (c == '\n')
@@@ -342,7 -306,7 +346,7 @@@
  	/* We require the format to be '[base "extension"]' */
  	if (c != '"')
  		return -1;
 -	name[baselen++] = '.';
 +	strbuf_addch(name, '.');
  
  	for (;;) {
  		int c = get_next_char();
@@@ -355,39 -319,45 +359,39 @@@
  			if (c == '\n')
  				goto error_incomplete_line;
  		}
 -		name[baselen++] = c;
 -		if (baselen > MAXNAME / 2)
 -			return -1;
 +		strbuf_addch(name, c);
  	}
  
  	/* Final ']' */
  	if (get_next_char() != ']')
  		return -1;
 -	return baselen;
 +	return 0;
  error_incomplete_line:
  	cf->linenr--;
  	return -1;
  }
  
 -static int get_base_var(char *name)
 +static int get_base_var(struct strbuf *name)
  {
 -	int baselen = 0;
 -
  	for (;;) {
  		int c = get_next_char();
  		if (cf->eof)
  			return -1;
  		if (c == ']')
 -			return baselen;
 +			return 0;
  		if (isspace(c))
 -			return get_extended_base_var(name, baselen, c);
 +			return get_extended_base_var(name, c);
  		if (!iskeychar(c) && c != '.')
  			return -1;
 -		if (baselen > MAXNAME / 2)
 -			return -1;
 -		name[baselen++] = tolower(c);
 +		strbuf_addch(name, tolower(c));
  	}
  }
  
 -static int git_parse_file(config_fn_t fn, void *data)
 +static int git_parse_source(config_fn_t fn, void *data)
  {
  	int comment = 0;
  	int baselen = 0;
 -	char *var = cf->var;
 +	struct strbuf *var = &cf->var;
  
  	/* U+FEFF Byte Order Mark in UTF8 */
  	static const unsigned char *utf8_bom = (unsigned char *) "\xef\xbb\xbf";
@@@ -423,30 -393,20 +427,30 @@@
  			continue;
  		}
  		if (c == '[') {
 -			baselen = get_base_var(var);
 -			if (baselen <= 0)
 +			/* Reset prior to determining a new stem */
 +			strbuf_reset(var);
 +			if (get_base_var(var) < 0 || var->len < 1)
  				break;
 -			var[baselen++] = '.';
 -			var[baselen] = 0;
 +			strbuf_addch(var, '.');
 +			baselen = var->len;
  			continue;
  		}
  		if (!isalpha(c))
  			break;
 -		var[baselen] = tolower(c);
 -		if (get_value(fn, data, var, baselen+1) < 0)
 +		/*
 +		 * Truncate the var name back to the section header
 +		 * stem prior to grabbing the suffix part of the name
 +		 * and the value.
 +		 */
 +		strbuf_setlen(var, baselen);
 +		strbuf_addch(var, tolower(c));
 +		if (get_value(fn, data, var) < 0)
  			break;
  	}
 -	die("bad config file line %d in %s", cf->linenr, cf->name);
 +	if (cf->die_on_error)
 +		die("bad config file line %d in %s", cf->linenr, cf->name);
 +	else
 +		return error("bad config file line %d in %s", cf->linenr, cf->name);
  }
  
  static int parse_unit_factor(const char *end, uintmax_t *val)
@@@ -468,7 -428,7 +472,7 @@@
  	return 0;
  }
  
 -static int git_parse_long(const char *value, long *ret)
 +static int git_parse_signed(const char *value, intmax_t *ret, intmax_t max)
  {
  	if (value && *value) {
  		char *end;
@@@ -480,25 -440,21 +484,25 @@@
  		val = strtoimax(value, &end, 0);
  		if (errno == ERANGE)
  			return 0;
 -		if (!parse_unit_factor(end, &factor))
 +		if (!parse_unit_factor(end, &factor)) {
 +			errno = EINVAL;
  			return 0;
 +		}
  		uval = abs(val);
  		uval *= factor;
 -		if ((uval > maximum_signed_value_of_type(long)) ||
 -		    (abs(val) > uval))
 +		if (uval > max || abs(val) > uval) {
 +			errno = ERANGE;
  			return 0;
 +		}
  		val *= factor;
  		*ret = val;
  		return 1;
  	}
 +	errno = EINVAL;
  	return 0;
  }
  
 -int git_parse_ulong(const char *value, unsigned long *ret)
 +static int git_parse_unsigned(const char *value, uintmax_t *ret, uintmax_t max)
  {
  	if (value && *value) {
  		char *end;
@@@ -510,75 -466,29 +514,75 @@@
  		if (errno == ERANGE)
  			return 0;
  		oldval = val;
 -		if (!parse_unit_factor(end, &val))
 +		if (!parse_unit_factor(end, &val)) {
 +			errno = EINVAL;
  			return 0;
 -		if ((val > maximum_unsigned_value_of_type(long)) ||
 -		    (oldval > val))
 +		}
 +		if (val > max || oldval > val) {
 +			errno = ERANGE;
  			return 0;
 +		}
  		*ret = val;
  		return 1;
  	}
 +	errno = EINVAL;
  	return 0;
  }
  
 -static void die_bad_config(const char *name)
 +static int git_parse_int(const char *value, int *ret)
 +{
 +	intmax_t tmp;
 +	if (!git_parse_signed(value, &tmp, maximum_signed_value_of_type(int)))
 +		return 0;
 +	*ret = tmp;
 +	return 1;
 +}
 +
 +static int git_parse_int64(const char *value, int64_t *ret)
 +{
 +	intmax_t tmp;
 +	if (!git_parse_signed(value, &tmp, maximum_signed_value_of_type(int64_t)))
 +		return 0;
 +	*ret = tmp;
 +	return 1;
 +}
 +
 +int git_parse_ulong(const char *value, unsigned long *ret)
 +{
 +	uintmax_t tmp;
 +	if (!git_parse_unsigned(value, &tmp, maximum_unsigned_value_of_type(long)))
 +		return 0;
 +	*ret = tmp;
 +	return 1;
 +}
 +
 +static void die_bad_number(const char *name, const char *value)
  {
 +	const char *reason = errno == ERANGE ?
 +			     "out of range" :
 +			     "invalid unit";
 +	if (!value)
 +		value = "";
 +
  	if (cf && cf->name)
 -		die("bad config value for '%s' in %s", name, cf->name);
 -	die("bad config value for '%s'", name);
 +		die("bad numeric config value '%s' for '%s' in %s: %s",
 +		    value, name, cf->name, reason);
 +	die("bad numeric config value '%s' for '%s': %s", value, name, reason);
  }
  
  int git_config_int(const char *name, const char *value)
  {
 -	long ret = 0;
 -	if (!git_parse_long(value, &ret))
 -		die_bad_config(name);
 +	int ret;
 +	if (!git_parse_int(value, &ret))
 +		die_bad_number(name, value);
 +	return ret;
 +}
 +
 +int64_t git_config_int64(const char *name, const char *value)
 +{
 +	int64_t ret;
 +	if (!git_parse_int64(value, &ret))
 +		die_bad_number(name, value);
  	return ret;
  }
  
@@@ -586,7 -496,7 +590,7 @@@ unsigned long git_config_ulong(const ch
  {
  	unsigned long ret;
  	if (!git_parse_ulong(value, &ret))
 -		die_bad_config(name);
 +		die_bad_number(name, value);
  	return ret;
  }
  
@@@ -609,10 -519,10 +613,10 @@@ static int git_config_maybe_bool_text(c
  
  int git_config_maybe_bool(const char *name, const char *value)
  {
 -	long v = git_config_maybe_bool_text(name, value);
 +	int v = git_config_maybe_bool_text(name, value);
  	if (0 <= v)
  		return v;
 -	if (git_parse_long(value, &v))
 +	if (git_parse_int(value, &v))
  		return !!v;
  	return -1;
  }
@@@ -663,25 -573,6 +667,25 @@@ static int git_default_core_config(cons
  		trust_ctime = git_config_bool(var, value);
  		return 0;
  	}
 +	if (!strcmp(var, "core.statinfo") ||
 +	    !strcmp(var, "core.checkstat")) {
 +		/*
 +		 * NEEDSWORK: statinfo was a typo in v1.8.2 that has
 +		 * never been advertised.  we will remove it at Git
 +		 * 2.0 boundary.
 +		 */
 +		if (!strcmp(var, "core.statinfo")) {
 +			static int warned;
 +			if (!warned++) {
 +				warning("'core.statinfo' will be removed in Git 2.0; "
 +					"use 'core.checkstat' instead.");
 +			}
 +		}
 +		if (!strcasecmp(value, "default"))
 +			check_stat = 1;
 +		else if (!strcasecmp(value, "minimal"))
 +			check_stat = 0;
 +	}
  
  	if (!strcmp(var, "core.quotepath")) {
  		quote_path_fully = git_config_bool(var, value);
@@@ -785,6 -676,9 +789,6 @@@
  		return 0;
  	}
  
 -	if (!strcmp(var, "core.logpackaccess"))
 -		return git_config_string(&log_pack_access, var, value);
 -
  	if (!strcmp(var, "core.autocrlf")) {
  		if (value && !strcasecmp(value, "input")) {
  			if (core_eol == EOL_CRLF)
@@@ -830,14 -724,6 +834,14 @@@
  	if (!strcmp(var, "core.editor"))
  		return git_config_string(&editor_program, var, value);
  
 +	if (!strcmp(var, "core.commentchar")) {
 +		const char *comment;
 +		int ret = git_config_string(&comment, var, value);
 +		if (!ret)
 +			comment_line_char = comment[0];
 +		return ret;
 +	}
 +
  	if (!strcmp(var, "core.askpass"))
  		return git_config_string(&askpass_program, var, value);
  
@@@ -876,8 -762,25 +880,8 @@@
  		return 0;
  	}
  
 -	/* Add other config variables here and to Documentation/config.txt. */
 -	return 0;
 -}
 -
 -static int git_default_user_config(const char *var, const char *value)
 -{
 -	if (!strcmp(var, "user.name")) {
 -		if (!value)
 -			return config_error_nonbool(var);
 -		strlcpy(git_default_name, value, sizeof(git_default_name));
 -		user_ident_explicitly_given |= IDENT_NAME_GIVEN;
 -		return 0;
 -	}
 -
 -	if (!strcmp(var, "user.email")) {
 -		if (!value)
 -			return config_error_nonbool(var);
 -		strlcpy(git_default_email, value, sizeof(git_default_email));
 -		user_ident_explicitly_given |= IDENT_MAIL_GIVEN;
 +	if (!strcmp(var, "core.precomposeunicode")) {
 +		precomposed_unicode = git_config_bool(var, value);
  		return 0;
  	}
  
@@@ -936,8 -839,6 +940,8 @@@ static int git_default_push_config(cons
  			push_default = PUSH_DEFAULT_NOTHING;
  		else if (!strcmp(value, "matching"))
  			push_default = PUSH_DEFAULT_MATCHING;
 +		else if (!strcmp(value, "simple"))
 +			push_default = PUSH_DEFAULT_SIMPLE;
  		else if (!strcmp(value, "upstream"))
  			push_default = PUSH_DEFAULT_UPSTREAM;
  		else if (!strcmp(value, "tracking")) /* deprecated */
@@@ -946,8 -847,8 +950,8 @@@
  			push_default = PUSH_DEFAULT_CURRENT;
  		else {
  			error("Malformed value for %s: %s", var, value);
 -			return error("Must be one of nothing, matching, "
 -				     "tracking or current.");
 +			return error("Must be one of nothing, matching, simple, "
 +				     "upstream or current.");
  		}
  		return 0;
  	}
@@@ -960,8 -861,6 +964,8 @@@ static int git_default_mailmap_config(c
  {
  	if (!strcmp(var, "mailmap.file"))
  		return git_config_string(&git_mailmap_file, var, value);
 +	if (!strcmp(var, "mailmap.blob"))
 +		return git_config_string(&git_mailmap_blob, var, value);
  
  	/* Add other config variables here and to Documentation/config.txt. */
  	return 0;
@@@ -969,25 -868,25 +973,25 @@@
  
  int git_default_config(const char *var, const char *value, void *dummy)
  {
 -	if (!prefixcmp(var, "core."))
 +	if (starts_with(var, "core."))
  		return git_default_core_config(var, value);
  
 -	if (!prefixcmp(var, "user."))
 -		return git_default_user_config(var, value);
 +	if (starts_with(var, "user."))
 +		return git_ident_config(var, value, dummy);
  
 -	if (!prefixcmp(var, "i18n."))
 +	if (starts_with(var, "i18n."))
  		return git_default_i18n_config(var, value);
  
 -	if (!prefixcmp(var, "branch."))
 +	if (starts_with(var, "branch."))
  		return git_default_branch_config(var, value);
  
 -	if (!prefixcmp(var, "push."))
 +	if (starts_with(var, "push."))
  		return git_default_push_config(var, value);
  
 -	if (!prefixcmp(var, "mailmap."))
 +	if (starts_with(var, "mailmap."))
  		return git_default_mailmap_config(var, value);
  
 -	if (!prefixcmp(var, "advice."))
 +	if (starts_with(var, "advice."))
  		return git_default_advice_config(var, value);
  
  	if (!strcmp(var, "pager.color") || !strcmp(var, "color.pager")) {
@@@ -1003,33 -902,6 +1007,33 @@@
  	return 0;
  }
  
 +/*
 + * All source specific fields in the union, die_on_error, name and the callbacks
 + * fgetc, ungetc, ftell of top need to be initialized before calling
 + * this function.
 + */
 +static int do_config_from(struct config_source *top, config_fn_t fn, void *data)
 +{
 +	int ret;
 +
 +	/* push config-file parsing state stack */
 +	top->prev = cf;
 +	top->linenr = 1;
 +	top->eof = 0;
 +	strbuf_init(&top->value, 1024);
 +	strbuf_init(&top->var, 1024);
 +	cf = top;
 +
 +	ret = git_parse_source(fn, data);
 +
 +	/* pop config-file parsing state stack */
 +	strbuf_release(&top->value);
 +	strbuf_release(&top->var);
 +	cf = top->prev;
 +
 +	return ret;
 +}
 +
  int git_config_from_file(config_fn_t fn, const char *filename, void *data)
  {
  	int ret;
@@@ -1037,74 -909,28 +1041,74 @@@
  
  	ret = -1;
  	if (f) {
 -		config_file top;
 +		struct config_source top;
  
 -		/* push config-file parsing state stack */
 -		top.prev = cf;
 -		top.f = f;
 +		top.u.file = f;
  		top.name = filename;
 -		top.linenr = 1;
 -		top.eof = 0;
 -		strbuf_init(&top.value, 1024);
 -		cf = &top;
 +		top.die_on_error = 1;
 +		top.do_fgetc = config_file_fgetc;
 +		top.do_ungetc = config_file_ungetc;
 +		top.do_ftell = config_file_ftell;
  
 -		ret = git_parse_file(fn, data);
 -
 -		/* pop config-file parsing state stack */
 -		strbuf_release(&top.value);
 -		cf = top.prev;
 +		ret = do_config_from(&top, fn, data);
  
  		fclose(f);
  	}
  	return ret;
  }
  
 +int git_config_from_buf(config_fn_t fn, const char *name, const char *buf,
 +			size_t len, void *data)
 +{
 +	struct config_source top;
 +
 +	top.u.buf.buf = buf;
 +	top.u.buf.len = len;
 +	top.u.buf.pos = 0;
 +	top.name = name;
 +	top.die_on_error = 0;
 +	top.do_fgetc = config_buf_fgetc;
 +	top.do_ungetc = config_buf_ungetc;
 +	top.do_ftell = config_buf_ftell;
 +
 +	return do_config_from(&top, fn, data);
 +}
 +
 +static int git_config_from_blob_sha1(config_fn_t fn,
 +				     const char *name,
 +				     const unsigned char *sha1,
 +				     void *data)
 +{
 +	enum object_type type;
 +	char *buf;
 +	unsigned long size;
 +	int ret;
 +
 +	buf = read_sha1_file(sha1, &type, &size);
 +	if (!buf)
 +		return error("unable to load config blob object '%s'", name);
 +	if (type != OBJ_BLOB) {
 +		free(buf);
 +		return error("reference '%s' does not point to a blob", name);
 +	}
 +
 +	ret = git_config_from_buf(fn, name, buf, size, data);
 +	free(buf);
 +
 +	return ret;
 +}
 +
 +static int git_config_from_blob_ref(config_fn_t fn,
 +				    const char *name,
 +				    void *data)
 +{
 +	unsigned char sha1[20];
 +
 +	if (get_sha1(name, sha1) < 0)
 +		return error("unable to resolve config blob '%s'", name);
 +	return git_config_from_blob_sha1(fn, name, sha1, data);
 +}
 +
  const char *git_etc_gitconfig(void)
  {
  	static const char *system_wide;
@@@ -1127,28 -953,25 +1131,28 @@@ int git_config_system(void
  int git_config_early(config_fn_t fn, void *data, const char *repo_config)
  {
  	int ret = 0, found = 0;
 -	const char *home = NULL;
 +	char *xdg_config = NULL;
 +	char *user_config = NULL;
 +
 +	home_config_paths(&user_config, &xdg_config, "config");
  
 -	if (git_config_system() && !access(git_etc_gitconfig(), R_OK)) {
 +	if (git_config_system() && !access_or_die(git_etc_gitconfig(), R_OK, 0)) {
  		ret += git_config_from_file(fn, git_etc_gitconfig(),
  					    data);
  		found += 1;
  	}
  
 -	home = getenv("HOME");
 -	if (home) {
 -		char buf[PATH_MAX];
 -		char *user_config = mksnpath(buf, sizeof(buf), "%s/.gitconfig", home);
 -		if (!access(user_config, R_OK)) {
 -			ret += git_config_from_file(fn, user_config, data);
 -			found += 1;
 -		}
 +	if (xdg_config && !access_or_die(xdg_config, R_OK, ACCESS_EACCES_OK)) {
 +		ret += git_config_from_file(fn, xdg_config, data);
 +		found += 1;
  	}
  
 -	if (repo_config && !access(repo_config, R_OK)) {
 +	if (user_config && !access_or_die(user_config, R_OK, ACCESS_EACCES_OK)) {
 +		ret += git_config_from_file(fn, user_config, data);
 +		found += 1;
 +	}
 +
 +	if (repo_config && !access_or_die(repo_config, R_OK, 0)) {
  		ret += git_config_from_file(fn, repo_config, data);
  		found += 1;
  	}
@@@ -1164,15 -987,11 +1168,15 @@@
  		break;
  	}
  
 +	free(xdg_config);
 +	free(user_config);
  	return ret == 0 ? found : ret;
  }
  
  int git_config_with_options(config_fn_t fn, void *data,
 -			    const char *filename, int respect_includes)
 +			    const char *filename,
 +			    const char *blob_ref,
 +			    int respect_includes)
  {
  	char *repo_config = NULL;
  	int ret;
@@@ -1191,8 -1010,6 +1195,8 @@@
  	 */
  	if (filename)
  		return git_config_from_file(fn, filename, data);
 +	else if (blob_ref)
 +		return git_config_from_blob_ref(fn, blob_ref, data);
  
  	repo_config = git_pathdup("config");
  	ret = git_config_early(fn, data, repo_config);
@@@ -1203,21 -1020,22 +1207,21 @@@
  
  int git_config(config_fn_t fn, void *data)
  {
 -	return git_config_with_options(fn, data, NULL, 1);
 +	return git_config_with_options(fn, data, NULL, NULL, 1);
  }
  
  /*
   * Find all the stuff for git_config_set() below.
   */
  
 -#define MAX_MATCHES 512
 -
  static struct {
  	int baselen;
  	char *key;
  	int do_not_match;
  	regex_t *value_regex;
  	int multi_replace;
 -	size_t offset[MAX_MATCHES];
 +	size_t *offset;
 +	unsigned int offset_alloc;
  	enum { START, SECTION_SEEN, SECTION_END_SEEN, KEY_SEEN } state;
  	int seen;
  } store;
@@@ -1234,18 -1052,19 +1238,18 @@@ static int store_aux(const char *key, c
  {
  	const char *ep;
  	size_t section_len;
 -	FILE *f = cf->f;
  
  	switch (store.state) {
  	case KEY_SEEN:
  		if (matches(key, value)) {
  			if (store.seen == 1 && store.multi_replace == 0) {
  				warning("%s has multiple values", key);
 -			} else if (store.seen >= MAX_MATCHES) {
 -				error("too many matches for %s", key);
 -				return 1;
  			}
  
 -			store.offset[store.seen] = ftell(f);
 +			ALLOC_GROW(store.offset, store.seen + 1,
 +				   store.offset_alloc);
 +
 +			store.offset[store.seen] = cf->do_ftell(cf);
  			store.seen++;
  		}
  		break;
@@@ -1272,26 -1091,19 +1276,26 @@@
  		 * Do not increment matches: this is no match, but we
  		 * just made sure we are in the desired section.
  		 */
 -		store.offset[store.seen] = ftell(f);
 +		ALLOC_GROW(store.offset, store.seen + 1,
 +			   store.offset_alloc);
 +		store.offset[store.seen] = cf->do_ftell(cf);
  		/* fallthru */
  	case SECTION_END_SEEN:
  	case START:
  		if (matches(key, value)) {
 -			store.offset[store.seen] = ftell(f);
 +			ALLOC_GROW(store.offset, store.seen + 1,
 +				   store.offset_alloc);
 +			store.offset[store.seen] = cf->do_ftell(cf);
  			store.state = KEY_SEEN;
  			store.seen++;
  		} else {
  			if (strrchr(key, '.') - key == store.baselen &&
  			      !strncmp(key, store.key, store.baselen)) {
  					store.state = SECTION_SEEN;
 -					store.offset[store.seen] = ftell(f);
 +					ALLOC_GROW(store.offset,
 +						   store.seen + 1,
 +						   store.offset_alloc);
 +					store.offset[store.seen] = cf->do_ftell(cf);
  			}
  		}
  	}
@@@ -1482,7 -1294,6 +1486,7 @@@ int git_config_parse_key(const char *ke
  
  out_free_ret_1:
  	free(*store_key);
 +	*store_key = NULL;
  	return -CONFIG_INVALID_KEY;
  }
  
@@@ -1589,7 -1400,6 +1593,7 @@@ int git_config_set_multivar_in_file(con
  			}
  		}
  
 +		ALLOC_GROW(store.offset, 1, store.offset_alloc);
  		store.offset[0] = 0;
  		store.state = START;
  		store.seen = 0;
@@@ -1752,42 -1562,20 +1756,42 @@@ static int section_name_match (const ch
  	return 0;
  }
  
 +static int section_name_is_ok(const char *name)
 +{
 +	/* Empty section names are bogus. */
 +	if (!*name)
 +		return 0;
 +
 +	/*
 +	 * Before a dot, we must be alphanumeric or dash. After the first dot,
 +	 * anything goes, so we can stop checking.
 +	 */
 +	for (; *name && *name != '.'; name++)
 +		if (*name != '-' && !isalnum(*name))
 +			return 0;
 +	return 1;
 +}
 +
  /* if new_name == NULL, the section is removed instead */
  int git_config_rename_section_in_file(const char *config_filename,
  				      const char *old_name, const char *new_name)
  {
  	int ret = 0, remove = 0;
  	char *filename_buf = NULL;
 -	struct lock_file *lock = xcalloc(sizeof(struct lock_file), 1);
 +	struct lock_file *lock;
  	int out_fd;
  	char buf[1024];
  	FILE *config_file;
  
 +	if (new_name && !section_name_is_ok(new_name)) {
 +		ret = error("invalid section name: %s", new_name);
 +		goto out;
 +	}
 +
  	if (!config_filename)
  		config_filename = filename_buf = git_pathdup("config");
  
 +	lock = xcalloc(sizeof(struct lock_file), 1);
  	out_fd = hold_lock_file_for_update(lock, config_filename, 0);
  	if (out_fd < 0) {
  		ret = error("could not lock config file %s", config_filename);
@@@ -1864,41 -1652,7 +1868,41 @@@ int git_config_rename_section(const cha
   * Call this to report error for your variable that should not
   * get a boolean value (i.e. "[my] var" means "true").
   */
 +#undef config_error_nonbool
  int config_error_nonbool(const char *var)
  {
  	return error("Missing value for '%s'", var);
  }
 +
 +int parse_config_key(const char *var,
 +		     const char *section,
 +		     const char **subsection, int *subsection_len,
 +		     const char **key)
 +{
 +	int section_len = strlen(section);
 +	const char *dot;
 +
 +	/* Does it start with "section." ? */
 +	if (!starts_with(var, section) || var[section_len] != '.')
 +		return -1;
 +
 +	/*
 +	 * Find the key; we don't know yet if we have a subsection, but we must
 +	 * parse backwards from the end, since the subsection may have dots in
 +	 * it, too.
 +	 */
 +	dot = strrchr(var, '.');
 +	*key = dot + 1;
 +
 +	/* Did we have a subsection at all? */
 +	if (dot == var + section_len) {
 +		*subsection = NULL;
 +		*subsection_len = 0;
 +	}
 +	else {
 +		*subsection = var + section_len + 1;
 +		*subsection_len = dot - *subsection;
 +	}
 +
 +	return 0;
 +}
diff --combined path.c
index 24594c4112,3a5796156b..f9c5062427
--- a/path.c
+++ b/path.c
@@@ -1,18 -1,17 +1,18 @@@
  /*
 - * I'm tired of doing "vsnprintf()" etc just to open a
 - * file, so here's a "return static buffer with printf"
 - * interface for paths.
 - *
 - * It's obviously not thread-safe. Sue me. But it's quite
 - * useful for doing things like
 - *
 - *   f = open(mkpath("%s/%s.git", base, name), O_RDONLY);
 - *
 - * which is what it's designed for.
 + * Utilities for paths and pathnames
   */
  #include "cache.h"
  #include "strbuf.h"
 +#include "string-list.h"
 +
 +static int get_st_mode_bits(const char *path, int *mode)
 +{
 +	struct stat st;
 +	if (lstat(path, &st) < 0)
 +		return -1;
 +	*mode = st.st_mode;
 +	return 0;
 +}
  
  static char bad_path[] = "/bad-path/";
  
@@@ -49,7 -48,7 +49,7 @@@ char *mksnpath(char *buf, size_t n, con
  	return cleanup_path(buf);
  }
  
 -static char *git_vsnpath(char *buf, size_t n, const char *fmt, va_list args)
 +static char *vsnpath(char *buf, size_t n, const char *fmt, va_list args)
  {
  	const char *git_dir = get_git_dir();
  	size_t len;
@@@ -71,37 -70,21 +71,37 @@@ bad
  
  char *git_snpath(char *buf, size_t n, const char *fmt, ...)
  {
 +	char *ret;
  	va_list args;
  	va_start(args, fmt);
 -	(void)git_vsnpath(buf, n, fmt, args);
 +	ret = vsnpath(buf, n, fmt, args);
  	va_end(args);
 -	return buf;
 +	return ret;
  }
  
  char *git_pathdup(const char *fmt, ...)
  {
 -	char path[PATH_MAX];
 +	char path[PATH_MAX], *ret;
 +	va_list args;
 +	va_start(args, fmt);
 +	ret = vsnpath(path, sizeof(path), fmt, args);
 +	va_end(args);
 +	return xstrdup(ret);
 +}
 +
 +char *mkpathdup(const char *fmt, ...)
 +{
 +	char *path;
 +	struct strbuf sb = STRBUF_INIT;
  	va_list args;
 +
  	va_start(args, fmt);
 -	(void)git_vsnpath(path, sizeof(path), fmt, args);
 +	strbuf_vaddf(&sb, fmt, args);
  	va_end(args);
 -	return xstrdup(path);
 +	path = xstrdup(cleanup_path(sb.buf));
 +
 +	strbuf_release(&sb);
 +	return path;
  }
  
  char *mkpath(const char *fmt, ...)
@@@ -120,40 -103,23 +120,40 @@@
  
  char *git_path(const char *fmt, ...)
  {
 -	const char *git_dir = get_git_dir();
  	char *pathname = get_pathname();
  	va_list args;
 -	unsigned len;
 +	char *ret;
  
 -	len = strlen(git_dir);
 -	if (len > PATH_MAX-100)
 -		return bad_path;
 -	memcpy(pathname, git_dir, len);
 -	if (len && git_dir[len-1] != '/')
 -		pathname[len++] = '/';
  	va_start(args, fmt);
 -	len += vsnprintf(pathname + len, PATH_MAX - len, fmt, args);
 +	ret = vsnpath(pathname, PATH_MAX, fmt, args);
  	va_end(args);
 -	if (len >= PATH_MAX)
 -		return bad_path;
 -	return cleanup_path(pathname);
 +	return ret;
 +}
 +
 +void home_config_paths(char **global, char **xdg, char *file)
 +{
 +	char *xdg_home = getenv("XDG_CONFIG_HOME");
 +	char *home = getenv("HOME");
 +	char *to_free = NULL;
 +
 +	if (!home) {
 +		if (global)
 +			*global = NULL;
 +	} else {
 +		if (!xdg_home) {
 +			to_free = mkpathdup("%s/.config", home);
 +			xdg_home = to_free;
 +		}
 +		if (global)
 +			*global = mkpathdup("%s/.gitconfig", home);
 +	}
 +
 +	if (!xdg_home)
 +		*xdg = NULL;
 +	else
 +		*xdg = mkpathdup("%s/git/%s", xdg_home, file);
 +
 +	free(to_free);
  }
  
  char *git_path_submodule(const char *path, const char *fmt, ...)
@@@ -265,12 -231,12 +265,12 @@@ static struct passwd *getpw_str(const c
  char *expand_user_path(const char *path)
  {
  	struct strbuf user_path = STRBUF_INIT;
- 	const char *first_slash = strchrnul(path, '/');
  	const char *to_copy = path;
  
  	if (path == NULL)
  		goto return_null;
  	if (path[0] == '~') {
+ 		const char *first_slash = strchrnul(path, '/');
  		const char *username = path + 1;
  		size_t username_len = first_slash - username;
  		if (username_len == 0) {
@@@ -389,14 -355,28 +389,14 @@@ const char *enter_repo(const char *path
  	return NULL;
  }
  
 -int set_shared_perm(const char *path, int mode)
 +static int calc_shared_perm(int mode)
  {
 -	struct stat st;
 -	int tweak, shared, orig_mode;
 +	int tweak;
  
 -	if (!shared_repository) {
 -		if (mode)
 -			return chmod(path, mode & ~S_IFMT);
 -		return 0;
 -	}
 -	if (!mode) {
 -		if (lstat(path, &st) < 0)
 -			return -1;
 -		mode = st.st_mode;
 -		orig_mode = mode;
 -	} else
 -		orig_mode = 0;
  	if (shared_repository < 0)
 -		shared = -shared_repository;
 +		tweak = -shared_repository;
  	else
 -		shared = shared_repository;
 -	tweak = shared;
 +		tweak = shared_repository;
  
  	if (!(mode & S_IWUSR))
  		tweak &= ~0222;
@@@ -408,190 -388,55 +408,190 @@@
  	else
  		mode |= tweak;
  
 -	if (S_ISDIR(mode)) {
 +	return mode;
 +}
 +
 +
 +int adjust_shared_perm(const char *path)
 +{
 +	int old_mode, new_mode;
 +
 +	if (!shared_repository)
 +		return 0;
 +	if (get_st_mode_bits(path, &old_mode) < 0)
 +		return -1;
 +
 +	new_mode = calc_shared_perm(old_mode);
 +	if (S_ISDIR(old_mode)) {
  		/* Copy read bits to execute bits */
 -		mode |= (shared & 0444) >> 2;
 -		mode |= FORCE_DIR_SET_GID;
 +		new_mode |= (new_mode & 0444) >> 2;
 +		new_mode |= FORCE_DIR_SET_GID;
  	}
  
 -	if (((shared_repository < 0
 -	      ? (orig_mode & (FORCE_DIR_SET_GID | 0777))
 -	      : (orig_mode & mode)) != mode) &&
 -	    chmod(path, (mode & ~S_IFMT)) < 0)
 +	if (((old_mode ^ new_mode) & ~S_IFMT) &&
 +			chmod(path, (new_mode & ~S_IFMT)) < 0)
  		return -2;
  	return 0;
  }
  
 -const char *relative_path(const char *abs, const char *base)
 +static int have_same_root(const char *path1, const char *path2)
 +{
 +	int is_abs1, is_abs2;
 +
 +	is_abs1 = is_absolute_path(path1);
 +	is_abs2 = is_absolute_path(path2);
 +	return (is_abs1 && is_abs2 && tolower(path1[0]) == tolower(path2[0])) ||
 +	       (!is_abs1 && !is_abs2);
 +}
 +
 +/*
 + * Give path as relative to prefix.
 + *
 + * The strbuf may or may not be used, so do not assume it contains the
 + * returned path.
 + */
 +const char *relative_path(const char *in, const char *prefix,
 +			  struct strbuf *sb)
 +{
 +	int in_len = in ? strlen(in) : 0;
 +	int prefix_len = prefix ? strlen(prefix) : 0;
 +	int in_off = 0;
 +	int prefix_off = 0;
 +	int i = 0, j = 0;
 +
 +	if (!in_len)
 +		return "./";
 +	else if (!prefix_len)
 +		return in;
 +
 +	if (have_same_root(in, prefix)) {
 +		/* bypass dos_drive, for "c:" is identical to "C:" */
 +		if (has_dos_drive_prefix(in)) {
 +			i = 2;
 +			j = 2;
 +		}
 +	} else {
 +		return in;
 +	}
 +
 +	while (i < prefix_len && j < in_len && prefix[i] == in[j]) {
 +		if (is_dir_sep(prefix[i])) {
 +			while (is_dir_sep(prefix[i]))
 +				i++;
 +			while (is_dir_sep(in[j]))
 +				j++;
 +			prefix_off = i;
 +			in_off = j;
 +		} else {
 +			i++;
 +			j++;
 +		}
 +	}
 +
 +	if (
 +	    /* "prefix" seems like prefix of "in" */
 +	    i >= prefix_len &&
 +	    /*
 +	     * but "/foo" is not a prefix of "/foobar"
 +	     * (i.e. prefix not end with '/')
 +	     */
 +	    prefix_off < prefix_len) {
 +		if (j >= in_len) {
 +			/* in="/a/b", prefix="/a/b" */
 +			in_off = in_len;
 +		} else if (is_dir_sep(in[j])) {
 +			/* in="/a/b/c", prefix="/a/b" */
 +			while (is_dir_sep(in[j]))
 +				j++;
 +			in_off = j;
 +		} else {
 +			/* in="/a/bbb/c", prefix="/a/b" */
 +			i = prefix_off;
 +		}
 +	} else if (
 +		   /* "in" is short than "prefix" */
 +		   j >= in_len &&
 +		   /* "in" not end with '/' */
 +		   in_off < in_len) {
 +		if (is_dir_sep(prefix[i])) {
 +			/* in="/a/b", prefix="/a/b/c/" */
 +			while (is_dir_sep(prefix[i]))
 +				i++;
 +			in_off = in_len;
 +		}
 +	}
 +	in += in_off;
 +	in_len -= in_off;
 +
 +	if (i >= prefix_len) {
 +		if (!in_len)
 +			return "./";
 +		else
 +			return in;
 +	}
 +
 +	strbuf_reset(sb);
 +	strbuf_grow(sb, in_len);
 +
 +	while (i < prefix_len) {
 +		if (is_dir_sep(prefix[i])) {
 +			strbuf_addstr(sb, "../");
 +			while (is_dir_sep(prefix[i]))
 +				i++;
 +			continue;
 +		}
 +		i++;
 +	}
 +	if (!is_dir_sep(prefix[prefix_len - 1]))
 +		strbuf_addstr(sb, "../");
 +
 +	strbuf_addstr(sb, in);
 +
 +	return sb->buf;
 +}
 +
 +/*
 + * A simpler implementation of relative_path
 + *
 + * Get relative path by removing "prefix" from "in". This function
 + * first appears in v1.5.6-1-g044bbbc, and makes git_dir shorter
 + * to increase performance when traversing the path to work_tree.
 + */
 +const char *remove_leading_path(const char *in, const char *prefix)
  {
  	static char buf[PATH_MAX + 1];
  	int i = 0, j = 0;
  
 -	if (!base || !base[0])
 -		return abs;
 -	while (base[i]) {
 -		if (is_dir_sep(base[i])) {
 -			if (!is_dir_sep(abs[j]))
 -				return abs;
 -			while (is_dir_sep(base[i]))
 +	if (!prefix || !prefix[0])
 +		return in;
 +	while (prefix[i]) {
 +		if (is_dir_sep(prefix[i])) {
 +			if (!is_dir_sep(in[j]))
 +				return in;
 +			while (is_dir_sep(prefix[i]))
  				i++;
 -			while (is_dir_sep(abs[j]))
 +			while (is_dir_sep(in[j]))
  				j++;
  			continue;
 -		} else if (abs[j] != base[i]) {
 -			return abs;
 +		} else if (in[j] != prefix[i]) {
 +			return in;
  		}
  		i++;
  		j++;
  	}
  	if (
  	    /* "/foo" is a prefix of "/foo" */
 -	    abs[j] &&
 +	    in[j] &&
  	    /* "/foo" is not a prefix of "/foobar" */
 -	    !is_dir_sep(base[i-1]) && !is_dir_sep(abs[j])
 +	    !is_dir_sep(prefix[i-1]) && !is_dir_sep(in[j])
  	   )
 -		return abs;
 -	while (is_dir_sep(abs[j]))
 +		return in;
 +	while (is_dir_sep(in[j]))
  		j++;
 -	if (!abs[j])
 +	if (!in[j])
  		strcpy(buf, ".");
  	else
 -		strcpy(buf, abs + j);
 +		strcpy(buf, in + j);
  	return buf;
  }
  
@@@ -608,14 -453,8 +608,14 @@@
   *
   * Note that this function is purely textual.  It does not follow symlinks,
   * verify the existence of the path, or make any system calls.
 + *
 + * prefix_len != NULL is for a specific case of prefix_pathspec():
 + * assume that src == dst and src[0..prefix_len-1] is already
 + * normalized, any time "../" eats up to the prefix_len part,
 + * prefix_len is reduced. In the end prefix_len is the remaining
 + * prefix that has not been overridden by user pathspec.
   */
 -int normalize_path_copy(char *dst, const char *src)
 +int normalize_path_copy_len(char *dst, const char *src, int *prefix_len)
  {
  	char *dst0;
  
@@@ -690,52 -529,50 +690,52 @@@
  		/* Windows: dst[-1] cannot be backslash anymore */
  		while (dst0 < dst && dst[-1] != '/')
  			dst--;
 +		if (prefix_len && *prefix_len > dst - dst0)
 +			*prefix_len = dst - dst0;
  	}
  	*dst = '\0';
  	return 0;
  }
  
 +int normalize_path_copy(char *dst, const char *src)
 +{
 +	return normalize_path_copy_len(dst, src, NULL);
 +}
 +
  /*
   * path = Canonical absolute path
 - * prefix_list = Colon-separated list of absolute paths
 + * prefixes = string_list containing normalized, absolute paths without
 + * trailing slashes (except for the root directory, which is denoted by "/").
   *
 - * Determines, for each path in prefix_list, whether the "prefix" really
 + * Determines, for each path in prefixes, whether the "prefix"
   * is an ancestor directory of path.  Returns the length of the longest
   * ancestor directory, excluding any trailing slashes, or -1 if no prefix
 - * is an ancestor.  (Note that this means 0 is returned if prefix_list is
 - * "/".) "/foo" is not considered an ancestor of "/foobar".  Directories
 + * is an ancestor.  (Note that this means 0 is returned if prefixes is
 + * ["/"].) "/foo" is not considered an ancestor of "/foobar".  Directories
   * are not considered to be their own ancestors.  path must be in a
   * canonical form: empty components, or "." or ".." components are not
 - * allowed.  prefix_list may be null, which is like "".
 + * allowed.
   */
 -int longest_ancestor_length(const char *path, const char *prefix_list)
 +int longest_ancestor_length(const char *path, struct string_list *prefixes)
  {
 -	char buf[PATH_MAX+1];
 -	const char *ceil, *colon;
 -	int len, max_len = -1;
 +	int i, max_len = -1;
  
 -	if (prefix_list == NULL || !strcmp(path, "/"))
 +	if (!strcmp(path, "/"))
  		return -1;
  
 -	for (colon = ceil = prefix_list; *colon; ceil = colon+1) {
 -		for (colon = ceil; *colon && *colon != PATH_SEP; colon++);
 -		len = colon - ceil;
 -		if (len == 0 || len > PATH_MAX || !is_absolute_path(ceil))
 -			continue;
 -		strlcpy(buf, ceil, len+1);
 -		if (normalize_path_copy(buf, buf) < 0)
 -			continue;
 -		len = strlen(buf);
 -		if (len > 0 && buf[len-1] == '/')
 -			buf[--len] = '\0';
 +	for (i = 0; i < prefixes->nr; i++) {
 +		const char *ceil = prefixes->items[i].string;
 +		int len = strlen(ceil);
 +
 +		if (len == 1 && ceil[0] == '/')
 +			len = 0; /* root matches anything, with length 0 */
 +		else if (!strncmp(path, ceil, len) && path[len] == '/')
 +			; /* match of length len */
 +		else
 +			continue; /* no match */
  
 -		if (!strncmp(path, buf, len) &&
 -		    path[len] == '/' &&
 -		    len > max_len) {
 +		if (len > max_len)
  			max_len = len;
 -		}
  	}
  
  	return max_len;