Fix #62 - sub-subdirectory sync with -s

vitalif · May 10, 2016 · 62e2611 · 62e2611
1 parent 40e33cb
commit 62e2611
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/libgrive/src/base/State.cc b/libgrive/src/base/State.cc
@@ -51,7 +51,14 @@ State::State( const fs::path& filename, const Val& options  ) :
 		{
 			// "-s" is internally converted to an ignore regexp
 			const boost::regex esc( "[.^$|()\\[\\]{}*+?\\\\]" );
-			std::string ign = "^(?!"+regex_replace( m_dir, esc, "\\\\&", boost::format_sed )+"(/|$))";
+			m_dir = regex_replace( m_dir, esc, "\\\\&", boost::format_sed );
+			size_t pos = 0;
+			while ( ( pos = m_dir.find( '/', pos ) ) != std::string::npos )
+			{
+				m_dir = m_dir.substr( 0, pos ) + "$|" + m_dir;
+				pos = pos*2 + 3;
+			}
+			std::string ign = "^(?!"+m_dir+"(/|$))";
 			m_ign = ign;
 		}
 	}