Commit 3b4835c25a41781d27a667dbd02ff03d54d221b9
2011-03-28T18:07:22
Correctly parse the section header If cfg_readline consumes the line, then parse_section_header will read past it and if we read a character, parse_variable won't have the full name. This solution is a bit hackish, but it's the simplest way to get the code to parse correctly. Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81
diff --git a/src/config.c b/src/config.c
index a3d7f8e..f496202 100644
--- a/src/config.c
+++ b/src/config.c
@@ -163,6 +163,9 @@ static int is_linebreak(const char *pos)
memcmp(pos - 2, LINEBREAK_WIN32, sizeof(LINEBREAK_WIN32)) == 0;
}
+/*
+ * Read a line, but don't consume it
+ */
static char *cfg_readline(git_config *cfg)
{
char *line = NULL;
@@ -213,12 +216,41 @@ static char *cfg_readline(git_config *cfg)
if (*line_end == '\0')
cfg->reader.eof = 1;
+ /*
cfg->reader.line_number++;
cfg->reader.read_ptr = line_end;
+ */
return line;
}
+/*
+ * Consume a line, without storing it anywhere
+ */
+void cfg_consume_line(git_config *cfg)
+{
+ char *line_start, *line_end;
+ int len;
+
+ line_start = cfg->reader.read_ptr;
+ line_end = strchr(line_start, '\n');
+ /* No newline at EOF */
+ if(line_end == NULL){
+ line_end = strchr(line_start, '\0');
+ }
+
+ len = line_end - line_start;
+
+ if (*line_end == '\n')
+ line_end++;
+
+ if (*line_end == '\0')
+ cfg->reader.eof = 1;
+
+ cfg->reader.line_number++;
+ cfg->reader.read_ptr = line_end;
+}
+
static inline int config_keychar(int c)
{
return isalnum(c) || c == '-';
@@ -388,17 +420,23 @@ static int config_parse(git_config *cfg_file)
break;
case '[': /* section header, new section begins */
- error = parse_section_header(¤t_section, line);
+ if (current_section)
+ free(current_section);
+ error = parse_section_header(cfg_file, ¤t_section, line);
break;
default: /* assume variable declaration */
error = parse_variable(cfg_file, current_section, line);
+ cfg_consume_line(cfg_file);
break;
}
free(line);
}
+ if(current_section)
+ free(current_section);
+
return error;
}