commit 82075a4044efe57ad9bad3d18982e311b4ef53ae
author Benoit Goby <benoit@android.com> Tue Mar 26 19:16:23 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 26 19:16:23 2013 +0000
tree 0470fa4f153d85feb5e2a84f3d1d868672f6a6ae
parent df115f3386cb48493a8efa2d998f4cd9b38ec536
parent 391f365c6d64d3223adc4cbd6b2fb558416ccceb

Merge "toolbox: Fix rm -f with multiple files"

toolbox/rm.c

diff --git a/toolbox/rm.c b/toolbox/rm.c
index 3a24bec..127cbc4 100644
--- a/toolbox/rm.c
+++ b/toolbox/rm.c
@@ -103,8 +103,8 @@
             ret = unlink_recursive(argv[i], flags);
         } else {
             ret = unlink(argv[i]);
-            if (errno == ENOENT && (flags & OPT_FORCE)) {
-                return 0;
+            if (ret < 0 && errno == ENOENT && (flags & OPT_FORCE)) {
+                continue;
             }
         }