Escape filenames in restore command

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

diff --git a/bacula/src/stored/block.c b/bacula/src/stored/block.c
index 65acac6ea06120aa9adba6f2cab6dbd0e0578079..7de8be29c7a311914f40b838a64f2091ac9629de 100644 (file)
--- a/bacula/src/stored/block.c
+++ b/bacula/src/stored/block.c
@@ -256,8 +256,8 @@ static int unser_block_header(DEVICE *dev, DEV_BLOCK *block)
       if (BlockCheckSum != CheckSum) {
          Dmsg2(00, "Block checksum mismatch: calc=%x blk=%x\n", BlockCheckSum,
            CheckSum);
-         Mmsg2(&dev->errmsg, _("Block checksum mismatch: calc=%x blk=%x\n"), BlockCheckSum,
-           CheckSum);
+         Mmsg3(&dev->errmsg, _("Block checksum mismatch in block %u: calc=%x blk=%x\n"), 
+           (unsigned)BlockNumber, BlockCheckSum, CheckSum);
         return 0;
       }
    }
@@ -276,6 +276,7 @@ int write_block_to_device(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
    int stat = 1;
    lock_device(dev);
    if (!write_block_to_dev(jcr, dev, block)) {
+       Jmsg(jcr, M_INFO, 0, "%s", dev->errmsg);
        stat = fixup_device_block_write_error(jcr, dev, block);
    }
    unlock_device(dev);
@@ -304,6 +305,7 @@ int write_block_to_dev(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
    /* dump_block(block, "before write"); */
    if (dev->state & ST_WEOT) {
       Dmsg0(100, "return write_block_to_dev with ST_WEOT\n");
+      Mmsg0(&dev->errmsg, _("Cannot write block. Device at EOF.\n"));
       return 0;
    }
    wlen = block->binbuf;
@@ -348,10 +350,10 @@ int write_block_to_dev(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
       dev->state |= ST_WEOT;
       Dmsg0(10, "==== Output bytes Triggered medium max capacity.\n");
       if (hit_max1) {
-         Mmsg2(&dev->errmsg, _("Max. Volume capacity %s exceeded on device %s.\n"),
+         Mmsg(&dev->errmsg, _("Max. Volume capacity %s exceeded on device %s.\n"),
            edit_uint64(dev->max_volume_size, ed1),  dev->dev_name);
       } else {
-         Mmsg2(&dev->errmsg, _("Max. Volume capacity %s exceeded on device %s.\n"),
+         Mmsg(&dev->errmsg, _("Max. Volume capacity %s exceeded on device %s.\n"),
            edit_uint64(dev->VolCatInfo.VolCatMaxBytes, ed1),  dev->dev_name);
       }
       block->failed_write = TRUE;
@@ -362,6 +364,17 @@ int write_block_to_dev(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
       return 0;
    }
 
+   /* Limit maximum File size on volume to user specified value */
+   if (dev->state & ST_TAPE) {
+      if ((dev->max_file_size > 0) && 
+         (dev->file_addr+block->binbuf) >= dev->max_file_size) {
+        if (weof_dev(dev, 1) != 0) {            /* write eof */
+            Jmsg(jcr, M_ERROR, 0, "%s", dev->errmsg);
+           /* Plunge on anyway -- if tape is bad we will die on write */
+        }
+      }
+   }
+
    dev->VolCatInfo.VolCatWrites++;
    Dmsg1(500, "Write block of %u bytes\n", wlen);      
    if ((uint32_t)(stat=write(dev->fd, block->buf, (size_t)wlen)) != wlen) {
@@ -382,8 +395,13 @@ int write_block_to_dev(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
       Dmsg4(10, "=== Write error. size=%u rtn=%d  errno=%d: ERR=%s\n", 
         wlen, stat, dev->dev_errno, strerror(dev->dev_errno));
 
-      Mmsg4(&dev->errmsg, _("Write error on device %s. Write of %u bytes got %d. ERR=%s.\n"), 
-        dev->dev_name, wlen, stat, strerror(dev->dev_errno));
+      if (stat == -1) {
+         Mmsg2(&dev->errmsg, _("Write error on device %s. ERR=%s.\n"), 
+           dev->dev_name, strerror(dev->dev_errno));
+      } else {
+         Mmsg3(&dev->errmsg, _("End of media on device %s. Write of %u bytes got %d.\n"), 
+           dev->dev_name, wlen, stat);
+      }  
       block->failed_write = TRUE;
       dev->EndBlock = dev->block_num;
       dev->EndFile  = dev->file;
@@ -436,16 +454,10 @@ int write_block_to_dev(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
    dev->file_addr += wlen;
    dev->EndBlock = dev->block_num;
    dev->EndFile  = dev->file;
-
-   /* Limit maximum File size on volume to user specified value */
-   if (dev->state & ST_TAPE) {
-      if ((dev->max_file_size > 0) && dev->file_addr >= dev->max_file_size) {
-        weof_dev(dev, 1);               /* write eof */
-      }
-   }
-
    dev->block_num++;
    block->BlockNumber++;
+
+
    Dmsg2(190, "write_block: wrote block %d bytes=%d\n", dev->block_num,
       wlen);
    empty_block(block);