Changeset 2912 for trunk/src/kmk/kmkbuiltin/rmdir.c

Timestamp:

Sep 14, 2016, 3:36:15 PM (9 years ago)

Author:

bird

Message:

rewrote kmk_redirect to skip the separate process. Added chache invalidation after directory deletion for addressing kmk rebuild and fetching.

File:

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

trunk/src/kmk/kmkbuiltin/rmdir.c

@@ -60 +60 @@
 # include "mscfakes.h"
 #endif
+#if defined(KMK) && defined(KBUILD_OS_WINDOWS)
+extern int dir_cache_deleted_directory(const char *pszDir);
+#endif
 
 static int rm_path(char *);
@@ -135 +138 @@
                                 continue;
                         /* (only ignored doesn't exist errors fall thru) */
-                } else if (vflag) {
-                        printf("%s\n", *argv);
+                } else {
+#if defined(KMK) && defined(KBUILD_OS_WINDOWS)
+                        dir_cache_deleted_directory(*argv);
+#endif
+                        if (vflag) {
+                                printf("%s\n", *argv);
+                        }
                 }
                 if (pflag)
@@ -178 +186 @@
 
                 if (rmdir(path) < 0) {
-                        if (ignore_fail_on_non_empty && (errno == ENOTEMPTY || errno == EPERM || errno == EACCES || errno == EINVAL || errno == EEXIST))
+                        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) {
@@ -185 +194 @@
                         }
                 }
+#if defined(KMK) && defined(KBUILD_OS_WINDOWS)
+                else {
+                        dir_cache_deleted_directory(path);
+                }
+#endif
                 if (vflag)
                         printf("%s\n", path);