Changeset 3000 in kBuild

Timestamp:

Nov 5, 2016 7:39:06 PM (8 years ago)

Author:

bird

Message:

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

File:

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

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

@@ -557 +557 @@
         if (p->fts_flags & FTS_SYMFOLLOW)
                 p->fts_symfd = INVALID_HANDLE_VALUE;
-    if (p->fts_dirfd != INVALID_HANDLE_VALUE) {
+        if (p->fts_dirfd != INVALID_HANDLE_VALUE) {
                 birdCloseFile(p->fts_dirfd);
                 p->fts_dirfd = INVALID_HANDLE_VALUE;
-    }
-    fts_free_entry(tmp);
+        }
+        fts_free_entry(tmp);
         p->fts_info = p->fts_errno ? FTS_ERR : FTS_DP;
         return (sp->fts_cur = p);
@@ -708 +708 @@
          */
         fDirOpenFlags = BIRDDIR_F_EXTRA_INFO | BIRDDIR_F_KEEP_HANDLE;
-    if (cur->fts_dirfd == INVALID_HANDLE_VALUE) {
+        if (cur->fts_dirfd == INVALID_HANDLE_VALUE) {
                 if (cur->fts_parent->fts_dirfd != INVALID_HANDLE_VALUE) {
                         /* (This works fine for symlinks too, since we follow them.) */
@@ -728 +728 @@
                                                                                   OBJ_CASE_INSENSITIVE);
                 }
-    } else {
+        } else {
                 fDirOpenFlags |= BIRDDIR_F_RESTART_SCAN;
         }
@@ -750 +750 @@
          * each new name into the path.
          */
-    if (sp->fts_options & FTS_NO_ANSI) {
+        if (sp->fts_options & FTS_NO_ANSI) {
                 len = maxlen = 0;
         } else {
@@ -1003 +1003 @@
         len = sizeof(FTSENT) + (cwcname + 1) * sizeof(wchar_t);
         if (!(sp->fts_options & FTS_NO_ANSI))
-            len += namelen + 1;
+                len += namelen + 1;
         p = malloc(len);
         if (p) {
@@ -1083 +1083 @@
 fts_alloc_utf16(FTS *sp, wchar_t const *wcsname, size_t cwcname)
 {
-    FTSENT *pRet;
-
-    if (sp->fts_options & FTS_NO_ANSI) {
+        FTSENT *pRet;
+
+        if (sp->fts_options & FTS_NO_ANSI) {
                 pRet = fts_alloc(sp, NULL, 0, wcsname, cwcname);
-    } else {
+        } else {
                 MY_UNICODE_STRING UniStr;
                 MY_ANSI_STRING AnsiStr;
@@ -1106 +1106 @@
                 }
         }
-    return pRet;
+        return pRet;
 }
 
@@ -1138 +1138 @@
          *        the way the caller checks things out! */
 
-    if (more) {
+        if (more) {
                 sp->fts_pathlen += more + 256;
                 ptr = realloc(sp->fts_path, sp->fts_pathlen);
@@ -1150 +1150 @@
                         return 1;
                 }
-    }
-
-    if (cwcmore) {
+        }
+
+        if (cwcmore) {
                 sp->fts_cwcpath += cwcmore + 256;
                 ptr = realloc(sp->fts_wcspath, sp->fts_cwcpath);
@@ -1164 +1164 @@
                         return 1;
                 }
-    }
+        }
         return 0;
 }