Changeset 2991 for trunk/src

Timestamp:

Nov 1, 2016, 10:56:13 PM (9 years ago)

Author:

bird

Message:

tstNtFts: also compile against old code.

Location:

trunk/src

Files:

• kmk/Makefile.kmk (modified) (1 diff)
• lib/nt/tstNtFts.c (modified) (7 diffs)

trunk/src/kmk/Makefile.kmk

@@ -532 +532 @@
 tstFileInfo_SOURCES = w32/tstFileInfo.c
 
+#
+# tstFileInfo
+#
+PROGRAMS.win += tstFtsFake
+tstFtsFake_TEMPLATE = BIN-KMK
+tstFtsFake_NOINST = 1
+tstFtsFake_DEFS = USE_OLD_FTS
+tstFtsFake_SOURCES = ../lib/nt/tstNtFts.c
+
+
 
 include $(FILE_KBUILD_SUB_FOOTER)

trunk/src/lib/nt/tstNtFts.c

@@ -4 +4 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#include "fts-nt.h"
+#ifndef USE_OLD_FTS
+# include "fts-nt.h"
+#else
+# include "kmkbuiltin/ftsfake.h"
+#endif
 #include <stdlib.h>
 #include <stdio.h>
@@ -34 +38 @@
            "  -x, --one-file-system\n"
            "    FTS_XDEV\n"
+           "  -q, --quiet\n"
+           "    Quiet operation, no output.\n"
+           "  -v, --verbose\n"
+           "    Verbose operation (default).\n"
            );
     return 0;
@@ -87 +95 @@
                 else if (strcmp(pszArg, "one-file-system") == 0)
                     chOpt = 'x';
+                else if (strcmp(pszArg, "quiet") == 0)
+                    chOpt = 'q';
+                else if (strcmp(pszArg, "verbose") == 0)
+                    chOpt = 'v';
                 else
                 {
@@ -92 +104 @@
                     return 2;
                 }
+                pszArg = "";
             }
             do
@@ -132 +145 @@
                         break;
 
+                    case 'q':
+                        cVerbosity = 0;
+                        break;
                     case 'v':
                         cVerbosity++;
@@ -146 +162 @@
             papszFtsArgs[cFtsArgs++] = pszArg;
     }
+
+#ifdef USE_OLD_FTS
+    if (papszFtsArgs[0] == NULL)
+    {
+        fprintf(stderr, "Nothing to do\n");
+        return 1;
+    }
+#endif
 
     /*
@@ -181 +205 @@
                 }
 
-                printf("%8s %s\n", pszState, pFtsEnt->fts_accpath);
+                if (cVerbosity > 0)
+                    printf("%8s %s\n", pszState, pFtsEnt->fts_accpath);
                 if (   pFtsEnt->fts_info == FTS_SL
                     && pFtsEnt->fts_number == 0