Complete port to Windows

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

diff --git a/bacula/src/filed/estimate.c b/bacula/src/filed/estimate.c
index dbec154325c59eebfabb23747bf089d14b453b39..ccf2e660f37a856a010e2d7a094a52a603f38d6a 100644 (file)
--- a/bacula/src/filed/estimate.c
+++ b/bacula/src/filed/estimate.c
@@ -1,5 +1,5 @@
 /*
- *  Bacula File Daemon estimate.c                  
+ *  Bacula File Daemon estimate.c
  *   Make and estimate of the number of files and size to be saved.
  *
  *    Kern Sibbald, September MMI
@@ -8,7 +8,7 @@
  *
  */
 /*
-   Copyright (C) 2000-2003 Kern Sibbald and John Walker
+   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
@@ -30,61 +30,82 @@
 #include "bacula.h"
 #include "filed.h"
 
-static int tally_file(FF_PKT *ff_pkt, void *pkt);
+static int tally_file(FF_PKT *ff_pkt, void *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((FF_PKT *)jcr->ff, jcr->incremental, jcr->mtime);
-
    stat = find_files(jcr, (FF_PKT *)jcr->ff, tally_file, (void *)jcr);
 
    return stat;
-}         
+}
 
-/* 
+/*
  * Called here by find() for each file included.
  *
  */
-static int tally_file(FF_PKT *ff_pkt, void *ijcr)
+static int tally_file(FF_PKT *ff_pkt, void *ijcr, bool top_level) 
 {
-   JCR *jcr = (JCR *) ijcr;
+   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_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;
 }