commit 2af09bdfa4564334763c853c8a644184f2e8b1ee
Author: rani <clagv.randomgames@gmail.com>
Date: Thu May 04 20:02:22 2023 +0000
Remove second prompt when removing an empty directory
diff --git a/src/dir.c b/src/dir.c
index 3d90de8..974f2a3 100644
--- a/src/dir.c
+++ b/src/dir.c
@@ -33219 +33228 @@ int remove_file(struct dir_entry_t * de) {
if (de->file_type == FILE_DIR) {
size_t f_count = count_files(de);
- char * REMOVE_FILE_PROMPT = "This action will remove %zu files. Continue?";
- int plen = snprintf(NULL, 0, REMOVE_FILE_PROMPT, f_count);
- char * p = malloc(plen + 1);
- snprintf(p, plen + 1, REMOVE_FILE_PROMPT, f_count);
-
- char * r = prompt(p, (char*[]){"No", "Yes", NULL});
- free(p);
+ // empty directories can be removed directly
+ // (f_count of 1 means only the directory and nothing in it)
+ if (f_count > 1) {
+ char * REMOVE_FILE_PROMPT = "This action will remove the directory '%s' and all %zu files inside it. Continue?";
+ int plen = snprintf(NULL, 0, REMOVE_FILE_PROMPT, de->name, f_count - 1);
+ char * p = malloc(plen + 1);
+ snprintf(p, plen + 1, REMOVE_FILE_PROMPT, de->name, f_count - 1);
+
+ char * r = prompt(p, (char*[]){"No", "Yes", NULL});
+ free(p);
+
+ if (r && !strcmp(r, "Yes")) return remove_tree(de);
+ return -1;
+ }
+ }
- if (r && !strcmp(r, "Yes")) return remove_tree(de);
- return -1;
- } else {
- return remove(de->name) < 0 ? 1 : 0;
+ int ret;
+ if ((ret = remove(de->name)) < 0) {
+ display_info(INFO_ERR, "%s: Remove failed (%s)", de->name, errno);
}
+
+ return ret < 0 ? 1 : 0;
}
