stephenseo/SimpleArchiver
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Packages Wiki Activity Actions

More robust cleanup of temporary file

Browse source
This commit is contained in:
Stephen Seo 2024-07-18 22:08:48 +09:00
parent 1d85ddd0e9
commit 7046dfb1e5
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/archiver.c
View file

@ -72,6 +72,17 @@ int write_list_datas_fn(void *data, void *ud) {
return 0; return 0;
} }
void cleanup_temp_filename_delete(char **tmpfilename) {
#if SIMPLE_ARCHIVER_PLATFORM == SIMPLE_ARCHIVER_PLATFORM_COSMOPOLITAN || \
SIMPLE_ARCHIVER_PLATFORM == SIMPLE_ARCHIVER_PLATFORM_MAC || \
SIMPLE_ARCHIVER_PLATFORM == SIMPLE_ARCHIVER_PLATFORM_LINUX
if (tmpfilename && *tmpfilename) {
unlink(*tmpfilename);
*tmpfilename = NULL;
}
#endif
}
int write_files_fn(void *data, void *ud) { int write_files_fn(void *data, void *ud) {
const SDArchiverFileInfo *file_info = data; const SDArchiverFileInfo *file_info = data;
SDArchiverState *state = ud; SDArchiverState *state = ud;
@ -315,6 +326,8 @@ int write_files_fn(void *data, void *ud) {
// Get compressed file length. // Get compressed file length.
// Compressed file should be at "temp_filename". // Compressed file should be at "temp_filename".
tmp_fd = fopen(temp_filename, "rb"); tmp_fd = fopen(temp_filename, "rb");
__attribute__((cleanup(cleanup_temp_filename_delete))) char
*temp_filename_cleanup_reference = temp_filename;
long end; long end;
if (fseek(tmp_fd, 0, SEEK_END) != 0) { if (fseek(tmp_fd, 0, SEEK_END) != 0) {
// Error seeking. // Error seeking.
@ -362,7 +375,6 @@ int write_files_fn(void *data, void *ud) {
// Cleanup. // Cleanup.
free_FILE_helper(&tmp_fd); free_FILE_helper(&tmp_fd);
unlink(temp_filename);
#endif #endif
} else { } else {
uint16_t u16; uint16_t u16;