X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=config.c;h=357c1caf973dbe5fd039baff45b244266725188e;hb=b17e659dd4007cb1d3eb5ac32b524c0c5ab59601;hp=e78520ba07035fbd11b56fbf016ec4affe0dd9ac;hpb=3dd94e3b2e2f5b00512273f96ab5628c742c112c;p=git.git

diff --git a/config.c b/config.c
index e78520ba..357c1caf 100644
--- a/config.c
+++ b/config.c
@@ -143,7 +143,7 @@ static int get_base_var(char *name)
 			return -1;
 		if (c == ']')
 			return baselen;
-		if (!isalnum(c))
+		if (!isalnum(c) && c != '.')
 			return -1;
 		if (baselen > MAXNAME / 2)
 			return -1;
@@ -405,28 +405,29 @@ int git_config_set_multivar(const char* key, const char* value,
 	int fd;
 	char* config_file = strdup(git_path("config"));
 	char* lock_file = strdup(git_path("config.lock"));
-
-	store.multi_replace = multi_replace;
+	const char* last_dot = strrchr(key, '.');
 
 	/*
 	 * Since "key" actually contains the section name and the real
 	 * key name separated by a dot, we have to know where the dot is.
 	 */
-	for (store.baselen = 0;
-			key[store.baselen] != '.' && key[store.baselen];
-			store.baselen++);
-	if (!key[store.baselen] || !key[store.baselen+1]) {
+
+	if (last_dot == NULL) {	
 		fprintf(stderr, "key does not contain a section: %s\n", key);
 		return 2;
 	}
+	store.baselen = last_dot - key;
+
+	store.multi_replace = multi_replace;
 
 	/*
 	 * Validate the key and while at it, lower case it for matching.
 	 */
 	store.key = (char*)malloc(strlen(key)+1);
 	for (i = 0; key[i]; i++)
-		if (i != store.baselen && (!isalnum(key[i]) ||
-				(i == store.baselen+1 && !isalpha(key[i])))) {
+		if (i != store.baselen &&
+				((!isalnum(key[i]) && key[i] != '.') ||
+				 (i == store.baselen+1 && !isalpha(key[i])))) {
 			fprintf(stderr, "invalid key: %s\n", key);
 			free(store.key);
 			return 1;