commit 12f9b207a477abc215b1e40ba46149e8e9724307
Author: Raniconduh <clagv.randomgames@gmail.com>
Date: Fri May 05 11:04:43 2023 +0000
Set nopenfds in nftw() to a nonzero value & fix missing strerror() call
diff --git a/src/dir.c b/src/dir.c
index 974f2a3..9ad42bc 100644
--- a/src/dir.c
+++ b/src/dir.c
@@ -3127 +3127 @@ static int nftw_file_remove(const char * fp, const struct stat * sb, int tf, str
static size_t count_files(struct dir_entry_t * de) {
file_count = 0;
- nftw(de->name, nftw_file_count, 0, FTW_MOUNT | FTW_PHYS);
+ nftw(de->name, nftw_file_count, 1, FTW_MOUNT | FTW_PHYS);
return file_count;
}
@@ -3217 +3217 @@ static size_t count_files(struct dir_entry_t * de) {
static int remove_tree(struct dir_entry_t * de) {
remove_all_failed = 0;
- nftw(de->name, nftw_file_remove, 0, FTW_MOUNT | FTW_PHYS | FTW_DEPTH);
+ nftw(de->name, nftw_file_remove, 1, FTW_MOUNT | FTW_PHYS | FTW_DEPTH);
return remove_all_failed;
}
@@ -3507 +3507 @@ int remove_file(struct dir_entry_t * de) {
int ret;
if ((ret = remove(de->name)) < 0) {
- display_info(INFO_ERR, "%s: Remove failed (%s)", de->name, errno);
+ display_info(INFO_ERR, "%s: Remove failed (%s)", de->name, strerror(errno));
}
return ret < 0 ? 1 : 0;
