commit cf0b4d94fae2009daaed135124971625dfece77b
author Ken Sumrall <ksumrall@android.com> Fri Jun 28 02:47:00 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 28 02:47:01 2013 +0000
tree c7ca97a3e977187c24cfeb4ab23d882aae989673
parent 3b2b2b51376b1cf9da21155dacd8d9df106bf92d
parent 035482976368dea4ddbda62230a6ec69025a65c3

Merge "Do not exit early on errors when -f is specified"

toolbox/rm.c

diff --git a/toolbox/rm.c b/toolbox/rm.c
index 127cbc4..957b586 100644
--- a/toolbox/rm.c
+++ b/toolbox/rm.c
@@ -45,8 +45,10 @@
             continue;
         sprintf(dn, "%s/%s", name, de->d_name);
         if (unlink_recursive(dn, flags) < 0) {
-            fail = 1;
-            break;
+            if (!(flags & OPT_FORCE)) {
+                fail = 1;
+                break;
+            }
         }
         errno = 0;
     }
@@ -71,6 +73,7 @@
     int ret;
     int i, c;
     int flags = 0;
+    int something_failed = 0;
 
     if (argc < 2)
         return usage();
@@ -110,10 +113,14 @@
 
         if (ret < 0) {
             fprintf(stderr, "rm failed for %s, %s\n", argv[i], strerror(errno));
-            return -1;
+            if (!(flags & OPT_FORCE)) {
+                return -1;
+            } else {
+                something_failed = 1;
+            }
         }
     }
 
-    return 0;
+    return something_failed;
 }