Changeset 1151 for trunk/src/kmk/kmkbuiltin

Timestamp:

Sep 28, 2007, 1:39:37 AM (18 years ago)

Author:

bird

Message:

On solaris rmdir returns EEXIST instead of ENOTEMPTY.

File:

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

trunk/src/kmk/kmkbuiltin/rmdir.c

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