summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorAlex Vandiver <alex@chmrr.net>2009-07-24 21:21:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-07-25 06:42:34 (GMT)
commita4c0d463c0a1b38b7af45c1e7dd5608860eb1e28 (patch)
tree96a3296da00473f9320147ce87923a9fc3dc313c /config.c
parent735c674416b87505400fcf738fd3a38b52f0eccb (diff)
downloadgit-a4c0d463c0a1b38b7af45c1e7dd5608860eb1e28.zip
git-a4c0d463c0a1b38b7af45c1e7dd5608860eb1e28.tar.gz
git-a4c0d463c0a1b38b7af45c1e7dd5608860eb1e28.tar.bz2
Make section_name_match start on '[', and return the length on success
Signed-off-by: Alex Vandiver <alex@chmrr.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'config.c')
-rw-r--r--config.c19
1 files changed, 16 insertions, 3 deletions
diff --git a/config.c b/config.c
index 1682273..8d0e549 100644
--- a/config.c
+++ b/config.c
@@ -1174,7 +1174,9 @@ write_err_out:
static int section_name_match (const char *buf, const char *name)
{
int i = 0, j = 0, dot = 0;
- for (; buf[i] && buf[i] != ']'; i++) {
+ if (buf[i] != '[')
+ return 0;
+ for (i = 1; buf[i] && buf[i] != ']'; i++) {
if (!dot && isspace(buf[i])) {
dot = 1;
if (name[j++] != '.')
@@ -1195,7 +1197,17 @@ static int section_name_match (const char *buf, const char *name)
if (buf[i] != name[j++])
break;
}
- return (buf[i] == ']' && name[j] == 0);
+ if (buf[i] == ']' && name[j] == 0) {
+ /*
+ * We match, now just find the right length offset by
+ * gobbling up any whitespace after it, as well
+ */
+ i++;
+ for (; buf[i] && isspace(buf[i]); i++)
+ ; /* do nothing */
+ return i;
+ }
+ return 0;
}
/* if new_name == NULL, the section is removed instead */
@@ -1229,7 +1241,8 @@ int git_config_rename_section(const char *old_name, const char *new_name)
; /* do nothing */
if (buf[i] == '[') {
/* it's a section */
- if (section_name_match (&buf[i+1], old_name)) {
+ int offset = section_name_match(&buf[i], old_name);
+ if (offset > 0) {
ret++;
if (new_name == NULL) {
remove = 1;