changeset 39902:74aa8d21daa5

fts: cleanup after FTS_NOATIME removal * lib/fts_.h (FTS_VERBATIM, FTS_OPTIONMASK, FTS_NAMEONLY) (FTS_STOP): Shrink to minimal values. We don’t need to worry about binary compatibility in Gnulib, and the old way of doing things had a hole in the user options that caused FTS_OPTIONMASK to not work as desired.
author Paul Eggert <eggert@cs.ucla.edu>
date Mon, 08 Oct 2018 16:53:59 -0700
parents 33cf8a9f314a
children cadbcf6826fd
files ChangeLog lib/fts_.h
diffstat 2 files changed, 13 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Oct 08 16:45:36 2018 -0700
+++ b/ChangeLog	Mon Oct 08 16:53:59 2018 -0700
@@ -1,3 +1,12 @@
+2018-10-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+	fts: cleanup after FTS_NOATIME removal
+	* lib/fts_.h (FTS_VERBATIM, FTS_OPTIONMASK, FTS_NAMEONLY)
+	(FTS_STOP): Shrink to minimal values.  We don’t need to
+	worry about binary compatibility in Gnulib, and the old way
+	of doing things had a hole in the user options that caused
+	FTS_OPTIONMASK to not work as desired.
+
 2018-10-08  Bernhard Voelker  <mail@bernhard-voelker.de>
 
 	fts: remove FTS_NOATIME
--- a/lib/fts_.h	Mon Oct 08 16:45:36 2018 -0700
+++ b/lib/fts_.h	Mon Oct 08 16:53:59 2018 -0700
@@ -149,16 +149,14 @@
      dirent.d_type data.  */
 # define FTS_DEFER_STAT         0x0400
 
-/* 0x0800 unused, was non-working FTS_NOATIME */
-
   /* Use this flag to disable stripping of trailing slashes
      from input path names during fts_open initialization.  */
-# define FTS_VERBATIM   0x1000
+# define FTS_VERBATIM   0x0800
 
-# define FTS_OPTIONMASK 0x1fff          /* valid user option mask */
+# define FTS_OPTIONMASK 0x0fff          /* valid user option mask */
 
-# define FTS_NAMEONLY   0x2000          /* (private) child names only */
-# define FTS_STOP       0x4000          /* (private) unrecoverable error */
+# define FTS_NAMEONLY   0x1000          /* (private) child names only */
+# define FTS_STOP       0x2000          /* (private) unrecoverable error */
         int fts_options;                /* fts_open options, global flags */
 
         /* Map a directory's device number to a boolean.  The boolean is