commit 391f365c6d64d3223adc4cbd6b2fb558416ccceb
author Benoit Goby <benoit@android.com> Tue Jan 15 18:43:01 2013 -0800
committer Benoit Goby <benoit@android.com> Mon Mar 25 19:59:21 2013 -0700
tree 19a83f8fee64eee76cfcca444b6a8b003f557e59
parent d15715e5a085dc052ab462799950622f844b0059

toolbox: Fix rm -f with multiple files

Only check errno if unlink returns -1.
Continue instead of exiting if one file does not exist.

Change-Id: Iaf01b8523b84e87fcb0d732b89b7be6e24279c0b

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;
             }
         }