Changeset 2997 in kBuild

Timestamp:

Nov 1, 2016 11:28:02 PM (8 years ago)

Author:

bird

Message:

rm.c: Use fts_dirfd on windows.

Location:

trunk/src/lib/nt

Files:

• fts-nt.h (modified) (2 diffs)
• nthlp.h (modified) (1 diff)
• nthlpfs.c (modified) (3 diffs)
• ntunlink.c (modified) (6 diffs)
• ntunlink.h (modified) (1 diff)

trunk/src/lib/nt/fts-nt.h

@@ -53 +53 @@
 #ifdef _WINNT_
 typedef HANDLE fts_fd_t;
+# define NT_FTS_INVALID_HANDLE_VALUE    INVALID_HANDLE_VALUE
 #else
 typedef void * fts_fd_t;
+# define NT_FTS_INVALID_HANDLE_VALUE    ((void *)~(uintptr_t)0)
 #endif
 #define FTSCALL __cdecl
@@ -98 +100 @@
         int fts_errno;                  /* errno for this node */
         fts_fd_t fts_symfd;             /* NT: Normally -1; -2 we followed this symlinked dir */
-        fts_fd_t fts_dirfd;             /* NT: Handle to the directory */
+        fts_fd_t fts_dirfd;             /* NT: Handle to the directory (NT_FTS_)INVALID_HANDLE_VALUE if not valid */
         size_t fts_pathlen;             /* strlen(fts_path) */
         size_t fts_namelen;             /* strlen(fts_name) */

trunk/src/lib/nt/nthlp.h

@@ -75 +75 @@
 void        birdCloseFile(HANDLE hFile);
 int         birdDosToNtPath(const char *pszPath, MY_UNICODE_STRING *pNtPath);
+int         birdDosToRelativeNtPath(const char *pszPath, MY_UNICODE_STRING *pNtPath);
 void        birdFreeNtPath(MY_UNICODE_STRING *pNtPath);
 

trunk/src/lib/nt/nthlpfs.c

@@ -175 +175 @@
 
 /**
- * Converts UNIX slashes to DOS ones and trims trailing ones.
+ * Converts UNIX slashes to DOS ones.
  *
  * @returns 0
@@ -194 +194 @@
     }
 
+#if 0
     /* Strip trailing slashes (NT doesn't like them). */
     while (   pNtPath->Length >= sizeof(wchar_t)
@@ -210 +211 @@
         pNtPath->Buffer[1] = '\0';
     }
+#endif
 
     return 0;

trunk/src/lib/nt/ntunlink.c

@@ -83 +83 @@
 
 
-static int birdUnlinkInternal(const char *pszFile, int fReadOnlyToo, int fFast)
+static int birdUnlinkInternal(HANDLE hRoot, const char *pszFile, int fReadOnlyToo, int fFast)
 {
     MY_UNICODE_STRING   NtPath;
     int                 rc;
 
-    rc = birdDosToNtPath(pszFile, &NtPath);
+    if (hRoot == INVALID_HANDLE_VALUE)
+        hRoot = NULL;
+    if (hRoot == NULL)
+        rc = birdDosToNtPath(pszFile, &NtPath);
+    else
+        rc = birdDosToRelativeNtPath(pszFile, &NtPath);
     if (rc == 0)
     {
@@ -96 +101 @@
             /* This uses FILE_DELETE_ON_CLOSE. Probably only suitable when in a hurry... */
             MY_OBJECT_ATTRIBUTES ObjAttr;
-            MyInitializeObjectAttributes(&ObjAttr, &NtPath, OBJ_CASE_INSENSITIVE, NULL /*hRoot*/, NULL /*pSecAttr*/);
+            MyInitializeObjectAttributes(&ObjAttr, &NtPath, OBJ_CASE_INSENSITIVE, hRoot, NULL /*pSecAttr*/);
             rcNt = g_pfnNtDeleteFile(&ObjAttr);
 
@@ -113 +118 @@
             for (;;)
             {
-                rcNt = birdOpenFileUniStr(NULL /*hRoot*/,
+                rcNt = birdOpenFileUniStr(hRoot,
                                           &NtPath,
                                           DELETE,
@@ -157 +162 @@
 int birdUnlink(const char *pszFile)
 {
-    return birdUnlinkInternal(pszFile, 0 /*fReadOnlyToo*/, 0 /*fFast*/);
+    return birdUnlinkInternal(NULL /*hRoot*/, pszFile, 0 /*fReadOnlyToo*/, 0 /*fFast*/);
+}
+
+
+int birdUnlinkEx(void *hRoot, const char *pszFile)
+{
+    return birdUnlinkInternal((HANDLE)hRoot, pszFile, 0 /*fReadOnlyToo*/, 0 /*fFast*/);
 }
 
@@ -163 +174 @@
 int birdUnlinkForced(const char *pszFile)
 {
-    return birdUnlinkInternal(pszFile, 1 /*fReadOnlyToo*/, 0 /*fFast*/);
+    return birdUnlinkInternal(NULL /*hRoot*/, pszFile, 1 /*fReadOnlyToo*/, 0 /*fFast*/);
+}
+
+
+int birdUnlinkForcedEx(void *hRoot, const char *pszFile)
+{
+    return birdUnlinkInternal((HANDLE)hRoot, pszFile, 1 /*fReadOnlyToo*/, 0 /*fFast*/);
 }
 
@@ -169 +186 @@
 int birdUnlinkForcedFast(const char *pszFile)
 {
-    return birdUnlinkInternal(pszFile, 1 /*fReadOnlyToo*/, 1 /*fFast*/);
+    return birdUnlinkInternal(NULL /*hRoot*/, pszFile, 1 /*fReadOnlyToo*/, 1 /*fFast*/);
 }
 
+
+int birdUnlinkForcedFastEx(void *hRoot, const char *pszFile)
+{
+    return birdUnlinkInternal((HANDLE)hRoot, pszFile, 1 /*fReadOnlyToo*/, 1 /*fFast*/);
+}
+

trunk/src/lib/nt/ntunlink.h

@@ -35 +35 @@
 
 int birdUnlink(const char *pszFile);
+int birdUnlinkEx(void *hRoot, const char *pszFile);
 int birdUnlinkForced(const char *pszFile);
+int birdUnlinkForcedEx(void *hRoot, const char *pszFile);
 int birdUnlinkForcedFast(const char *pszFile);
+int birdUnlinkForcedFastEx(void *hRoot, const char *pszFile);
 
 #undef  unlink