Changeset 2997 for trunk/src/lib/nt/ntunlink.c

Timestamp:

Nov 2, 2016, 12:28:02 AM (9 years ago)

Author:

bird

Message:

rm.c: Use fts_dirfd on windows.

File:

• trunk/src/lib/nt/ntunlink.c (modified) (6 diffs)

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*/);
+}
+