Updated efsw. Fixed issue #204.

1 files changed, 34 insertions, 23 deletions

diff --git a/src/3rdParty/efsw/FileWatcherImpl.cpp b/src/3rdParty/efsw/FileWatcherImpl.cpp
index f6b86a5..bf69a45 100755..100644
--- a/src/3rdParty/efsw/FileWatcherImpl.cpp
+++ b/src/3rdParty/efsw/FileWatcherImpl.cpp
@@ -1,23 +1,34 @@
-#include <efsw/FileWatcherImpl.hpp>
-#include <efsw/String.hpp>
-#include <efsw/System.hpp>
-
-namespace efsw {
-
-FileWatcherImpl::FileWatcherImpl( FileWatcher* parent ) :
-        mFileWatcher( parent ), mInitOK( false ), mIsGeneric( false ) {
-        System::maxFD();
-}
-
-FileWatcherImpl::~FileWatcherImpl() {}
-
-bool FileWatcherImpl::initOK() {
-        return static_cast<bool>( mInitOK );
-}
-
-bool FileWatcherImpl::linkAllowed( const std::string& curPath, const std::string& link ) {
-        return ( mFileWatcher->followSymlinks() && mFileWatcher->allowOutOfScopeLinks() ) ||
-                   -1 != String::strStartsWith( curPath, link );
-}
-
-} // namespace efsw
+#include <efsw/FileWatcherImpl.hpp>

+#include <efsw/String.hpp>

+#include <efsw/System.hpp>

+

+namespace efsw {

+

+FileWatcherImpl::FileWatcherImpl( FileWatcher* parent ) :

+        mFileWatcher( parent ), mInitOK( false ), mIsGeneric( false ) {

+        System::maxFD();

+}

+

+FileWatcherImpl::~FileWatcherImpl() {}

+

+bool FileWatcherImpl::initOK() {

+        return static_cast<bool>( mInitOK );

+}

+

+bool FileWatcherImpl::linkAllowed( const std::string& curPath, const std::string& link ) {

+        return ( mFileWatcher->followSymlinks() && mFileWatcher->allowOutOfScopeLinks() ) ||

+                   -1 != String::strStartsWith( curPath, link );

+}

+

+int FileWatcherImpl::getOptionValue( const std::vector<WatcherOption>& options, Option option,

+                                                                         int defaultValue ) {

+        for ( size_t i = 0; i < options.size(); i++ ) {

+                if ( options[i].mOption == option ) {

+                        return options[i].mValue;

+                }

+        }

+

+        return defaultValue;

+}

+

+} // namespace efsw