Changeset 982 for trunk/src

Timestamp:

May 27, 2007, 10:41:16 PM (18 years ago)

Author:

bird

Message:

ignore_fail_on_not_exist should influence the out loop too.

File:

• trunk/src/kmk/kmkbuiltin/rmdir.c (modified) (1 diff)

trunk/src/kmk/kmkbuiltin/rmdir.c

@@ -115 +115 @@
                 if (rmdir(*argv) < 0) {
                         if (    (!ignore_fail_on_non_empty || (errno != ENOTEMPTY && errno != EPERM && errno != EACCES && errno != EINVAL))
-                                &&      (!ignore_fail_on_not_exist || errno != ENOENT)) {
+                            &&  (!ignore_fail_on_not_exist || errno != ENOENT)) {
                                 warn("%s", *argv);
                                 errors = 1;
+                                continue;
                         }
-                } else {
-                        if (vflag)
-                                printf("%s\n", *argv);
-                        if (pflag)
-                                errors |= rm_path(*argv);
+                        if (!ignore_fail_on_not_exist || errno != ENOENT)
+                                continue;
+                        /* (only ignored doesn't exist errors fall thru) */
+                } else if (vflag) {
+                        printf("%s\n", *argv);
                 }
+                if (pflag)
+                        errors |= rm_path(*argv);
         }