recoll / Code / Diff of /src/utils/fstreewalk.cpp

Diff of /src/utils/fstreewalk.cpp [ed449c] .. [a32ecf]

Switch to unified view

-a/src/utils/fstreewalk.cpp
+b/src/utils/fstreewalk.cpp
 #ifndef lint
-static char rcsid[] = "@(#$Id: fstreewalk.cpp,v 1.8 2006-01-23 13:32:28 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: fstreewalk.cpp,v 1.9 2006-12-21 08:22:35 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
  *   the Free Software Foundation; either version 2 of the License, or
 ...
 class FsTreeWalker::Internal {
     Options options;
     stringstream reason;
     list<string> skippedNames;
+    list<string> skippedPaths;
     int errors;
     void logsyserr(const char *call, const string &param)
+    {
     errors++;
     reason << call << "(" << param << ") : " << errno << " : " <<
 ...
 bool FsTreeWalker::setSkippedNames(const list<string> &patterns)
+{
     data->skippedNames = patterns;
     return true;
+}
-void FsTreeWalker::clearSkippedNames()
-    data->skippedNames.clear();
+bool FsTreeWalker::addSkippedPath(const string& path)
+{
+    data->skippedPaths.push_back(path_canon(path));
+    return true;
+}
+bool FsTreeWalker::setSkippedPaths(const list<string> &paths)
+{
+    data->skippedPaths = paths;
+    for (list<string>::iterator it = data->skippedPaths.begin();
+   it != data->skippedPaths.end(); it++)
+  *it = path_canon(*it);
+    return true;
+}
 FsTreeWalker::Status FsTreeWalker::walk(const string &top,
+                  FsTreeWalkerCB& cb)
+{
+    return iwalk(path_canon(top), cb);
+}
+FsTreeWalker::Status FsTreeWalker::iwalk(const string &top,
                     FsTreeWalkerCB& cb)
+{
     Status status = FtwOk;
     struct stat st;
     int statret;
 ...
         if (statret == -1) {
         data->logsyserr("stat", fn);
         continue;
+        }
         if (S_ISDIR(st.st_mode)) {
+      if (!data->skippedPaths.empty()) {
+          list<string>::const_iterator it;
+          for (it = data->skippedPaths.begin();
+           it != data->skippedPaths.end(); it++) {
+          if (fn == *it)
+              goto skip;
+          }
+      }
         if (data->options & FtwNoRecurse) {
             status = cb.processone(fn, &st, FtwDirEnter);
         } else {
-            status=walk(fn, cb);
+            status = iwalk(fn, cb);
+        }
         if (status & (FtwStop|FtwError))
             goto out;
         if ((status = cb.processone(top, &st, FtwDirReturn))
             & (FtwStop|FtwError))
 ...
+    }
     return FsTreeWalker::FtwOk;
+    }
 };
+static const char *thisprog;
+static char usage [] =
+"trfstreewalk [-p pattern] [-P ignpath] topdir\n\n"
+;
+static void
+Usage(void)
+{
+    fprintf(stderr, "%s: usage:\n%s", thisprog, usage);
+    exit(1);
+}
+static int     op_flags;
+#define OPT_MOINS 0x1
+#define OPT_p   0x2
+#define OPT_P   0x4
 int main(int argc, const char **argv)
+{
-    if (argc < 2) {
+    list<string> patterns;
-  cerr << "Usage: fstreewalk <topdir> [ignpat [ignpat] ...]" << endl;
+    list<string> paths;
-  exit(1);
+    thisprog = argv[0];
+    argc--; argv++;
+  while (argc > 0 && **argv == '-') {
+    (*argv)++;
+    if (!(**argv))
+      /* Cas du "adb - core" */
+      Usage();
+    while (**argv)
+      switch (*(*argv)++) {
+      case 'p':   op_flags |= OPT_p; if (argc < 2)  Usage();
+    patterns.push_back(*(++argv));
+    argc--;
+    goto b1;
+      case 'P':   op_flags |= OPT_P; if (argc < 2)  Usage();
+    paths.push_back(*(++argv));
+  argc--;
+  goto b1;
+      default: Usage();   break;
+      }
-    argv++;argc--;
+  b1: argc--; argv++;
+  }
+  if (argc != 1)
+    Usage();
-    string topdir = *argv++;argc--;
+  string topdir = *argv++;argc--;
-    list<string> ignpats;
-    while (argc > 0) {
-  ignpats.push_back(*argv++);argc--;
-    FsTreeWalker walker;
+  FsTreeWalker walker;
-    walker.setSkippedNames(ignpats);
+  walker.setSkippedNames(patterns);
+  walker.setSkippedPaths(paths);
-    myCB cb;
+  myCB cb;
-    walker.walk(topdir, cb);
+  walker.walk(topdir, cb);
-    if (walker.getErrCnt() > 0)
+  if (walker.getErrCnt() > 0)
-  cout << walker.getReason();
+      cout << walker.getReason();
+}
 #endif // TEST_FSTREEWALK