proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-04 23:29:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

config_file: style

Browse Source
This commit is contained in:
Vicent Marti 2013-11-10 16:41:41 +01:00
parent b9cb72c28a
commit a1d35ede18
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/config_file.c
View File

@ -1178,20 +1178,22 @@ static int write_section(git_filebuf *file, const char *key)
return result; return result;
} }
static int value_needs_surrounding_quote(const char *value) static const char *quotes_for_value(const char *value)
{ {
const char *ptr = value; const char *ptr;
if (*value == ' ')
return 1;
while (*ptr) {
if (*ptr == ';' || *ptr == '#')
return 1;
++ptr;
}
if (ptr != value && *(--ptr) == ' ')
return 1;
return 0; if (value[0] == ' ' || value[0] == '\0')
return "\"";
for (ptr = value; *ptr; ++ptr) {
if (*ptr == ';' || *ptr == '#')
return "\"";
}
if (ptr[-1] == ' ')
return "\"";
return "";
} }
/* /*
@ -1318,10 +1320,8 @@ static int config_write(diskfile_backend *cfg, const char *key, const regex_t *p
/* Then replace the variable. If the value is NULL, it /* Then replace the variable. If the value is NULL, it
* means we want to delete it, so don't write anything. */ * means we want to delete it, so don't write anything. */
if (value != NULL) { if (value != NULL) {
if (value_needs_surrounding_quote(value)) const char *q = quotes_for_value(value);
git_filebuf_printf(&file, "\t%s = \"%s\"\n", name, value); git_filebuf_printf(&file, "\t%s = %s%s%s\n", name, q, value, q);
else
git_filebuf_printf(&file, "\t%s = %s\n", name, value);
} }
/* /*
@ -1362,6 +1362,8 @@ static int config_write(diskfile_backend *cfg, const char *key, const regex_t *p
if (preg_replaced) { if (preg_replaced) {
git_filebuf_printf(&file, "\n%s", write_start); git_filebuf_printf(&file, "\n%s", write_start);
} else { } else {
const char *q;
git_filebuf_write(&file, reader->buffer.ptr, reader->buffer.size); git_filebuf_write(&file, reader->buffer.ptr, reader->buffer.size);
/* And now if we just need to add a variable */ /* And now if we just need to add a variable */
@ -1381,10 +1383,8 @@ 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') if (reader->buffer.size > 0 && *(reader->buffer.ptr + reader->buffer.size - 1) != '\n')
git_filebuf_write(&file, "\n", 1); git_filebuf_write(&file, "\n", 1);
if (value_needs_surrounding_quote(value)) q = quotes_for_value(value);
git_filebuf_printf(&file, "\t%s = \"%s\"\n", name, value); git_filebuf_printf(&file, "\t%s = %s%s%s\n", name, q, value, q);
else
git_filebuf_printf(&file, "\t%s = %s\n", name, value);
} }
} }