Changeset 3004 in kBuild for trunk/src/lib/nt/tstNtFts.c

Timestamp:

Nov 5, 2016 11:18:51 PM (9 years ago)

Author:

bird

Message:

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

File:

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

trunk/src/lib/nt/tstNtFts.c

@@ -71 +71 @@
             if (chOpt == '-')
             {
-                chOpt = *pszArg++;
                 if (!chOpt)
                 {
@@ -99 +98 @@
                 else if (strcmp(pszArg, "verbose") == 0)
                     chOpt = 'v';
+                else if (strcmp(pszArg, "no-ansi") == 0)
+                    chOpt = 'w';
                 else
                 {
-                    fprintf(stderr, "syntax error: Unknown option: --%s\n", pszArg);
+                    fprintf(stderr, "syntax error: Unknown option: %s (%s)\n", argv[i], pszArg);
                     return 2;
                 }
@@ -137 +138 @@
                     case 'x':
                         fFtsFlags |= FTS_XDEV;
+                        break;
+                    case 'w':
+                        fFtsFlags |= FTS_NO_ANSI;
                         break;
                     case 'L':
@@ -206 +210 @@
 
                 if (cVerbosity > 0)
-                    printf("%8s %s\n", pszState, pFtsEnt->fts_accpath);
+                {
+                    if (fFtsFlags & FTS_NO_ANSI)
+                        printf("%8s %ls\n", pszState, pFtsEnt->fts_wcsaccpath);
+                    else
+                        printf("%8s %s\n", pszState, pFtsEnt->fts_accpath);
+                }
                 if (   pFtsEnt->fts_info == FTS_SL
                     && pFtsEnt->fts_number == 0