Changeset 2857 in kBuild for trunk/src/lib/nt/kFsCache.c

Timestamp:

Sep 1, 2016 3:39:51 AM (9 years ago)

Author:

bird

Message:

updates

File:

• trunk/src/lib/nt/kFsCache.c (modified) (3 diffs)

trunk/src/lib/nt/kFsCache.c

@@ -494 +494 @@
     {
         if (pchDot[1] != '.')
-            pchDot = (const char *)kHlpMemChr(pchDot + 1, '.', &pszPath[cchPath] - pchDot - 1);
+        {
+            pchDot++;
+            pchDot = (const char *)kHlpMemChr(pchDot, '.', &pszPath[cchPath] - pchDot);
+        }
         else
         {
             char ch;
-            if (   (ch = pchDot[2]) == '\0'
+            if (   (ch = pchDot[2]) != '\0'
                 && IS_SLASH(ch))
             {
@@ -529 +532 @@
     {
         if (pwcDot[1] != '.')
-            pwcDot = wmemchr(pwcDot + 1, '.', &pwszPath[cwcPath] - pwcDot - 1);
+        {
+            pwcDot++;
+            pwcDot = wmemchr(pwcDot, '.', &pwszPath[cwcPath] - pwcDot);
+        }
         else
         {
             wchar_t wch;
-            if (   (wch = pwcDot[2]) == '\0'
+            if (   (wch = pwcDot[2]) != '\0'
                 && IS_SLASH(wch))
             {
@@ -1155 +1161 @@
     *penmError = KFSLOOKUPERROR_DIR_READ_ERROR;
     return K_TRUE;
+}
+
+
+/**
+ * Does the initial directory populating or refreshes it if it has been
+ * invalidated.
+ *
+ * This assumes the parent directory is opened.
+ *
+ * @returns K_TRUE on success, K_FALSE on error.
+ * @param   pCache              The cache.
+ * @param   pDir                The directory.
+ * @param   penmError           Where to store K_FALSE explanation.  Optional.
+ */
+KBOOL kFsCacheDirEnsurePopuplated(PKFSCACHE pCache, PKFSDIR pDir, KFSLOOKUPERROR *penmError)
+{
+    KFSLOOKUPERROR enmIgnored;
+    if (   pDir->fPopulated
+        && (   pDir->Obj.uCacheGen == KFSOBJ_CACHE_GEN_IGNORE
+            || pDir->Obj.uCacheGen == pCache->uGeneration) )
+        return K_TRUE;
+    return kFsCachePopuplateOrRefreshDir(pCache, pDir, penmError ? penmError : &enmIgnored);
 }