mirrors/zathura
1
0
Fork 0
mirror of https://git.pwmt.org/pwmt/zathura.git synced 2024-12-28 19:06:01 +01:00
Code Issues Projects Releases Packages Wiki Activity

don't use _from_fd variants

Browse source
This commit is contained in:
Sebastian Ramacher 2011-11-21 16:40:26 +01:00
parent f8f48dcc7d
commit d613fd41ac
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
database-plain.c
View file

@ -1,5 +1,7 @@
/* See LICENSE file for license and copyright information */ /* See LICENSE file for license and copyright information */
#define _POSIX_SOURCE
#include <glib.h> #include <glib.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -295,28 +297,26 @@ zathura_db_read_key_file_from_file(const char* path)
} }
/* open file */ /* open file */
int fd = open(path, O_RDWR); FILE* file = fopen(path, "r");
if (fd == -1) { if (file == NULL) {
return NULL; return NULL;
} }
GKeyFile* key_file = g_key_file_new(); GKeyFile* key_file = g_key_file_new();
if (key_file == NULL) { if (key_file == NULL) {
close(fd); fclose(file);
return NULL; return NULL;
} }
/* read config file */ /* read config file */
file_lock_set(fd, F_WRLCK); file_lock_set(fileno(file), F_WRLCK);
char* content = girara_file_read_from_fd(fd); char* content = girara_file_read2(file);
file_lock_set(fileno(file), F_UNLCK);
fclose(file);
if (content == NULL) { if (content == NULL) {
file_lock_set(fd, F_UNLCK); g_key_file_free(key_file);
close(fd);
return NULL; return NULL;
} }
file_lock_set(fd, F_UNLCK);
close(fd);
/* parse config file */ /* parse config file */
size_t contentlen = strlen(content); size_t contentlen = strlen(content);
@ -369,7 +369,9 @@ zathura_db_write_key_file_to_file(const char* file, GKeyFile* key_file)
} }
file_lock_set(fd, F_WRLCK); file_lock_set(fd, F_WRLCK);
write(fd, content, strlen(content)); if (write(fd, content, strlen(content)) == 0) {
girara_error("Failed to write to %s", file);
}
file_lock_set(fd, F_UNLCK); file_lock_set(fd, F_UNLCK);
close(fd); close(fd);