Suppress incorrect 'Will not descend from x into y' messages

[bacula/bacula] / bacula / src / filed / estimate.c

diff --git a/bacula/src/filed/estimate.c b/bacula/src/filed/estimate.c
index c5821b69c2ccba6d2561ff0770297bb2c11196e8..1058e01202a23e57b4cb48a54a92b9bfb5b3bf4c 100644 (file)
--- a/bacula/src/filed/estimate.c
+++ b/bacula/src/filed/estimate.c
@@ -1,90 +1,119 @@
 /*
- *  Bacula File Daemon estimate.c                  
- *   Make and estimate of the number of files and size to be saved.
- *
- *    Kern Sibbald, September MMI
- *
- *   Version $Id$
- *
- */
-/*
-   Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+   Bacula® - The Network Backup Solution
 
-   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 (at your option) any later version.
+   Copyright (C) 2001-2008 Free Software Foundation Europe e.V.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   The main author of Bacula is Kern Sibbald, with contributions from
+   many others, a complete list can be found in the file AUTHORS.
+   This program is Free Software; you can redistribute it and/or
+   modify it under the terms of version two of the GNU General Public
+   License as published by the Free Software Foundation and included
+   in the file LICENSE.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 
-   You should have received a copy of the GNU General Public
-   License along with this program; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
+   Bacula® is a registered trademark of John Walker.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
+*/
+/*
+ *  Bacula File Daemon estimate.c
+ *   Make and estimate of the number of files and size to be saved.
+ *
+ *    Kern Sibbald, September MMI
+ *
+ *   Version $Id$
+ *
  */
 
 #include "bacula.h"
 #include "filed.h"
 
-static int tally_file(FF_PKT *ff_pkt, void *pkt);
+static int tally_file(JCR *jcr, FF_PKT *ff_pkt, bool);
 
-/* 
+/*
  * Find all the requested files and count them.
  */
 int make_estimate(JCR *jcr)
 {
    int stat;
 
-   jcr->JobStatus = JS_Running;
+   set_jcr_job_status(jcr, JS_Running);
 
-   set_find_options(jcr->ff, jcr->incremental, jcr->mtime);
-
-   stat = find_files(jcr->ff, tally_file, (void *)jcr);
+   set_find_options((FF_PKT *)jcr->ff, jcr->incremental, jcr->mtime);
+   stat = find_files(jcr, (FF_PKT *)jcr->ff, tally_file, NULL);
 
    return stat;
-}         
+}
 
-/* 
+/*
  * Called here by find() for each file included.
  *
- *  *****FIXME*****   add FSMs File System Modules
- *
  */
-static int tally_file(FF_PKT *ff_pkt, void *ijcr)
+static int tally_file(JCR *jcr, FF_PKT *ff_pkt, bool top_level) 
 {
-   JCR *jcr = (JCR *) ijcr;
+   ATTR attr;
 
+   if (job_canceled(jcr)) {
+      return 0;
+   }
    switch (ff_pkt->type) {
-   case FT_LNKSAVED:                 /* Hard linked, file already saved */
-      break;
+   case FT_LNKSAVED:                  /* Hard linked, file already saved */
    case FT_REGE:
    case FT_REG:
    case FT_LNK:
-   case FT_DIR:
+   case FT_NORECURSE:
+   case FT_NOFSCHG:
+   case FT_INVALIDFS:
+   case FT_INVALIDDT:
+   case FT_REPARSE:
+   case FT_DIREND:
    case FT_SPEC:
+   case FT_RAW:
+   case FT_FIFO:
       break;
+   case FT_DIRBEGIN:
    case FT_NOACCESS:
    case FT_NOFOLLOW:
    case FT_NOSTAT:
    case FT_DIRNOCHG:
    case FT_NOCHG:
    case FT_ISARCH:
-   case FT_NORECURSE:
-   case FT_NOFSCHG:
    case FT_NOOPEN:
    default:
       return 1;
    }
 
-   if (ff_pkt->type != FT_LNKSAVED && S_ISREG(ff_pkt->statp.st_mode) && 
-        ff_pkt->statp.st_size > 0) {
-      jcr->JobBytes += ff_pkt->statp.st_size;
+   if (ff_pkt->type != FT_LNKSAVED && S_ISREG(ff_pkt->statp.st_mode)) {
+      if (ff_pkt->statp.st_size > 0) {
+         jcr->JobBytes += ff_pkt->statp.st_size;
+      }
+#ifdef HAVE_DARWIN_OS
+      if (ff_pkt->flags & FO_HFSPLUS) {
+         if (ff_pkt->hfsinfo.rsrclength > 0) {
+            jcr->JobBytes += ff_pkt->hfsinfo.rsrclength;
+         }
+         jcr->JobBytes += 32;    /* Finder info */
+      }
+#endif
+   }
+   jcr->num_files_examined++;
+   jcr->JobFiles++;                  /* increment number of files seen */
+   if (jcr->listing) {
+      memcpy(&attr.statp, &ff_pkt->statp, sizeof(struct stat));
+      attr.type = ff_pkt->type;
+      attr.ofname = (POOLMEM *)ff_pkt->fname;
+      attr.olname = (POOLMEM *)ff_pkt->link;
+      print_ls_output(jcr, &attr);
    }
-
-   jcr->JobFiles++;                 /* increment number of files sent */
    return 1;
 }