- Add a kludge to detect bad date/times, which cause a seg fault in

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

diff --git a/bacula/src/filed/estimate.c b/bacula/src/filed/estimate.c
index 24d047171711bbd5871a60458a3c92fbaf9dd9f3..bee59417eadb08a03ce44ec0e9109cc443bae540 100644 (file)
--- a/bacula/src/filed/estimate.c
+++ b/bacula/src/filed/estimate.c
@@ -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
@@ -41,8 +41,7 @@ int make_estimate(JCR *jcr)
 
    jcr->JobStatus = JS_Running;
 
-   set_find_options((FF_PKT *)jcr->ff, jcr->incremental, jcr->mtime, jcr->mtime_only);
-
+   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;
@@ -54,19 +53,23 @@ int make_estimate(JCR *jcr)
  */
 static int tally_file(FF_PKT *ff_pkt, void *ijcr)
 {
-   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_REGE:
    case FT_REG:
    case FT_LNK:
-   case FT_DIR:
+   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:
@@ -84,7 +87,14 @@ static int tally_file(FF_PKT *ff_pkt, void *ijcr)
         ff_pkt->statp.st_size > 0) {
       jcr->JobBytes += ff_pkt->statp.st_size;
    }
-
-   jcr->JobFiles++;                 /* increment number of files sent */
+   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);
+   }
    return 1;
 }