From: sean <seanlkml@sympatico.ca>
Date: Sat, 6 May 2006 18:14:02 +0000 (-0400)
Subject: Another config file parsing fix.
X-Git-Tag: v1.4.0-rc1~166
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6f81bf16a91c4db5a02b81cbade89e73ca4d49b4;p=git.git

Another config file parsing fix.

If the variable we need to store should go into a section
that currently only has a single variable (not matching
the one we're trying to insert), we will already be into
the next section before we notice we've bypassed the correct
location to insert the variable.

To handle this case we store the current location as soon
as we find a variable matching the section of our new
variable.

This breakage was brought up by Linus.

Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/config.c b/config.c
index 87fb22041..41066e4f4 100644
--- a/config.c
+++ b/config.c
@@ -336,8 +336,10 @@ static int store_aux(const char* key, const char* value)
 			store.state = KEY_SEEN;
 			store.seen++;
 		} else if (strrchr(key, '.') - key == store.baselen &&
-			      !strncmp(key, store.key, store.baselen))
+			      !strncmp(key, store.key, store.baselen)) {
 					store.state = SECTION_SEEN;
+					store.offset[store.seen] = ftell(config_file);
+		}
 	}
 	return 0;
 }