Commit fde93250320f97cd6cf93be1e4ab09fd330e001f
2013-11-07T13:17:36
Correctly quote config values while saving If the value contains a command (; or #) char or starts or ends with space it needs to be quoted. Signed-off-by: Sven Strickroth <email@cs-ware.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
diff --git a/src/config_file.c b/src/config_file.c
index c7fc320..1e58e3a 100644
--- a/src/config_file.c
+++ b/src/config_file.c
@@ -1178,6 +1178,22 @@ static int write_section(git_filebuf *file, const char *key)
return result;
}
+static int needsQuote(const char *value)
+{
+ const char *ptr = value;
+ if (*value == ' ')
+ return 1;
+ while (*ptr) {
+ if (*ptr == ';' || *ptr == '#')
+ return 1;
+ ++ptr;
+ }
+ if (ptr != value && *(--ptr) == ' ')
+ return 1;
+
+ return 0;
+}
+
/*
* This is pretty much the parsing, except we write out anything we don't have
*/
@@ -1299,7 +1315,10 @@ static int config_write(diskfile_backend *cfg, const char *key, const regex_t *p
/* Then replace the variable. If the value is NULL, it
* means we want to delete it, so don't write anything. */
if (value != NULL) {
- git_filebuf_printf(&file, "\t%s = %s\n", name, value);
+ if (needsQuote(value))
+ git_filebuf_printf(&file, "\t%s = \"%s\"\n", name, value);
+ else
+ git_filebuf_printf(&file, "\t%s = %s\n", name, value);
}
/*
@@ -1359,7 +1378,10 @@ static int config_write(diskfile_backend *cfg, const char *key, const regex_t *p
if (reader->buffer.size > 0 && *(reader->buffer.ptr + reader->buffer.size - 1) != '\n')
git_filebuf_write(&file, "\n", 1);
- git_filebuf_printf(&file, "\t%s = %s\n", name, value);
+ if (needsQuote(value))
+ git_filebuf_printf(&file, "\t%s = \"%s\"\n", name, value);
+ else
+ git_filebuf_printf(&file, "\t%s = %s\n", name, value);
}
}