wait_time = time(NULL);
status_dev(dev, &stat);
- if (stat & MT_EOD) {
+ if (stat & BMT_EOD) {
Dmsg0(100, "======= Got EOD ========\n");
block_device(dev, BST_DOING_ACQUIRE);
unblock_device(dev);
return 0;
}
+ mjcr->VolFirstIndex = 0; /* prevent writing jobmedia second time */
}
strcpy(dev->VolCatInfo.VolCatStatus, "Full");
}
Dmsg0(100, "Back from update_vol_info\n");
- strcpy(PrevVolName, dev->VolCatInfo.VolCatName);
- strcpy(dev->VolHdr.PrevVolName, PrevVolName);
+ bstrncpy(PrevVolName, dev->VolCatInfo.VolCatName, sizeof(PrevVolName));
+ bstrncpy(dev->VolHdr.PrevVolName, PrevVolName, sizeof(dev->VolHdr.PrevVolName));
label_blk = new_block(dev);
- /* Inform User about end of media */
- Jmsg(jcr, M_INFO, 0, _("End of media on Volume %s Bytes=%s Blocks=%s.\n"),
+ /* Inform User about end of medium */
+ Jmsg(jcr, M_INFO, 0, _("End of medium on Volume \"%s\" Bytes=%s Blocks=%s.\n"),
PrevVolName, edit_uint64_with_commas(dev->VolCatInfo.VolCatBytes, b1),
edit_uint64_with_commas(dev->VolCatInfo.VolCatBlocks, b2));
}
P(dev->mutex); /* lock again */
- Jmsg(jcr, M_INFO, 0, _("New volume %s mounted on device %s\n"),
+ Jmsg(jcr, M_INFO, 0, _("New volume \"%s\" mounted on device %s\n"),
jcr->VolumeName, dev_name(dev));
/*
mjcr->StartBlock = (uint32_t)dev->file_addr;
mjcr->StartFile = (uint32_t)(dev->file_addr >> 32);
}
- mjcr->VolFirstFile = mjcr->JobFiles;
+ /* Set first FirstIndex for new Volume */
+ mjcr->VolFirstIndex = mjcr->JobFiles;
mjcr->run_time += time(NULL) - wait_time; /* correct run time */
}
unblock_device(dev);