From cdd4ccf16ff6ccc202d3422fcd0ec7ca9f3a8229 Mon Sep 17 00:00:00 2001 From: Klemens Nanni Date: Fri, 11 Jun 2021 12:30:58 +0000 Subject: Open save file once in uiLoad() and keep it open until uiSave() Opening the same file *path* twice is a TOCTOU, although not a critical one: worst case we load from one file and save to another - the impact depends on how and when catgirl is started the next anyway. More importantly, keeping the file handle open at runtime allows us to drop all filesystem related promises for `-s/save' on OpenBSD. uiLoad() now opens "r+", meaning "Open for reading and writing." up front so uiSave() can write to it. In the case of a nonexistent save file, it now opens with "w" meaning "Open for writing. The file is created if it does not exist.", i.e. the same write/create semantics as "w" except uiLoad() no longer truncates. existing files. uiSave() now truncates the save file to avoid appending in general. --- chat.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chat.h') diff --git a/chat.h b/chat.h index 327262b..8c99cf5 100644 --- a/chat.h +++ b/chat.h @@ -312,7 +312,7 @@ void uiFormat( uint id, enum Heat heat, const time_t *time, const char *format, ... ) __attribute__((format(printf, 4, 5))); void uiLoad(const char *name); -int uiSave(const char *name); +int uiSave(void); enum { BufferCap = 1024 }; struct Buffer; -- cgit 1.4.1