Changeset 2861 for trunk/src/kmk/dir-nt-bird.c

Timestamp:

Sep 2, 2016, 12:42:55 AM (9 years ago)

Author:

bird

Message:

Updates

File:

• trunk/src/kmk/dir-nt-bird.c (modified) (3 diffs)

trunk/src/kmk/dir-nt-bird.c

@@ -235 +235 @@
 {
     KMKNTOPENDIR *pDir = (KMKNTOPENDIR *)pvDir;
-    while (pDir->idxNext < pDir->pDir->cChildren)
+    KU32 const    cChildren = pDir->pDir->cChildren;
+    while (pDir->idxNext < cChildren)
     {
         PKFSOBJ pEntry = pDir->pDir->papChildren[pDir->idxNext++];
@@ -267 +268 @@
         }
     }
+
+    /*
+     * Fake the '.' and '..' directories because they're not part of papChildren above.
+     */
+    if (pDir->idxNext < cChildren + 2)
+    {
+        pDir->idxNext++;
+        pDir->DirEnt.d_type    = DT_DIR;
+        pDir->DirEnt.d_namlen  = pDir->idxNext - cChildren;
+        pDir->DirEnt.d_reclen  = offsetof(struct dirent, d_name) + pDir->DirEnt.d_namlen;
+        pDir->DirEnt.d_name[0] = '.';
+        pDir->DirEnt.d_name[1] = '.';
+        pDir->DirEnt.d_name[pDir->DirEnt.d_namlen] = '\0';
+        return &pDir->DirEnt;
+    }
+
     return NULL;
 }
@@ -457 +474 @@
 int stat_only_mtime(const char *pszPath, struct stat *pStat)
 {
-    if (commands_started == 0)
-    {
-        KFSLOOKUPERROR  enmError;
-        PKFSOBJ         pPathObj = kFsCacheLookupA(g_pFsCache, pszPath, &enmError);
-        if (pPathObj)
-        {
-            if (pPathObj->bObjType != KFSOBJ_TYPE_MISSING)
-            {
-                kHlpAssert(pPathObj->fHaveStats); /* currently always true. */
-                pStat->st_mtime = pPathObj->Stats.st_mtime;
-                kFsCacheObjRelease(g_pFsCache, pPathObj);
-                return 0;
-            }
-
+    KFSLOOKUPERROR  enmError;
+    PKFSOBJ         pPathObj = kFsCacheLookupA(g_pFsCache, pszPath, &enmError);
+    if (pPathObj)
+    {
+        if (pPathObj->bObjType != KFSOBJ_TYPE_MISSING)
+        {
+            kHlpAssert(pPathObj->fHaveStats); /* currently always true. */
+            pStat->st_mtime = pPathObj->Stats.st_mtime;
             kFsCacheObjRelease(g_pFsCache, pPathObj);
-            errno = ENOENT;
-        }
-        else
-            errno =    enmError == KFSLOOKUPERROR_NOT_DIR
-                    || enmError == KFSLOOKUPERROR_PATH_COMP_NOT_DIR
-                  ? ENOTDIR : ENOENT;
-        return -1;
-    }
-    /** @todo implement cache refreshing.   */
-    return birdStatFollowLink(pszPath, pStat);
-}
-
+            return 0;
+        }
+
+        kFsCacheObjRelease(g_pFsCache, pPathObj);
+        errno = ENOENT;
+    }
+    else
+        errno =    enmError == KFSLOOKUPERROR_NOT_DIR
+                || enmError == KFSLOOKUPERROR_PATH_COMP_NOT_DIR
+              ? ENOTDIR : ENOENT;
+    return -1;
+}
+
+
+/**
+ * Invalidate missing bits of the directory cache.
+ *
+ * This is called each time a make job completes.
+ */
+void dir_cache_invalid_missing(void)
+{
+    kFsCacheInvalidateMissing(g_pFsCache);
+}
+