From 873ccf0ef6cefc859d0c4112a8eb0cc5f94fe206 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Fri, 10 Oct 2014 10:23:24 +0200 Subject: [PATCH] we now never use FNM_LEADING_DIR. Change a param default for consistency, and fix the doc --- src/doc/user/usermanual.xml | 2 +- src/utils/fstreewalk.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/doc/user/usermanual.xml b/src/doc/user/usermanual.xml index 7c0d9d3f..79d69174 100644 --- a/src/doc/user/usermanual.xml +++ b/src/doc/user/usermanual.xml @@ -5107,7 +5107,7 @@ skippedPaths = ~/somedir/*.txt The values in the *skippedPaths variables are matched by default with fnmatch(3), with the - FNM_PATHNAME and FNM_LEADING_DIR flags. This means that '/' + FNM_PATHNAME flag. This means that '/' characters must be matched explicitely. You can set skippedPathsFnmPathname to 0 to disable the use of FNM_PATHNAME (meaning that /*/dir3 will match diff --git a/src/utils/fstreewalk.h b/src/utils/fstreewalk.h index 09090439..27a221ef 100644 --- a/src/utils/fstreewalk.h +++ b/src/utils/fstreewalk.h @@ -108,7 +108,7 @@ class FsTreeWalker { /** Test if path/name should be skipped. This can be used independantly of * an actual tree walk */ - bool inSkippedPaths(const string& path, bool ckparents = true); + bool inSkippedPaths(const string& path, bool ckparents = false); bool inSkippedNames(const string& name); private: