bug-findutils
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] find: use FTS_VERBATIM


From: Dmitry V. Levin
Subject: [PATCH] find: use FTS_VERBATIM
Date: Sun, 18 Nov 2012 06:06:04 +0400

The recent change v0.0-7611-g3a9002d in gnulib that made fts_open strip
trailing slashes from input path names had a negative impact on
findutils that relies on the old fts_open behavior to implement POSIX
requirement that each path operand of the find utility shall be
evaluated unaltered as it was provided, including all trailing slash
characters.

A new bit flag FTS_VERBATIM was added later as the option to disable
that stripping when it is not desirable.

* gnulib: update to latest, to get FTS_VERBATIM support.
* find/ftsfind.c (ftsoptions): Set the FTS_VERBATIM bit.
---
 ChangeLog      |    6 ++++++
 find/ftsfind.c |    2 +-
 gnulib         |    2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3efc4ad..ba2408a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-17  Dmitry V. Levin  <address@hidden>
+
+       find: use FTS_VERBATIM
+       * gnulib: update to latest, to get FTS_VERBATIM support.
+       * find/ftsfind.c (ftsoptions): Set the FTS_VERBATIM bit.
+
 2012-11-17  James Youngman  <address@hidden>
 
        Update the Vietnamese, Ukranian and Croatian translations.
diff --git a/find/ftsfind.c b/find/ftsfind.c
index cce2f40..0359134 100644
--- a/find/ftsfind.c
+++ b/find/ftsfind.c
@@ -79,7 +79,7 @@
 /* FTS_TIGHT_CYCLE_CHECK tries to work around Savannah bug #17877
  * (but actually using it doesn't fix the bug).
  */
-static int ftsoptions = FTS_NOSTAT|FTS_TIGHT_CYCLE_CHECK|FTS_CWDFD;
+static int ftsoptions = 
FTS_NOSTAT|FTS_TIGHT_CYCLE_CHECK|FTS_CWDFD|FTS_VERBATIM;
 
 static int prev_depth = INT_MIN; /* fts_level can be < 0 */
 static int curr_fd = -1;
diff --git a/gnulib b/gnulib
index 372ef2a..fd9f1ac 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 372ef2a0e94ec6ee85b5fc4bab763154ec11420d
+Subproject commit fd9f1acededd74f8cd095e657528aa8fad183536


-- 
ldv



reply via email to

[Prev in Thread] Current Thread [Next in Thread]