Changeset 687 for trunk/src

Timestamp:

Dec 8, 2006, 6:42:29 AM (19 years ago)

Author:

bird

Message:

Ignore EPERM and EACCES too (rmdir . on win).

File:

• trunk/src/gmake/kmkbuiltin/rmdir.c (modified) (2 diffs)

trunk/src/gmake/kmkbuiltin/rmdir.c

@@ -119 +119 @@
         for (errors = 0; *argv; argv++) {
                 if (rmdir(*argv) < 0) {
-                        if (    (!ignore_fail_on_non_empty || errno != ENOTEMPTY)
+                        if (    (!ignore_fail_on_non_empty || (errno != ENOTEMPTY && errno != EPERM && errno != EACCES))
                                 &&      (!ignore_fail_on_not_exist || errno != ENOENT)) {
                                 warn("%s", *argv);
@@ -168 +168 @@
 
                 if (rmdir(path) < 0) {
-                        if (ignore_fail_on_non_empty && errno == ENOTEMPTY)
+                        if (ignore_fail_on_non_empty && (errno == ENOTEMPTY ||  errno == EPERM || errno == EACCES))
                                 break;
                         if (!ignore_fail_on_not_exist || errno != ENOENT) {