Changeset 3535 in kBuild for trunk

Timestamp:

Dec 20, 2021 11:32:28 PM (3 years ago)

Author:

bird

Message:

nt/fts-nt.c+h: A couple of tweaks to make grep happy.

Location:

trunk/src/lib/nt

Files:

• fts-nt.c (modified) (2 diffs)
• fts-nt.h (modified) (2 diffs)

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

@@ -85 +85 @@
 #include "nthlp.h"
 #include "ntdir.h"
+#include "ntopenat.h" /* for AT_FDCWD */
 #include <stdio.h>//debug
 
@@ -191 +192 @@
         sp->fts_options = options;
         SET(FTS_NOCHDIR); /* NT: FTS_NOCHDIR is always on (for external consumes) */
+        sp->fts_cwd_fd = AT_FDCWD;
 
         /* Shush, GCC. */

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

@@ -83 +83 @@
 #define FTS_WHITEOUT    0x080           /* return whiteout information */
 #endif
+#define FTS_CWDFD       0x100           /* For gnulib fts compatibility, enables fts_cwd_fd. */
+#define FTS_TIGHT_CYCLE_CHECK 0x200     /* Ignored currently */
 #define FTS_NO_ANSI     0x40000000      /* NT: No ansi name or access path. */
-#define FTS_OPTIONMASK  0x400000ff      /* valid user option mask */
+#define FTS_OPTIONMASK  0x400003ff      /* valid user option mask */
 
-#define FTS_NAMEONLY    0x100           /* (private) child names only */
-#define FTS_STOP        0x200           /* (private) unrecoverable error */
+#define FTS_NAMEONLY    0x10000         /* (private) child names only */
+#define FTS_STOP        0x20000         /* (private) unrecoverable error */
         int fts_options;                /* fts_open options, global flags */
+        int fts_cwd_fd;                 /* FTS_CWDFD: AT_FDCWD or a virtual CWD file descriptor. */
         void *fts_clientptr;            /* thunk for sort function */
 } FTS;
@@ -132 +135 @@
 #define FTS_SL          12              /* symbolic link */
 #define FTS_SLNONE      13              /* symbolic link without target */
-//#define       FTS_W           14              /* whiteout object */
+#define FTS_W           14              /* whiteout object */
         int fts_info;                   /* user status for FTSENT structure */