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

config: allow to open and write to a new file

Browse Source
This commit is contained in:
Carlos Martín Nieto 2011-11-26 01:54:12 +01:00
parent 2869f404fd
commit 4e90a0a4a0
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/config_file.c
View File

@ -256,7 +256,11 @@ static int config_open(git_config_file *cfg)
diskfile_backend *b = (diskfile_backend *)cfg; diskfile_backend *b = (diskfile_backend *)cfg;
error = git_futils_readbuffer(&b->reader.buffer, b->file_path); error = git_futils_readbuffer(&b->reader.buffer, b->file_path);
if(error < GIT_SUCCESS) /* It's fine if the file doesn't exist */
if (error == GIT_ENOTFOUND)
return GIT_SUCCESS;
if (error < GIT_SUCCESS)
goto cleanup; goto cleanup;
error = config_parse(b); error = config_parse(b);
@ -714,6 +718,9 @@ static int skip_bom(diskfile_backend *cfg)
{ {
static const char *utf8_bom = "\xef\xbb\xbf"; static const char *utf8_bom = "\xef\xbb\xbf";
if (cfg->reader.buffer.len < sizeof(utf8_bom))
return GIT_SUCCESS;
if (memcmp(cfg->reader.read_ptr, utf8_bom, sizeof(utf8_bom)) == 0) if (memcmp(cfg->reader.read_ptr, utf8_bom, sizeof(utf8_bom)) == 0)
cfg->reader.read_ptr += sizeof(utf8_bom); cfg->reader.read_ptr += sizeof(utf8_bom);
@ -882,14 +889,23 @@ static int config_write(diskfile_backend *cfg, cvar_t *var)
/* We need to read in our own config file */ /* We need to read in our own config file */
error = git_futils_readbuffer(&cfg->reader.buffer, cfg->file_path); error = git_futils_readbuffer(&cfg->reader.buffer, cfg->file_path);
if (error < GIT_SUCCESS) { if (error < GIT_SUCCESS && error != GIT_ENOTFOUND) {
return git__rethrow(error, "Failed to read existing config file %s", cfg->file_path); return git__rethrow(error, "Failed to read existing config file %s", cfg->file_path);
} }
/* Initialise the reading position */ /* Initialise the reading position */
if (error == GIT_ENOTFOUND) {
error = GIT_SUCCESS;
cfg->reader.read_ptr = NULL;
cfg->reader.eof = 1;
data_start = NULL;
cfg->reader.buffer.len = 0;
cfg->reader.buffer.data = NULL;
} else {
cfg->reader.read_ptr = cfg->reader.buffer.data; cfg->reader.read_ptr = cfg->reader.buffer.data;
cfg->reader.eof = 0; cfg->reader.eof = 0;
data_start = cfg->reader.read_ptr; data_start = cfg->reader.read_ptr;
}
/* Lock the file */ /* Lock the file */
error = git_filebuf_open(&file, cfg->file_path, 0); error = git_filebuf_open(&file, cfg->file_path, 0);