mirrors/zathura
1
0
Fork 0
mirror of https://git.pwmt.org/pwmt/zathura.git synced 2024-11-10 21:03:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

database-plain: Lock file when reading

Browse Source
This commit is contained in:
Moritz Lipp 2011-10-14 01:24:42 +02:00
parent b0007bf2de
commit 554e6eb70c
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
database-plain.c
View File

@ -295,25 +295,47 @@ zathura_db_read_key_file_from_file(char* path)
return NULL;
}
GKeyFile* key_file = g_key_file_new();
if (key_file == NULL) {
/* open file */
int fd = open(path, O_RDWR);
if (fd == -1) {
return NULL;
}
GKeyFile* key_file = g_key_file_new();
if (key_file == NULL) {
close(fd);
return NULL;
}
/* read config file */
file_lock_set(fd, F_WRLCK);
char* content = girara_file_read_from_fd(fd);
if (content == NULL) {
file_lock_set(fd, F_UNLCK);
close(fd);
return NULL;
}
file_lock_set(fd, F_UNLCK);
close(fd);
/* parse config file */
GError* error = NULL;
if (g_key_file_load_from_file(key_file, path,
if (g_key_file_load_from_data(key_file, content, strlen(content),
G_KEY_FILE_KEEP_COMMENTS | G_KEY_FILE_KEEP_TRANSLATIONS, &error) ==
FALSE) {
if (error->code != 1) /* ignore empty file */ {
free(content);
g_key_file_free(key_file);
return NULL;
g_error_free(error);
return NULL;
}
g_error_free(error);
}
free(content);
return key_file;
}