Ticket #4720: delete resource forks on macOS last to avoid recursive delete failures

Signed-off-by: Yury V. Zaytsev <yury@shurup.com>

Author: zyv

lib/fs.h

@@ -108,6 +108,11 @@
 #define DIR_IS_DOT(x)     ((x)[0] == '.' && (x)[1] == '\0')
 #define DIR_IS_DOTDOT(x)  ((x)[0] == '.' && (x)[1] == '.' && (x)[2] == '\0')
 
+/* On macOS, if a file system doesn't support resource forks, metadata is automatically stored in
+ * shadow files beginning with `._`. They are automatically managed by the OS and will reappear if
+ * deleted. */
+#define FILE_IS_RESOURCE_FORK(x) ((x)[0] == '.' && (x)[1] == '_' && (x)[2] != '\0')
+
 /*** enums ***************************************************************************************/
 
 /*** structures declarations (and typedefs of structures)*****************************************/

src/filemanager/file.c

@@ -1436,9 +1436,14 @@ try_erase_dir (file_op_context_t *ctx, const vfs_path_t *vpath)
   abort -> cancel stack
   ignore -> warn every level, gets default
   ignore_all -> remove as much as possible
+
+  This function should either be called with delete_resource_forks = TRUE always, or called twice,
+  first with FALSE and then with TRUE to make sure that no errors pop up due to resource forks being
+  deleted on macOS and then being re-created on the fly by the OS.
 */
 static FileProgressStatus
-recursive_erase (file_op_context_t *ctx, const vfs_path_t *vpath)
+recursive_erase (file_op_context_t *ctx, const vfs_path_t *vpath,
+                 const gboolean delete_resource_forks)
 {
     struct vfs_dirent *next;
     DIR *reading;
@@ -1464,9 +1469,18 @@ recursive_erase (file_op_context_t *ctx, const vfs_path_t *vpath)
             return FILE_RETRY;
         }
         if (S_ISDIR (buf.st_mode))
-            return_status = recursive_erase (ctx, tmp_vpath);
+        {
+            return_status = recursive_erase (ctx, tmp_vpath, FALSE);
+            if (return_status != FILE_ABORT)
+                return_status = recursive_erase (ctx, tmp_vpath, TRUE);
+        }
         else
-            return_status = erase_file (ctx, tmp_vpath);
+        {
+            if (delete_resource_forks || !FILE_IS_RESOURCE_FORK (next->d_name))
+                return_status = erase_file (ctx, tmp_vpath);
+            else
+                return_status = FILE_SKIP;
+        }
         vfs_path_free (tmp_vpath, TRUE);
     }
     mc_closedir (reading);
@@ -3390,7 +3404,11 @@ erase_dir (file_op_context_t *ctx, const vfs_path_t *vpath)
         // not empty
         error = query_recursive (ctx, vfs_path_as_str (vpath));
         if (error == FILE_CONT)
-            error = recursive_erase (ctx, vpath);
+        {
+            error = recursive_erase (ctx, vpath, FALSE);
+            if (error != FILE_ABORT)
+                error = recursive_erase (ctx, vpath, TRUE);
+        }
         return error;
     }