Plugin updates

[bacula/bacula] / bacula / src / findlib / find.c

diff --git a/bacula/src/findlib/find.c b/bacula/src/findlib/find.c
index e9e1d94f25ba0bca0e8e048b4b248cd99b7ece15..3f0ad75377075efa199937d525c41f8b4a7135ca 100644 (file)
--- a/bacula/src/findlib/find.c
+++ b/bacula/src/findlib/find.c
@@ -148,11 +148,6 @@ get_win32_driveletters(FF_PKT *ff, char* szDrives)
 }
 
 /*
- * Find all specified files (determined by calls to name_add()
- * This routine calls the (handle_file) subroutine with all
- * sorts of good information for the final disposition of
- * the file.
- *
  * Call this subroutine with a callback subroutine as the first
  * argument and a packet as the second argument, this packet
  * will be passed back to the callback subroutine as the last
@@ -203,9 +198,11 @@ find_files(JCR *jcr, FF_PKT *ff, int callback(FF_PKT *ff_pkt, void *hpkt, bool t
          }
          foreach_dlist(node, &incexe->plugin_list) {
             char *fname = node->c_str();
-            Dmsg1(100, "P %s\n", fname);
+            Dmsg1(100, "PluginCommand: %s\n", fname);
             ff->top_fname = fname;
+            ff->cmd_plugin = true;
             generate_plugin_event(jcr, bEventPluginCommand, (void *)fname);
+            ff->cmd_plugin = false;
          }
       }
    }
@@ -237,8 +234,6 @@ static bool accept_file(FF_PKT *ff)
       findFOPTS *fo = (findFOPTS *)incexe->opts_list.get(j);
       ff->flags = fo->flags;
       ff->GZIP_level = fo->GZIP_level;
-      ff->reader = fo->reader;
-      ff->writer = fo->writer;
       ff->fstypes = fo->fstype;
       ff->drivetypes = fo->drivetype;
 
@@ -398,7 +393,6 @@ static int our_callback(FF_PKT *ff, void *hpkt, bool top_level)
    case FT_SPEC:
    case FT_DIRNOCHG:
       if (accept_file(ff)) {
-//       Dmsg2(000, "Accept file %s; reader=%s\n", ff->fname, NPRT(ff->reader));
          return ff->callback(ff, hpkt, top_level);
       } else {
          Dmsg1(100, "Skip file %s\n", ff->fname);