From: Paul Eggert Date: Mon, 8 Oct 2018 23:53:59 +0000 (-0700) Subject: fts: cleanup after FTS_NOATIME removal X-Git-Tag: v1.0~5361 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=dce8759f0f0236a860a3e68b63c5e99cc6f168f9;p=gnulib.git 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. --- diff --git a/ChangeLog b/ChangeLog index f49c41dcbe..6161c05b6c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2018-10-08 Paul Eggert + + 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 fts: remove FTS_NOATIME diff --git a/lib/fts_.h b/lib/fts_.h index 6188122fd9..a34a296c0e 100644 --- a/lib/fts_.h +++ b/lib/fts_.h @@ -149,16 +149,14 @@ typedef struct { 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