From: sean Date: Sat, 6 May 2006 18:14:02 +0000 (-0400) Subject: Another config file parsing fix. X-Git-Tag: v1.3.3~6 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bdf0ef0824ecca427ec04ac047ffe4aaf73ace5a?hp=--cc 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 Signed-off-by: Junio C Hamano --- bdf0ef0824ecca427ec04ac047ffe4aaf73ace5a diff --git a/config.c b/config.c index adb5ce476a..0f518c957c 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; }