Defining a topdir under a skippedPath is allowed and usefully works with normal indexing. This change fixes a bug which prevented it from working with the real-time monitor and recollindex -i

src/index/fsindexer.cpp

@@ -259,29 +259,57 @@ static bool matchesSkipped(const vector<string>& tdl,
                            FsTreeWalker& walker,
                            const string& path)
 {
-    // First check what (if any) topdir this is in:
+    // Check path against topdirs and skippedPaths. We go up the
-    string td;
+    // ancestors until we find either a topdirs or a skippedPaths
-    for (vector<string>::const_iterator it = tdl.begin(); 
+    // match. If topdirs is found first-> ok to index (it's possible
-	 it != tdl.end(); it++) {
+    // and useful to configure a topdir under a skippedPath in the
-        if (path.find(*it) == 0) {
+    // config). This matches what happens during the normal fs tree
-            td = *it;
+    // walk.
-            break;
+    string canonpath = path_canon(path);
+    string mpath = canonpath;
+    string topdir;
+    while (mpath.length() > 1) {
+        for (vector<string>::const_iterator it = tdl.begin();  
+             it != tdl.end(); it++) {
+            // the topdirs members are already canonized.
+            LOGDEB2(("indexfiles:matchesskpp: comparing ancestor [%s] to "
+                     "topdir [%s]\n", mpath.c_str(), it->c_str()));
+            if (!mpath.compare(*it)) {
+                topdir = *it;
+                goto goodpath;
+            }
+        }
+
+        if (walker.inSkippedPaths(mpath, false)) {
+            LOGDEB(("FsIndexer::indexFiles: skipping [%s] (skpp)\n", 
+                    path.c_str()));
+            return true;
+        }
+
+        string::size_type len = mpath.length();
+        mpath = path_getfather(mpath);
+        // getfather normally returns a path ending with /, canonic
+        // paths don't (except for '/' itself).
+        if (!mpath.empty() && mpath[mpath.size()-1] == '/')
+            mpath.erase(mpath.size()-1);
+        // should not be necessary, but lets be prudent. If the
+        // path did not shorten, something is seriously amiss
+        // (could be an assert actually)
+        if (mpath.length() >= len) {
+            LOGERR(("FsIndexer::indexFile: internal Error: path [%s] did not "
+                    "shorten\n", mpath.c_str()));
+            return true;
         }
     }
-    if (td.empty()) {
+    // We get there if neither topdirs nor skippedPaths tests matched
-        LOGDEB(("FsIndexer::indexFiles: skipping [%s] (ntd)\n", path.c_str()));
+    LOGDEB(("FsIndexer::indexFiles: skipping [%s] (ntd)\n", path.c_str()));
-        return true;
+    return true;
-    }
 
-    // Check path against skippedPaths. 
+goodpath:
-    if (walker.inSkippedPaths(path)) {
-        LOGDEB(("FsIndexer::indexFiles: skipping [%s] (skpp)\n", path.c_str()));
-        return true;
-    }
 
     // Then check all path components up to the topdir against skippedNames
-    string mpath = path;
+    mpath = canonpath;
-    while (mpath.length() >= td.length() && mpath.length() > 1) {
+    while (mpath.length() >= topdir.length() && mpath.length() > 1) {
         string fn = path_getsimple(mpath);
         if (walker.inSkippedNames(fn)) {
             LOGDEB(("FsIndexer::indexFiles: skipping [%s] (skpn)\n", 

src/index/rclmonrcv.cpp

@@ -230,11 +230,13 @@ void *rclMonRcvRun(void *q)
 	if (mon->getEvent(ev, 2000)) {
 	    // Don't push events for skipped files. This would get
 	    // filtered on the processing side anyway, but causes
-	    // unnecessary wakeups and messages
+	    // unnecessary wakeups and messages. Do not test
+            // skippedPaths here, this would be incorrect (because a
+            // topdir can be under a skippedPath and this was handled
+            // while adding the watches).
 	    lconfig.setKeyDir(path_getfather(ev.m_path));
 	    walker.setSkippedNames(lconfig.getSkippedNames());
-	    if (walker.inSkippedNames(path_getsimple(ev.m_path)) || 
+	    if (walker.inSkippedNames(path_getsimple(ev.m_path)))
-		walker.inSkippedPaths(ev.m_path))
 		continue;
 
 	    if (ev.m_etyp == RclMonEvent::RCLEVT_DIRCREATE) {