Changeset 695 in kBuild

Timestamp:

Dec 9, 2006 3:38:55 PM (18 years ago)

Author:

bird

Message:

Ignore EINVAL too so rmdir . doesn't fail when we're trying to ignore failures.

Location:

trunk

Files:

• kBuild/bin/x86.linux/kmk (modified) ( previous)
• kBuild/bin/x86.linux/kmk_rmdir (modified) ( previous)
• kBuild/bin/x86.linux/kmk_sed (modified) ( previous)
• src/gmake/kmkbuiltin/rmdir.c (modified) (2 diffs)

trunk/src/gmake/kmkbuiltin/rmdir.c

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