X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Ffiled%2Festimate.c;h=a4fd06d8dacbe37f5a2d4b134efd0c15ddfd84e5;hb=1d8a80a2d9753af63de42af584d7e57b832deba3;hp=56ff5e736ccdcba724cf57d066bde2f23569ad21;hpb=66696d1cadedbb362c392dadce9a8ce275dd5d80;p=bacula%2Fbacula

diff --git a/bacula/src/filed/estimate.c b/bacula/src/filed/estimate.c
index 56ff5e736c..a4fd06d8da 100644
--- a/bacula/src/filed/estimate.c
+++ b/bacula/src/filed/estimate.c
@@ -1,3 +1,30 @@
+/*
+   Bacula® - The Network Backup Solution
+
+   Copyright (C) 2001-2008 Free Software Foundation Europe e.V.
+
+   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., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+
+   Bacula® is a registered trademark of Kern Sibbald.
+   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.
@@ -7,30 +34,11 @@
  *   Version $Id$
  *
  */
-/*
-   Copyright (C) 2000-2004 Kern Sibbald and John Walker
-
-   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.
-
-   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.
-
- */
 
 #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.
@@ -39,10 +47,10 @@ int make_estimate(JCR *jcr)
 {
    int stat;
 
-   jcr->JobStatus = JS_Running;
+   set_jcr_job_status(jcr, JS_Running);
 
    set_find_options((FF_PKT *)jcr->ff, jcr->incremental, jcr->mtime);
-   stat = find_files(jcr, (FF_PKT *)jcr->ff, tally_file, (void *)jcr);
+   stat = find_files(jcr, (FF_PKT *)jcr->ff, tally_file, NULL);
 
    return stat;
 }
@@ -51,22 +59,23 @@ int make_estimate(JCR *jcr)
  * Called here by find() for each file included.
  *
  */
-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 */
+   case FT_LNKSAVED:                  /* Hard linked, file already saved */
    case FT_REGE:
    case FT_REG:
    case FT_LNK:
    case FT_NORECURSE:
    case FT_NOFSCHG:
    case FT_INVALIDFS:
+   case FT_INVALIDDT:
+   case FT_REPARSE:
    case FT_DIREND:
    case FT_SPEC:
    case FT_RAW:
@@ -86,19 +95,19 @@ static int tally_file(FF_PKT *ff_pkt, void *ijcr)
 
    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;
+         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 */
+         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 */
+   jcr->JobFiles++;                  /* increment number of files seen */
    if (jcr->listing) {
       memcpy(&attr.statp, &ff_pkt->statp, sizeof(struct stat));
       attr.type = ff_pkt->type;