remove extra check before removing (for now)

(fixes theimpossibleastronaut#283)
FS-make-simple · Apr 28, 2021 · 67d47a9 · 67d47a9
1 parent d359bfb
commit 67d47a9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,9 @@
 === rmw ChangeLog ===
 
+2021-04-28
+
+  * bugfix: fixes test failing on osx using xcode 11.5 and above (#283)
+
 2021-04-26
 
   * rmw v0.7.07 released

diff --git a/src/purging_rmw.c b/src/purging_rmw.c
@@ -120,17 +120,14 @@ rmdir_recursive (const char *dirname, short unsigned level,
     {
       if (!S_ISDIR (st.st_mode))
       {
-        if (exists (st_dirname_properties.path))
+        if (remove (st_dirname_properties.path) == 0)
         {
-          if (remove (st_dirname_properties.path) == 0)
-          {
-            deleted_files_ctr++;
-            bytes_freed += st.st_size;
-          }
-          else
-          {
-            perror ("rmdir_recursive -> remove");
-          }
+          deleted_files_ctr++;
+          bytes_freed += st.st_size;
+        }
+        else
+        {
+          perror ("rmdir_recursive -> remove");
         }
       }
       else
@@ -440,12 +437,7 @@ purge (st_config * st_config_data,
         else
         {
           if (cli_user_options->want_dry_run == false)
-          {
-            if (exists (corresponding_file_to_purge))
-              status = remove (corresponding_file_to_purge);
-            else
-              status = -1;
-          }
+            status = remove (corresponding_file_to_purge);
           else
             status = 0;
           if (status == 0)