Changeset 3005 for trunk/src/lib/nt/ntdir.c

Timestamp:

Nov 6, 2016, 1:07:37 AM (9 years ago)

Author:

bird

Message:

fts-nt.c: Wide char support, part 4.

File:

• trunk/src/lib/nt/ntdir.c (modified) (5 diffs)

trunk/src/lib/nt/ntdir.c

@@ -115 +115 @@
 BirdDir_T *birdDirOpenFromHandle(void *pvHandle, const void *pvReserved, unsigned fFlags)
 {
-    if (!pvReserved)
+    if (!pvReserved && !(fFlags & BIRDDIR_F_STATIC_ALLOC))
     {
         /*
@@ -138 +138 @@
     }
     else
+    {
+        assert(!(fFlags & BIRDDIR_F_STATIC_ALLOC));
         assert(pvReserved == NULL);
-    birdSetErrnoToNoMem();
+    }
+    birdSetErrnoToInvalidArg();
+    return NULL;
+}
+
+
+/**
+ * Special API that takes a preallocated BirdDir_T and can be called again
+ * without involving birdDirClose.
+ *
+ *
+ */
+BirdDir_T *birdDirOpenFromHandleWithReuse(BirdDir_T *pDir, void *pvHandle, const void *pvReserved, unsigned fFlags)
+{
+    if (!pvReserved)
+    {
+        /*
+         * Allocate and initialize the directory enum handle.
+         */
+        if (pDir)
+        {
+            if (pDir->uMagic == BIRD_DIR_MAGIC)
+            {
+                if (   (pDir->fFlags & BIRDDIR_F_CLOSE_HANDLE)
+                    && pDir->pvHandle != INVALID_HANDLE_VALUE)
+                    birdCloseFile((HANDLE)pDir->pvHandle);
+            }
+            else
+            {
+                pDir->cbBuf     = 0;
+                pDir->pabBuf    = NULL;
+                pDir->uMagic    = BIRD_DIR_MAGIC;
+            }
+            pDir->pvHandle      = pvHandle;
+            pDir->fFlags        = fFlags;
+            pDir->uDev          = 0;
+            pDir->offPos        = 0;
+            pDir->fHaveData     = 0;
+            pDir->fFirst        = 1;
+            pDir->iInfoClass    = fFlags & BIRDDIR_F_EXTRA_INFO ? MyFileIdFullDirectoryInformation : MyFileNamesInformation;
+            pDir->offBuf        = 0;
+            return pDir;
+        }
+    }
+    else
+        assert(pvReserved == NULL);
+    birdSetErrnoToInvalidArg();
     return NULL;
 }
@@ -174 +222 @@
             pDir->uDev = 0;
 
-        /*
-         * Allocate a buffer.
-         */
-        pDir->cbBuf = 0x20000;
-        pDir->pabBuf = birdMemAlloc(pDir->cbBuf);
         if (!pDir->pabBuf)
-            return birdSetErrnoToNoMem();
+        {
+            /*
+             * Allocate a buffer.
+             *
+             * Better not exceed 64KB or CIFS may throw a fit.  Also, on win10/64
+             * here there is a noticable speedup when going one byte below 64KB.
+             */
+            pDir->cbBuf = 0xffe0;
+            pDir->pabBuf = birdMemAlloc(pDir->cbBuf);
+            if (!pDir->pabBuf)
+                return birdSetErrnoToNoMem();
+        }
 
         pDir->fFirst = 0;
@@ -548 +602 @@
  * Implements closedir().
  */
-int             birdDirClose(BirdDir_T *pDir)
+int birdDirClose(BirdDir_T *pDir)
 {
     if (!pDir || pDir->uMagic != BIRD_DIR_MAGIC)
@@ -559 +613 @@
     birdMemFree(pDir->pabBuf);
     pDir->pabBuf = NULL;
-    birdMemFree(pDir);
+    if (!(pDir->fFlags & BIRDDIR_F_STATIC_ALLOC))
+        birdMemFree(pDir);
 
     return 0;