config.c: Make git_config() work correctly when called recursively
On Cygwin, this fixes a test failure in t3301-notes.sh (test 98, "git notes copy --for-rewrite (disabled)"). The test failure is caused by a recursive call to git_config() which has the effect of skipping to the end-of-file while processing the "notes.rewriteref" config variable. Thus, any config variables that appear after "notes.rewriteref" are simply ignored by git_config(). Also, we note that the original FILE handle is leaked as a result of the recursive call. The recursive call to git_config() is due to the "schizophrenic stat" functions on cygwin, where one of two different implementations of the l/stat functions is selected lazily, depending on some config variables. In this case, the init_copy_notes_for_rewrite() function calls git_config() with the notes_rewrite_config() callback function. This callback, while processing the "notes.rewriteref" variable, in turn calls string_list_add_refs_by_glob() to process the associated ref value. This eventually leads to a call to the get_ref_dir() function, which in turn calls stat(). On cygwin, the stat() macro leads to an indirect call to cygwin_stat_stub() which, via init_stat(), then calls git_config() in order to determine which l/stat implementation to bind to. In order to solve this problem, we modify git_config() so that the global state variables used by the config reading code is packaged up and managed on a local state stack. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ramsay Jones
Junio C Hamano
parent
452993c297
commit
924aaf3ef7
80
config.c
80
config.c
@ -12,10 +12,18 @@
|
||||
|
||||
#define MAXNAME (256)
|
||||
|
||||
static FILE *config_file;
|
||||
static const char *config_file_name;
|
||||
static int config_linenr;
|
||||
static int config_file_eof;
|
||||
typedef struct config_file {
|
||||
struct config_file *prev;
|
||||
FILE *f;
|
||||
const char *name;
|
||||
int linenr;
|
||||
int eof;
|
||||
struct strbuf value;
|
||||
char var[MAXNAME];
|
||||
} config_file;
|
||||
|
||||
static config_file *cf;
|
||||
|
||||
static int zlib_compression_seen;
|
||||
|
||||
const char *config_exclusive_filename = NULL;
|
||||
@ -99,7 +107,7 @@ static int get_next_char(void)
|
||||
FILE *f;
|
||||
|
||||
c = '\n';
|
||||
if ((f = config_file) != NULL) {
|
||||
if (cf && ((f = cf->f) != NULL)) {
|
||||
c = fgetc(f);
|
||||
if (c == '\r') {
|
||||
/* DOS like systems */
|
||||
@ -110,9 +118,9 @@ static int get_next_char(void)
|
||||
}
|
||||
}
|
||||
if (c == '\n')
|
||||
config_linenr++;
|
||||
cf->linenr++;
|
||||
if (c == EOF) {
|
||||
config_file_eof = 1;
|
||||
cf->eof = 1;
|
||||
c = '\n';
|
||||
}
|
||||
}
|
||||
@ -121,21 +129,20 @@ static int get_next_char(void)
|
||||
|
||||
static char *parse_value(void)
|
||||
{
|
||||
static struct strbuf value = STRBUF_INIT;
|
||||
int quote = 0, comment = 0, space = 0;
|
||||
|
||||
strbuf_reset(&value);
|
||||
strbuf_reset(&cf->value);
|
||||
for (;;) {
|
||||
int c = get_next_char();
|
||||
if (c == '\n') {
|
||||
if (quote)
|
||||
return NULL;
|
||||
return value.buf;
|
||||
return cf->value.buf;
|
||||
}
|
||||
if (comment)
|
||||
continue;
|
||||
if (isspace(c) && !quote) {
|
||||
if (value.len)
|
||||
if (cf->value.len)
|
||||
space++;
|
||||
continue;
|
||||
}
|
||||
@ -146,7 +153,7 @@ static char *parse_value(void)
|
||||
}
|
||||
}
|
||||
for (; space; space--)
|
||||
strbuf_addch(&value, ' ');
|
||||
strbuf_addch(&cf->value, ' ');
|
||||
if (c == '\\') {
|
||||
c = get_next_char();
|
||||
switch (c) {
|
||||
@ -168,14 +175,14 @@ static char *parse_value(void)
|
||||
default:
|
||||
return NULL;
|
||||
}
|
||||
strbuf_addch(&value, c);
|
||||
strbuf_addch(&cf->value, c);
|
||||
continue;
|
||||
}
|
||||
if (c == '"') {
|
||||
quote = 1-quote;
|
||||
continue;
|
||||
}
|
||||
strbuf_addch(&value, c);
|
||||
strbuf_addch(&cf->value, c);
|
||||
}
|
||||
}
|
||||
|
||||
@ -192,7 +199,7 @@ static int get_value(config_fn_t fn, void *data, char *name, unsigned int len)
|
||||
/* Get the full name */
|
||||
for (;;) {
|
||||
c = get_next_char();
|
||||
if (config_file_eof)
|
||||
if (cf->eof)
|
||||
break;
|
||||
if (!iskeychar(c))
|
||||
break;
|
||||
@ -256,7 +263,7 @@ static int get_base_var(char *name)
|
||||
|
||||
for (;;) {
|
||||
int c = get_next_char();
|
||||
if (config_file_eof)
|
||||
if (cf->eof)
|
||||
return -1;
|
||||
if (c == ']')
|
||||
return baselen;
|
||||
@ -274,7 +281,7 @@ static int git_parse_file(config_fn_t fn, void *data)
|
||||
{
|
||||
int comment = 0;
|
||||
int baselen = 0;
|
||||
static char var[MAXNAME];
|
||||
char *var = cf->var;
|
||||
|
||||
/* U+FEFF Byte Order Mark in UTF8 */
|
||||
static const unsigned char *utf8_bom = (unsigned char *) "\xef\xbb\xbf";
|
||||
@ -298,7 +305,7 @@ static int git_parse_file(config_fn_t fn, void *data)
|
||||
}
|
||||
}
|
||||
if (c == '\n') {
|
||||
if (config_file_eof)
|
||||
if (cf->eof)
|
||||
return 0;
|
||||
comment = 0;
|
||||
continue;
|
||||
@ -323,7 +330,7 @@ static int git_parse_file(config_fn_t fn, void *data)
|
||||
if (get_value(fn, data, var, baselen+1) < 0)
|
||||
break;
|
||||
}
|
||||
die("bad config file line %d in %s", config_linenr, config_file_name);
|
||||
die("bad config file line %d in %s", cf->linenr, cf->name);
|
||||
}
|
||||
|
||||
static int parse_unit_factor(const char *end, unsigned long *val)
|
||||
@ -374,8 +381,8 @@ int git_parse_ulong(const char *value, unsigned long *ret)
|
||||
|
||||
static void die_bad_config(const char *name)
|
||||
{
|
||||
if (config_file_name)
|
||||
die("bad config value for '%s' in %s", name, config_file_name);
|
||||
if (cf && cf->name)
|
||||
die("bad config value for '%s' in %s", name, cf->name);
|
||||
die("bad config value for '%s'", name);
|
||||
}
|
||||
|
||||
@ -795,13 +802,24 @@ int git_config_from_file(config_fn_t fn, const char *filename, void *data)
|
||||
|
||||
ret = -1;
|
||||
if (f) {
|
||||
config_file = f;
|
||||
config_file_name = filename;
|
||||
config_linenr = 1;
|
||||
config_file_eof = 0;
|
||||
config_file top;
|
||||
|
||||
/* push config-file parsing state stack */
|
||||
top.prev = cf;
|
||||
top.f = f;
|
||||
top.name = filename;
|
||||
top.linenr = 1;
|
||||
top.eof = 0;
|
||||
strbuf_init(&top.value, 1024);
|
||||
cf = ⊤
|
||||
|
||||
ret = git_parse_file(fn, data);
|
||||
|
||||
/* pop config-file parsing state stack */
|
||||
strbuf_release(&top.value);
|
||||
cf = top.prev;
|
||||
|
||||
fclose(f);
|
||||
config_file_name = NULL;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
@ -909,6 +927,7 @@ static int store_aux(const char *key, const char *value, void *cb)
|
||||
{
|
||||
const char *ep;
|
||||
size_t section_len;
|
||||
FILE *f = cf->f;
|
||||
|
||||
switch (store.state) {
|
||||
case KEY_SEEN:
|
||||
@ -920,7 +939,7 @@ static int store_aux(const char *key, const char *value, void *cb)
|
||||
return 1;
|
||||
}
|
||||
|
||||
store.offset[store.seen] = ftell(config_file);
|
||||
store.offset[store.seen] = ftell(f);
|
||||
store.seen++;
|
||||
}
|
||||
break;
|
||||
@ -947,19 +966,19 @@ static int store_aux(const char *key, const char *value, void *cb)
|
||||
* Do not increment matches: this is no match, but we
|
||||
* just made sure we are in the desired section.
|
||||
*/
|
||||
store.offset[store.seen] = ftell(config_file);
|
||||
store.offset[store.seen] = ftell(f);
|
||||
/* fallthru */
|
||||
case SECTION_END_SEEN:
|
||||
case START:
|
||||
if (matches(key, value)) {
|
||||
store.offset[store.seen] = ftell(config_file);
|
||||
store.offset[store.seen] = ftell(f);
|
||||
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(config_file);
|
||||
store.offset[store.seen] = ftell(f);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1415,6 +1434,7 @@ int git_config_rename_section(const char *old_name, const char *new_name)
|
||||
struct lock_file *lock = xcalloc(sizeof(struct lock_file), 1);
|
||||
int out_fd;
|
||||
char buf[1024];
|
||||
FILE *config_file;
|
||||
|
||||
if (config_exclusive_filename)
|
||||
config_filename = xstrdup(config_exclusive_filename);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user