Changeset 685 for trunk/src/gmake/kmkbuiltin/rmdir.c

Timestamp:

Dec 8, 2006, 5:14:44 AM (19 years ago)

Author:

bird

Message:

ignore-fail-on-not-exist

File:

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

trunk/src/gmake/kmkbuiltin/rmdir.c

@@ -62 +62 @@
 static int vflag;
 static int ignore_fail_on_non_empty;
+static int ignore_fail_on_not_exist;
 
 static struct option long_options[] =
 {
     { "ignore-fail-on-non-empty",   no_argument, 0, 260 },
+    { "ignore-fail-on-not-exist",   no_argument, 0, 261 },
     { "parents",                    no_argument, 0, 'p' },
     { "verbose",                    no_argument, 0, 'v' },
@@ -78 +80 @@
 
         /* reinitialize globals */
-        ignore_fail_on_non_empty = vflag = pflag = 0;
+        ignore_fail_on_not_exist = ignore_fail_on_non_empty = vflag = pflag = 0;
         
         /* kmk: reset getopt and set progname */
@@ -102 +104 @@
                         ignore_fail_on_non_empty = 1;
                         break;
+                case 261:
+                        ignore_fail_on_not_exist = 1;
+                        break;
                 case '?':
                 default:
@@ -114 +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)
+                                &&      (!ignore_fail_on_not_exist || errno != ENOENT)) {
                                 warn("%s", *argv);
                                 errors = 1;
@@ -162 +168 @@
 
                 if (rmdir(path) < 0) {
-                        if (ignore_fail_on_non_empty && errno != ENOTEMPTY)
+                        if (ignore_fail_on_non_empty && errno == ENOTEMPTY)
                                 break;
-                        warn("%s", path);
-                        return (1);
+                        if (!ignore_fail_on_not_exist || errno != ENOENT) {
+                                warn("%s", path);
+                                return (1);
+                        }
                 }
                 if (vflag)
@@ -178 +186 @@
 {
 
-        (void)fprintf(stderr, "usage: rmdir [-pv] directory ...\n");
+        (void)fprintf(stderr, "usage: rmdir [-pv --ignore-fail-on-non-empty --ignore-fail-on-not-exist] directory ...\n");
         return 1;
 }