Changeset 3009 for trunk/src/lib/nt/fts-nt.c

Timestamp:

Nov 7, 2016, 3:21:59 AM (9 years ago)

Author:

bird

Message:

ntunlink: W apis.

File:

• trunk/src/lib/nt/fts-nt.c (modified) (4 diffs)

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; }