From 9d897001b623daf9ae151fe9dbc5fe6f94150c80 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Mon, 19 Aug 2013 11:29:58 -0700 Subject: [PATCH] Fix DirectoryIterator when multiple wildcards are used. --- Notes/VFALCO_LOG.txt | 28 ------------------- Notes/VFALCO_TODO.txt | 5 +--- .../files/beast_DirectoryIterator.cpp | 4 +-- 3 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 Notes/VFALCO_LOG.txt diff --git a/Notes/VFALCO_LOG.txt b/Notes/VFALCO_LOG.txt deleted file mode 100644 index 0dfd55f580..0000000000 --- a/Notes/VFALCO_LOG.txt +++ /dev/null @@ -1,28 +0,0 @@ -Vinnie Falco's Change Log - -2013/08/07 - -- Add 'print' test that shows all the tests -- Improved "package.test" match string format when choosing tests to run - -2013/08/04 - -- Begin reworking of socket code - -2013/08/01 - -- Add beast::SemanticVersion -- Change rippled to use SemanticVersion -- Add runStartup to UnitTest, allowing forced tests on startup -- Force rippled BuildInfo unit test to run on every startup - -2013/07/31 - -- Add "hostname" to server_info output -- Replace "build_version" in server_info with the actual build version -- Remove "client_version" from server_info - -2013/07/30 - -- Add FatalErrorReporter to main -- Rewrote the build and protocol version numbering code diff --git a/Notes/VFALCO_TODO.txt b/Notes/VFALCO_TODO.txt index a5b44b31b1..adaf234354 100644 --- a/Notes/VFALCO_TODO.txt +++ b/Notes/VFALCO_TODO.txt @@ -8,10 +8,7 @@ Vinnie's List: Changes day to day, descending priority (Items marked '*' can be handled by others.) - beast::Socket integration in Ripple -- Socket implementation for PROXY protocol -- Socket that supports multiple protcols -- Unit tests for boost::asio wrappers -- Review boost::asio wrappers and consolidation of network code in ripple_net +- Configuration list for Jenkins - Deeply create directories specified in config settings - Finish unit tests and code for Validators * Document the command line options for the beast unit test framework diff --git a/Subtrees/beast/modules/beast_core/files/beast_DirectoryIterator.cpp b/Subtrees/beast/modules/beast_core/files/beast_DirectoryIterator.cpp index 7d18294125..ce51b47927 100644 --- a/Subtrees/beast/modules/beast_core/files/beast_DirectoryIterator.cpp +++ b/Subtrees/beast/modules/beast_core/files/beast_DirectoryIterator.cpp @@ -104,8 +104,8 @@ bool DirectoryIterator::next (bool* const isDirResult, bool* const isHiddenResul matches = (whatToLookFor & File::findFiles) != 0; } - // if recursive, we're not relying on the OS iterator to do the wildcard match, so do it now.. - if (matches && isRecursive) + // if we're not relying on the OS iterator to do the wildcard match, do it now.. + if (matches && (isRecursive || wildCards.size() > 1)) matches = fileMatches (wildCards, filename); if (matches && (whatToLookFor & File::ignoreHiddenFiles) != 0)