mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Fix concerns in platform_directory_delete.\n\n Not sure about fts_close when passing NULL yet. Leaving this commit as a marker

Browse Source
This commit is contained in:
Ruben De Smet
2016-01-11 14:28:24 +01:00
parent 012ff3adbc
commit e035c7984a
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/platform/posix.c
View File

@@ -185,14 +185,16 @@ bool platform_directory_delete(const utf8 *path)
utf8* const patharray[2] = {ourPath, NULL};
if ((ftsp = fts_open(patharray, FTS_COMFOLLOW | FTS_LOGICAL | FTS_NOCHDIR, NULL)) == NULL) {
log_error("fts_open returned NULL");
return 0;
free(ourPath);
return false;
}
chp = fts_children(ftsp, 0);
if (chp == NULL) {
log_verbose("No files to traverse, deleting directory %s", path);
remove(path);
return 1; // No files to traverse
free(ourPath);
return true; // No files to traverse
}
while ((p = fts_read(ftsp)) != NULL) {
@@ -205,21 +207,21 @@ bool platform_directory_delete(const utf8 *path)
log_error("Could not remove %s", p->fts_path);
fts_close(ftsp);
free(ourPath);
return 0;
return false;
}
break;
case FTS_ERR:
log_error("Error traversing %s", path);
fts_close(ftsp);
free(ourPath);
return 0;
return false;
}
}
free(ourPath);
fts_close(ftsp);
return 1;
return true;
}
bool platform_lock_single_instance()