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

Check locking errors

Browse Source
This commit is contained in:
Sebastian Ramacher 2019-01-18 21:10:26 +01:00
parent a8f377f0fe
commit 34ee70f3d6
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
zathura/database-plain.c
View File

@ -653,10 +653,15 @@ zathura_db_read_key_file_from_file(const char* path)
} }
/* open file */ /* open file */
FILE* file = fopen(path, "rw"); FILE* file = fopen(path, "r+");
if (file == NULL) { if (file == NULL) {
return NULL; return NULL;
} }
/* and lock it */
if (file_lock_set(fileno(file), F_WRLCK) != 0) {
fclose(file);
return NULL;
}
GKeyFile* key_file = g_key_file_new(); GKeyFile* key_file = g_key_file_new();
if (key_file == NULL) { if (key_file == NULL) {
@ -665,7 +670,6 @@ zathura_db_read_key_file_from_file(const char* path)
} }
/* read config file */ /* read config file */
file_lock_set(fileno(file), F_WRLCK);
char* content = girara_file_read2(file); char* content = girara_file_read2(file);
fclose(file); fclose(file);
if (content == NULL) { if (content == NULL) {
@ -728,8 +732,7 @@ zathura_db_write_key_file_to_file(const char* file, GKeyFile* key_file)
return; return;
} }
file_lock_set(fd, F_WRLCK); if (file_lock_set(fd, F_WRLCK) != 0 || write(fd, content, strlen(content)) == 0) {
if (write(fd, content, strlen(content)) == 0) {
girara_error("Failed to write to %s", file); girara_error("Failed to write to %s", file);
} }
close(fd); close(fd);
@ -782,7 +785,10 @@ plain_io_read(GiraraInputHistoryIO* db)
} }
/* read input history file */ /* read input history file */
file_lock_set(fileno(file), F_RDLCK); if (file_lock_set(fileno(file), F_RDLCK) != 0) {
fclose(file);
return NULL;
}
char* content = girara_file_read2(file); char* content = girara_file_read2(file);
fclose(file); fclose(file);
@ -813,7 +819,10 @@ plain_io_append(GiraraInputHistoryIO* db, const char* input)
} }
/* read input history file */ /* read input history file */
file_lock_set(fileno(file), F_WRLCK); if (file_lock_set(fileno(file), F_WRLCK) != 0) {
fclose(file);
return;
}
char* content = girara_file_read2(file); char* content = girara_file_read2(file);
rewind(file); rewind(file);