Implement first cut DCR in SD

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

diff --git a/bacula/src/stored/butil.c b/bacula/src/stored/butil.c
index 6a1446582b6b31d99959858710861edbc4b6d25e..1e1387cf4bd3b2a0594c3cc8fcf7408571bd108c 100644 (file)
--- a/bacula/src/stored/butil.c
+++ b/bacula/src/stored/butil.c
@@ -1,7 +1,7 @@
 /*
  *
  *  Utility routines for "tool" programs such as bscan, bls,
- *    bextract, ...  
+ *    bextract, ...  Some routines also used by Bacula.
  * 
  *  Normally nothing in this file is called by the Storage   
  *    daemon because we interact more directly with the user
@@ -71,7 +71,6 @@ char *rec_state_to_str(DEV_RECORD *rec)
 DEVICE *setup_to_access_device(JCR *jcr, int read_access)
 {
    DEVICE *dev;
-   DEV_BLOCK *block;
    char *p;
    DEVRES *device;
 
@@ -101,23 +100,19 @@ DEVICE *setup_to_access_device(JCR *jcr, int read_access)
    
    dev = init_dev(NULL, device);
    jcr->device->dev = dev;
-   if (!dev || !open_device(dev)) {
+   if (!dev || !first_open_device(dev)) {
       Jmsg1(jcr, M_FATAL, 0, _("Cannot open %s\n"), jcr->dev_name);
       return NULL;
    }
    Dmsg0(90, "Device opened for read.\n");
 
-   block = new_block(dev);
-
    create_vol_list(jcr);
 
    if (read_access) {
-      if (!acquire_device_for_read(jcr, dev, block)) {
-        free_block(block);
+      if (!acquire_device_for_read(jcr)) {
         return NULL;
       }
    }
-   free_block(block);
    return dev;
 }
 
@@ -191,6 +186,10 @@ static void my_free_jcr(JCR *jcr)
    if (jcr->VolList) {
       free_vol_list(jcr);
    }  
+   if (jcr->dcr) {
+      free_dcr(jcr->dcr);
+      jcr->dcr = NULL;
+   }
      
    return;
 }
@@ -219,8 +218,8 @@ JCR *setup_jcr(char *name, char *device, BSR *bsr, char *VolumeName)
    pm_strcpy(&jcr->fileset_name, "Dummy.fileset.name");
    jcr->fileset_md5 = get_pool_memory(PM_FNAME);
    pm_strcpy(&jcr->fileset_md5, "Dummy.fileset.md5");
-   jcr->JobId = 1;
-   jcr->JobType = JT_BACKUP;
+   jcr->JobId = 0;
+   jcr->JobType = JT_CONSOLE;
    jcr->JobLevel = L_FULL;
    jcr->JobStatus = JS_Terminated;
    jcr->dev_name = get_pool_memory(PM_FNAME);
@@ -240,12 +239,11 @@ void display_tape_error_status(JCR *jcr, DEVICE *dev)
 {
    uint32_t status;
 
-   Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
-   status_dev(dev, &status);
+   status = status_dev(dev);
    Dmsg1(20, "Device status: %x\n", status);
    if (status & BMT_EOD)
       Jmsg(jcr, M_ERROR, 0, _("Unexpected End of Data\n"));
-   else if (status & BMT_EOT)
+  else if (status & BMT_EOT)
       Jmsg(jcr, M_ERROR, 0, _("Unexpected End of Tape\n"));
    else if (status & BMT_EOF)
       Jmsg(jcr, M_ERROR, 0, _("Unexpected End of File\n"));
@@ -253,6 +251,4 @@ void display_tape_error_status(JCR *jcr, DEVICE *dev)
       Jmsg(jcr, M_ERROR, 0, _("Tape Door is Open\n"));
    else if (!(status & BMT_ONLINE))
       Jmsg(jcr, M_ERROR, 0, _("Unexpected Tape is Off-line\n"));
-   else
-      Jmsg(jcr, M_ERROR, 0, _("Read error on Record Header %s: %s\n"), dev_name(dev), strerror(errno));
 }