Changeset 3009 in kBuild

Timestamp:

Nov 7, 2016 2:21:59 AM (8 years ago)

Author:

bird

Message:

ntunlink: W apis.

Location:

trunk/src/lib/nt

Files:

• fts-nt.c (modified) (4 diffs)
• nthlp.h (modified) (1 diff)
• ntunlink.c (modified) (8 diffs)
• ntunlink.h (modified) (1 diff)

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

@@ -179 +179 @@
 
         /* fts_open() requires at least one path */
-        if (*argv == NULL) {
+        if (wcsargv ? *wcsargv == NULL : *argv == NULL) {
                 errno = EINVAL;
                 return (NULL);
@@ -209 +209 @@
 
         /* Allocate/initialize root(s). */
-        for (root = NULL, nitems = 0; *argv != NULL; ++argv, ++nitems) {
+        for (root = NULL, nitems = 0; wcsargv ? *wcsargv != NULL : *argv != NULL; ++nitems) {
                 /* NT: We need to do some small input transformations to make this and
                        the API user code happy.  1. Lone drive letters get a dot
@@ -228 +228 @@
                                 p = fts_alloc_utf16(sp, *wcsargv, len);
                         }
+                        wcsargv++;
                 } else {
                         len = strlen(*argv);
@@ -240 +241 @@
                                 p = fts_alloc_ansi(sp, *argv, len);
                         }
+                        argv++;
                 }
                 if (p != NULL) { /* likely */ } else { goto mem3; }

trunk/src/lib/nt/nthlp.h

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

trunk/src/lib/nt/ntunlink.c

@@ -83 +83 @@
 
 
-static int birdUnlinkInternal(HANDLE hRoot, const char *pszFile, int fReadOnlyToo, int fFast)
+static int birdUnlinkInternal(HANDLE hRoot, const char *pszFile, const wchar_t *pwszFile, int fReadOnlyToo, int fFast)
 {
     MY_UNICODE_STRING   NtPath;
@@ -91 +91 @@
         hRoot = NULL;
     if (hRoot == NULL)
-        rc = birdDosToNtPath(pszFile, &NtPath);
+    {
+        if (pwszFile)
+            rc = birdDosToNtPathW(pwszFile, &NtPath);
+        else
+            rc = birdDosToNtPath(pszFile, &NtPath);
+    }
     else
-        rc = birdDosToRelativeNtPath(pszFile, &NtPath);
+    {
+        if (pwszFile)
+            rc = birdDosToRelativeNtPathW(pwszFile, &NtPath);
+        else
+            rc = birdDosToRelativeNtPath(pszFile, &NtPath);
+    }
     if (rc == 0)
     {
@@ -162 +172 @@
 int birdUnlink(const char *pszFile)
 {
-    return birdUnlinkInternal(NULL /*hRoot*/, pszFile, 0 /*fReadOnlyToo*/, 0 /*fFast*/);
+    return birdUnlinkInternal(NULL /*hRoot*/, pszFile, NULL /*pwszFile*/, 0 /*fReadOnlyToo*/, 0 /*fFast*/);
+}
+
+
+int birdUnlinkW(const wchar_t *pwszFile)
+{
+    return birdUnlinkInternal(NULL /*hRoot*/, NULL /*pwszFile*/, pwszFile, 0 /*fReadOnlyToo*/, 0 /*fFast*/);
 }
 
@@ -168 +184 @@
 int birdUnlinkEx(void *hRoot, const char *pszFile)
 {
-    return birdUnlinkInternal((HANDLE)hRoot, pszFile, 0 /*fReadOnlyToo*/, 0 /*fFast*/);
+    return birdUnlinkInternal((HANDLE)hRoot, pszFile, NULL /*pwszFile*/, 0 /*fReadOnlyToo*/, 0 /*fFast*/);
+}
+
+
+int birdUnlinkExW(void *hRoot, const wchar_t *pwszFile)
+{
+    return birdUnlinkInternal((HANDLE)hRoot, NULL /*pszFile*/, pwszFile, 0 /*fReadOnlyToo*/, 0 /*fFast*/);
 }
 
@@ -174 +196 @@
 int birdUnlinkForced(const char *pszFile)
 {
-    return birdUnlinkInternal(NULL /*hRoot*/, pszFile, 1 /*fReadOnlyToo*/, 0 /*fFast*/);
+    return birdUnlinkInternal(NULL /*hRoot*/, pszFile, NULL /*pwszFile*/, 1 /*fReadOnlyToo*/, 0 /*fFast*/);
+}
+
+
+int birdUnlinkForcedW(const wchar_t *pwszFile)
+{
+    return birdUnlinkInternal(NULL /*hRoot*/, NULL /*pszFile*/, pwszFile, 1 /*fReadOnlyToo*/, 0 /*fFast*/);
 }
 
@@ -180 +208 @@
 int birdUnlinkForcedEx(void *hRoot, const char *pszFile)
 {
-    return birdUnlinkInternal((HANDLE)hRoot, pszFile, 1 /*fReadOnlyToo*/, 0 /*fFast*/);
+    return birdUnlinkInternal((HANDLE)hRoot, pszFile, NULL /*pwszFile*/, 1 /*fReadOnlyToo*/, 0 /*fFast*/);
+}
+
+
+int birdUnlinkForcedExW(void *hRoot, const wchar_t *pwszFile)
+{
+    return birdUnlinkInternal((HANDLE)hRoot, NULL /*pszFile*/, pwszFile, 1 /*fReadOnlyToo*/, 0 /*fFast*/);
 }
 
@@ -186 +220 @@
 int birdUnlinkForcedFast(const char *pszFile)
 {
-    return birdUnlinkInternal(NULL /*hRoot*/, pszFile, 1 /*fReadOnlyToo*/, 1 /*fFast*/);
+    return birdUnlinkInternal(NULL /*hRoot*/, pszFile, NULL /*pwszFile*/, 1 /*fReadOnlyToo*/, 1 /*fFast*/);
+}
+
+
+int birdUnlinkForcedFastW(const wchar_t *pwszFile)
+{
+    return birdUnlinkInternal(NULL /*hRoot*/, NULL /*pszFile*/, pwszFile, 1 /*fReadOnlyToo*/, 1 /*fFast*/);
 }
 
@@ -192 +232 @@
 int birdUnlinkForcedFastEx(void *hRoot, const char *pszFile)
 {
-    return birdUnlinkInternal((HANDLE)hRoot, pszFile, 1 /*fReadOnlyToo*/, 1 /*fFast*/);
-}
-
+    return birdUnlinkInternal((HANDLE)hRoot, pszFile, NULL /*pwszFile*/, 1 /*fReadOnlyToo*/, 1 /*fFast*/);
+}
+
+
+int birdUnlinkForcedFastExW(void *hRoot, const wchar_t *pwszFile)
+{
+    return birdUnlinkInternal((HANDLE)hRoot, NULL /*pszFile*/, pwszFile, 1 /*fReadOnlyToo*/, 1 /*fFast*/);
+}
+

trunk/src/lib/nt/ntunlink.h

@@ -35 +35 @@
 
 int birdUnlink(const char *pszFile);
+int birdUnlinkW(const wchar_t *pwszFile);
 int birdUnlinkEx(void *hRoot, const char *pszFile);
+int birdUnlinkExW(void *hRoot, const wchar_t *pwszFile);
 int birdUnlinkForced(const char *pszFile);
+int birdUnlinkForcedW(const wchar_t *pwszFile);
 int birdUnlinkForcedEx(void *hRoot, const char *pszFile);
+int birdUnlinkForcedExW(void *hRoot, const wchar_t *pszFile);
 int birdUnlinkForcedFast(const char *pszFile);
+int birdUnlinkForcedFastW(const wchar_t *pwszFile);
 int birdUnlinkForcedFastEx(void *hRoot, const char *pszFile);
+int birdUnlinkForcedFastExW(void *hRoot, const wchar_t *pwszFile);
 
 #undef  unlink