Make btape fill/unfill work

[bacula/bacula] / bacula / src / stored / butil.c

diff --git a/bacula/src/stored/butil.c b/bacula/src/stored/butil.c
index e27f52c97336b8f682510e875478b42af37efcf8..8c1b9996af2ef876bdedc7625a6e0ac8cbadcac3 100644 (file)
--- a/bacula/src/stored/butil.c
+++ b/bacula/src/stored/butil.c
@@ -75,27 +75,32 @@ DEVICE *setup_to_access_device(JCR *jcr, int read_access)
    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");
@@ -104,10 +109,8 @@ DEVICE *setup_to_access_device(JCR *jcr, int read_access)
 
    create_vol_list(jcr);
 
-   Dmsg1(100, "Volume=%s\n", jcr->VolumeName);
    if (read_access) {
       if (!acquire_device_for_read(jcr, dev, block)) {
-        Emsg0(M_ERROR, 0, dev->errmsg);
         free_block(block);
         return NULL;
       }
@@ -175,6 +178,10 @@ static void my_free_jcr(JCR *jcr)
       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;
@@ -190,13 +197,13 @@ static void my_free_jcr(JCR *jcr)
  * 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);
@@ -208,12 +215,17 @@ JCR *setup_jcr(char *name, char *device, BSR *bsr)
    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;
 }
 
@@ -228,15 +240,15 @@ void display_error_status(DEVICE *dev)
    Emsg0(M_ERROR, 0, dev->errmsg);
    status_dev(dev, &status);
    Dmsg1(20, "Device status: %x\n", status);
-   if (status & MT_EOD)
+   if (status & BMT_EOD)
       Emsg0(M_ERROR_TERM, 0, _("Unexpected End of Data\n"));
-   else if (status & MT_EOT)
+   else if (status & BMT_EOT)
       Emsg0(M_ERROR_TERM, 0, _("Unexpected End of Tape\n"));
-   else if (status & MT_EOF)
+   else if (status & BMT_EOF)
       Emsg0(M_ERROR_TERM, 0, _("Unexpected End of File\n"));
-   else if (status & MT_DR_OPEN)
+   else if (status & BMT_DR_OPEN)
       Emsg0(M_ERROR_TERM, 0, _("Tape Door is Open\n"));
-   else if (!(status & MT_ONLINE))
+   else if (!(status & BMT_ONLINE))
       Emsg0(M_ERROR_TERM, 0, _("Unexpected Tape is Off-line\n"));
    else
       Emsg2(M_ERROR_TERM, 0, _("Read error on Record Header %s: %s\n"), dev_name(dev), strerror(errno));