#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 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);
* 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;
ATTR attr;
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_DIREND:
case FT_SPEC:
case FT_RAW:
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;