/*
Bacula® - The Network Backup Solution
- Copyright (C) 2000-2010 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2011 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.
*/
void do_verify(JCR *jcr)
{
- set_jcr_job_status(jcr, JS_Running);
+ jcr->setJobStatus(JS_Running);
jcr->buf_size = DEFAULT_NETWORK_BUFFER_SIZE;
if ((jcr->big_buf = (char *) malloc(jcr->buf_size)) == NULL) {
Jmsg1(jcr, M_ABORT, 0, _("Cannot malloc %d network read buffer\n"),
free(jcr->big_buf);
jcr->big_buf = NULL;
}
- set_jcr_job_status(jcr, JS_Terminated);
+ jcr->setJobStatus(JS_Terminated);
}
/*
jcr->num_files_examined--; /* correct file count */
return 1; /* ignored */
case FT_REPARSE:
+ case FT_JUNCTION:
case FT_DIREND:
Dmsg1(30, "FT_DIR saving: %s\n", ff_pkt->fname);
break;
}
/* Encode attributes and possibly extend them */
- encode_stat(attribs, &ff_pkt->statp, ff_pkt->LinkFI, 0);
+ encode_stat(attribs, &ff_pkt->statp, sizeof(ff_pkt->statp), ff_pkt->LinkFI, 0);
encode_attribsEx(jcr, attribsEx, ff_pkt);
jcr->lock();
stat = dir->fsend("%d %d %s %s%c%s%c%s%c", jcr->JobFiles,
STREAM_UNIX_ATTRIBUTES, ff_pkt->VerifyOpts, ff_pkt->fname,
0, attribs, 0, ff_pkt->link, 0);
- } else if (ff_pkt->type == FT_DIREND || ff_pkt->type == FT_REPARSE) {
+ } else if (ff_pkt->type == FT_DIREND || ff_pkt->type == FT_REPARSE ||
+ ff_pkt->type == FT_JUNCTION) {
/* Here link is the canonical filename (i.e. with trailing slash) */
stat = dir->fsend("%d %d %s %s%c%s%c%c", jcr->JobFiles,
STREAM_UNIX_ATTRIBUTES, ff_pkt->VerifyOpts, ff_pkt->link,
crypto_digest_update(digest, (uint8_t *)buf, n);
- /* Can be used by BaseJobs, update only for Verify jobs */
- if (jcr->getJobLevel() != L_FULL) {
+ /* Can be used by BaseJobs or with accurate, update only for Verify
+ * jobs
+ */
+ if (jcr->getJobType() == JT_VERIFY) {
jcr->JobBytes += n;
- jcr->ReadBytes += n;
}
+ jcr->ReadBytes += n;
}
if (n < 0) {
berrno be;