char *p;
DEVRES *device;
- jcr->VolumeName[0] = 0;
- if (strncmp(jcr->dev_name, "/dev/", 5) != 0) {
- /* Try stripping file part */
- p = jcr->dev_name + strlen(jcr->dev_name);
- while (p >= jcr->dev_name && *p != '/')
- p--;
- if (*p == '/') {
- strcpy(jcr->VolumeName, p+1);
- *p = 0;
+ /*
+ * If no volume name already given and no bsr, and it is a file,
+ * try getting name from Filename
+ */
+ if (!jcr->bsr && jcr->VolumeName[0] == 0) {
+ if (strncmp(jcr->dev_name, "/dev/", 5) != 0) {
+ /* Try stripping file part */
+ p = jcr->dev_name + strlen(jcr->dev_name);
+ while (p >= jcr->dev_name && *p != '/')
+ p--;
+ if (*p == '/') {
+ strcpy(jcr->VolumeName, p+1);
+ *p = 0;
+ }
}
}
if ((device=find_device_res(jcr->dev_name, read_access)) == NULL) {
- Emsg2(M_FATAL, 0, _("Cannot find device %s in config file %s.\n"),
+ Jmsg2(jcr, M_FATAL, 0, _("Cannot find device %s in config file %s.\n"),
jcr->dev_name, configfile);
return NULL;
}
dev = init_dev(NULL, device);
if (!dev || !open_device(dev)) {
- Emsg1(M_FATAL, 0, _("Cannot open %s\n"), jcr->dev_name);
+ Jmsg1(jcr, M_FATAL, 0, _("Cannot open %s\n"), jcr->dev_name);
return NULL;
}
Dmsg0(90, "Device opened for read.\n");
if (read_access) {
if (!acquire_device_for_read(jcr, dev, block)) {
- Emsg0(M_ERROR, 0, dev->errmsg);
free_block(block);
return NULL;
}
free_pool_memory(jcr->fileset_name);
jcr->fileset_name = NULL;
}
+ if (jcr->fileset_md5) {
+ free_pool_memory(jcr->fileset_md5);
+ jcr->fileset_md5 = NULL;
+ }
if (jcr->dev_name) {
free_pool_memory(jcr->dev_name);
jcr->dev_name = NULL;
* Setup a "daemon" JCR for the various standalone
* tools (e.g. bls, bextract, bscan, ...)
*/
-JCR *setup_jcr(char *name, char *device, BSR *bsr)
+JCR *setup_jcr(char *name, char *device, BSR *bsr, char *VolumeName)
{
JCR *jcr = new_jcr(sizeof(JCR), my_free_jcr);
jcr->VolSessionId = 1;
jcr->VolSessionTime = (uint32_t)time(NULL);
jcr->bsr = bsr;
- jcr->NumVolumes = 1;
+ jcr->NumVolumes = 0;
jcr->pool_name = get_pool_memory(PM_FNAME);
strcpy(jcr->pool_name, "Default");
jcr->pool_type = get_pool_memory(PM_FNAME);
strcpy(jcr->Job, name);
jcr->fileset_name = get_pool_memory(PM_FNAME);
strcpy(jcr->fileset_name, "Dummy.fileset.name");
+ jcr->fileset_md5 = get_pool_memory(PM_FNAME);
+ strcpy(jcr->fileset_md5, "Dummy.fileset.md5");
jcr->JobId = 1;
jcr->JobType = JT_BACKUP;
jcr->JobLevel = L_FULL;
jcr->JobStatus = JS_Terminated;
jcr->dev_name = get_pool_memory(PM_FNAME);
pm_strcpy(&jcr->dev_name, device);
+ if (!bsr && VolumeName) {
+ pm_strcpy(&jcr->VolumeName, VolumeName);
+ }
return jcr;
}