ebl fix debug message

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

diff --git a/bacula/src/stored/btape.c b/bacula/src/stored/btape.c
index 92582eafee45090bea208792b7b37e745fa8de41..6637b947b76c04df3532e2df91a8b3e0a557a595 100644 (file)
--- a/bacula/src/stored/btape.c
+++ b/bacula/src/stored/btape.c
@@ -1,3 +1,30 @@
+/*
+   Bacula® - The Network Backup Solution
+
+   Copyright (C) 2000-2007 Free Software Foundation Europe e.V.
+
+   The main author of Bacula is Kern Sibbald, with contributions from
+   many others, a complete list can be found in the file AUTHORS.
+   This program is Free Software; you can redistribute it and/or
+   modify it under the terms of version two of the GNU General Public
+   License as published by the Free Software Foundation plus additions
+   that are listed in the file LICENSE.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+
+   Bacula® is a registered trademark of John Walker.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
+*/

 /*
  *
  *   Bacula Tape manipulation program
 /*
  *
  *   Bacula Tape manipulation program


@@ -13,20 +40,6 @@
  *   Version $Id$
  *
  */
  *   Version $Id$
  *
  */

-/*
-   Copyright (C) 2000-2005 Kern Sibbald
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   version 2 as ammended with additional clauses defined in the
-   file LICENSE in the main source directory.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
-   the file LICENSE for additional details.
-
- */

 
 #include "bacula.h"
 #include "stored.h"
 
 #include "bacula.h"
 #include "stored.h"


@@ -66,6 +79,7 @@ static void rewindcmd();
 static void clearcmd();
 static void wrcmd();
 static void rrcmd();
 static void clearcmd();
 static void wrcmd();
 static void rrcmd();

+static void rbcmd();

 static void eodcmd();
 static void fillcmd();
 static void qfillcmd();
 static void eodcmd();
 static void fillcmd();
 static void qfillcmd();


@@ -78,7 +92,6 @@ static bool my_mount_next_read_volume(DCR *dcr);
 static void scan_blocks();
 static void set_volume_name(const char *VolName, int volnum);
 static void rawfill_cmd();
 static void scan_blocks();
 static void set_volume_name(const char *VolName, int volnum);
 static void rawfill_cmd();

-static void bfill_cmd();

 static bool open_the_device();
 static void autochangercmd();
 static void do_unfill();
 static bool open_the_device();
 static void autochangercmd();
 static void do_unfill();


@@ -96,6 +109,7 @@ static char *argv[MAX_CMD_ARGS];
 static int argc;
 
 static int quickie_count = 0;
 static int argc;
 
 static int quickie_count = 0;

+static uint64_t write_count = 0;

 static BSR *bsr = NULL;
 static int signals = TRUE;
 static bool ok;
 static BSR *bsr = NULL;
 static int signals = TRUE;
 static bool ok;


@@ -138,7 +152,7 @@ int get_cmd(const char *prompt);
 
 /*********************************************************************
  *
 
 /*********************************************************************
  *

- *         Main Bacula Pool Creation Program
+ *     Bacula tape testing program

  *
  */
 int main(int margc, char *margv[])
  *
  */
 int main(int margc, char *margv[])


@@ -147,24 +161,29 @@ int main(int margc, char *margv[])
    uint32_t x32, y32;
    uint64_t x64, y64;
    char buf[1000];
    uint32_t x32, y32;
    uint64_t x64, y64;
    char buf[1000];

+   
+   setlocale(LC_ALL, "");
+   bindtextdomain("bacula", LOCALEDIR);
+   textdomain("bacula");
+   init_stack_dump();

 
    /* Sanity checks */
    if (TAPE_BSIZE % B_DEV_BSIZE != 0 || TAPE_BSIZE / B_DEV_BSIZE == 0) {
 
    /* Sanity checks */
    if (TAPE_BSIZE % B_DEV_BSIZE != 0 || TAPE_BSIZE / B_DEV_BSIZE == 0) {

-      Emsg2(M_ABORT, 0, "Tape block size (%d) not multiple of system size (%d)\n",
+      Emsg2(M_ABORT, 0, _("Tape block size (%d) not multiple of system size (%d)\n"),

          TAPE_BSIZE, B_DEV_BSIZE);
    }
    if (TAPE_BSIZE != (1 << (ffs(TAPE_BSIZE)-1))) {
          TAPE_BSIZE, B_DEV_BSIZE);
    }
    if (TAPE_BSIZE != (1 << (ffs(TAPE_BSIZE)-1))) {

-      Emsg1(M_ABORT, 0, "Tape block size (%d) is not a power of 2\n", TAPE_BSIZE);
+      Emsg1(M_ABORT, 0, _("Tape block size (%d) is not a power of 2\n"), TAPE_BSIZE);

    }
    }

-   if (sizeof(off_t) < 8) {
-      Pmsg1(-1, "\n\n!!!! Warning large disk addressing disabled. off_t=%d should be 8 or more !!!!!\n\n\n",
-         sizeof(off_t));
+   if (sizeof(boffset_t) < 8) {
+      Pmsg1(-1, _("\n\n!!!! Warning large disk addressing disabled. boffset_t=%d should be 8 or more !!!!!\n\n\n"),
+         sizeof(boffset_t));

    }
    x32 = 123456789;
    bsnprintf(buf, sizeof(buf), "%u", x32);
    }
    x32 = 123456789;
    bsnprintf(buf, sizeof(buf), "%u", x32);

-   i = bsscanf(buf, "%u", &y32);
+   i = bsscanf(buf, "%lu", &y32);

    if (i != 1 || x32 != y32) {
    if (i != 1 || x32 != y32) {

-      Pmsg3(-1, "32 bit printf/scanf problem. i=%d x32=%u y32=%u\n", i, x32, y32);
+      Pmsg3(-1, _("32 bit printf/scanf problem. i=%d x32=%u y32=%u\n"), i, x32, y32);

       exit(1);
    }
    x64 = 123456789;
       exit(1);
    }
    x64 = 123456789;


@@ -173,16 +192,19 @@ int main(int margc, char *margv[])
    bsnprintf(buf, sizeof(buf), "%" llu, x64);
    i = bsscanf(buf, "%llu", &y64);
    if (i != 1 || x64 != y64) {
    bsnprintf(buf, sizeof(buf), "%" llu, x64);
    i = bsscanf(buf, "%llu", &y64);
    if (i != 1 || x64 != y64) {

-      Pmsg3(-1, "64 bit printf/scanf problem. i=%d x64=%" llu " y64=%" llu "\n", i, x64, y64);
+      Pmsg3(-1, _("64 bit printf/scanf problem. i=%d x64=%" llu " y64=%" llu "\n"), 
+            i, x64, y64);

       exit(1);
    }
 
       exit(1);
    }
 

-   printf("Tape block granularity is %d bytes.\n", TAPE_BSIZE);
+   printf(_("Tape block granularity is %d bytes.\n"), TAPE_BSIZE);

 
    working_directory = "/tmp";
    my_name_is(margc, margv, "btape");
    init_msg(NULL, NULL);
 
 
    working_directory = "/tmp";
    my_name_is(margc, margv, "btape");
    init_msg(NULL, NULL);
 

+   OSDependentInit();
+

    while ((ch = getopt(margc, margv, "b:c:d:psv?")) != -1) {
       switch (ch) {
       case 'b':                    /* bootstrap file */
    while ((ch = getopt(margc, margv, "b:c:d:psv?")) != -1) {
       switch (ch) {
       case 'b':                    /* bootstrap file */


@@ -244,11 +266,11 @@ int main(int margc, char *margv[])
 
    /* See if we can open a device */
    if (margc == 0) {
 
    /* See if we can open a device */
    if (margc == 0) {

-      Pmsg0(000, "No archive name specified.\n");
+      Pmsg0(000, _("No archive name specified.\n"));

       usage();
       exit(1);
    } else if (margc != 1) {
       usage();
       exit(1);
    } else if (margc != 1) {

-      Pmsg0(000, "Improper number of arguments specified.\n");
+      Pmsg0(000, _("Improper number of arguments specified.\n"));

       usage();
       exit(1);
    }
       usage();
       exit(1);
    }


@@ -261,6 +283,16 @@ int main(int margc, char *margv[])
    if (!dev) {
       exit(1);
    }
    if (!dev) {
       exit(1);
    }

+   if (dev->is_dvd()) {
+      Pmsg0(000, _("btape does not work with DVD storage.\n"));
+      usage();
+      exit(1);
+   }
+   if (!dev->is_tape()) {
+      Pmsg0(000, _("btape only works with tape storage.\n"));
+      usage();
+      exit(1);
+   }

    dcr = jcr->dcr;
    if (!open_the_device()) {
       goto terminate;
    dcr = jcr->dcr;
    if (!open_the_device()) {
       goto terminate;


@@ -299,9 +331,11 @@ static void terminate_btape(int stat)
    jcr = NULL;
 
    if (dev) {
    jcr = NULL;
 
    if (dev) {

-      term_dev(dev);
+      dev->term();

    }
 
    }
 

+   free_volume_list();
+

    if (debug_level > 10)
       print_memory_pool_stats();
 
    if (debug_level > 10)
       print_memory_pool_stats();
 


@@ -321,23 +355,23 @@ static void terminate_btape(int stat)
 static bool open_the_device()
 {
    DEV_BLOCK *block;
 static bool open_the_device()
 {
    DEV_BLOCK *block;

+   bool ok = true;

 
    block = new_block(dev);
 
    block = new_block(dev);

-   lock_device(dev);
-   if (!dev->is_open()) {
-      Dmsg1(200, "Opening device %s\n", dcr->VolumeName);
-      if (dev->open(dcr, OPEN_READ_WRITE) < 0) {
-         Emsg1(M_FATAL, 0, _("dev open failed: %s\n"), dev->errmsg);
-         unlock_device(dev);
-         free_block(block);
-         return false;
-      }
+   dev->r_dlock();
+   Dmsg1(200, "Opening device %s\n", dcr->VolumeName);
+   if (dev->open(dcr, OPEN_READ_WRITE) < 0) {
+      Emsg1(M_FATAL, 0, _("dev open failed: %s\n"), dev->errmsg);
+      ok = false;
+      goto bail_out;

    }
    }

-   Pmsg1(000, "open_ ev %s OK\n", dev->print_name());
+   Pmsg1(000, _("open device %s: OK\n"), dev->print_name());

    dev->set_append();                 /* put volume in append mode */
    dev->set_append();                 /* put volume in append mode */

-   unlock_device(dev);
+
+bail_out:
+   dev->dunlock();

    free_block(block);
    free_block(block);

-   return true;
+   return ok;

 }
 
 
 }
 
 


@@ -354,19 +388,20 @@ static void labelcmd()
    if (VolumeName) {
       pm_strcpy(cmd, VolumeName);
    } else {
    if (VolumeName) {
       pm_strcpy(cmd, VolumeName);
    } else {

-      if (!get_cmd("Enter Volume Name: ")) {
+      if (!get_cmd(_("Enter Volume Name: "))) {

          return;
       }
    }
 
    if (!dev->is_open()) {
       if (!first_open_device(dcr)) {
          return;
       }
    }
 
    if (!dev->is_open()) {
       if (!first_open_device(dcr)) {

-         Pmsg1(0, "Device open failed. ERR=%s\n", strerror_dev(dev));
+         Pmsg1(0, _("Device open failed. ERR=%s\n"), dev->bstrerror());

       }
    }
       }
    }

-   rewind_dev(dev);
-   write_new_volume_label_to_dev(dcr, cmd, "Default");
-   Pmsg1(-1, "Wrote Volume label for volume \"%s\".\n", cmd);
+   dev->rewind(dcr);
+   dev->weof(1);
+   write_new_volume_label_to_dev(dcr, cmd, "Default", false,/*no relabel*/ true /* label dvd now */);
+   Pmsg1(-1, _("Wrote Volume label for volume \"%s\".\n"), cmd);

 }
 
 /*
 }
 
 /*


@@ -380,28 +415,28 @@ static void readlabelcmd()
    stat = read_dev_volume_label(dcr);
    switch (stat) {
    case VOL_NO_LABEL:
    stat = read_dev_volume_label(dcr);
    switch (stat) {
    case VOL_NO_LABEL:

-      Pmsg0(0, "Volume has no label.\n");
+      Pmsg0(0, _("Volume has no label.\n"));

       break;
    case VOL_OK:
       break;
    case VOL_OK:

-      Pmsg0(0, "Volume label read correctly.\n");
+      Pmsg0(0, _("Volume label read correctly.\n"));

       break;
    case VOL_IO_ERROR:
       break;
    case VOL_IO_ERROR:

-      Pmsg1(0, "I/O error on device: ERR=%s", strerror_dev(dev));
+      Pmsg1(0, _("I/O error on device: ERR=%s"), dev->bstrerror());

       break;
    case VOL_NAME_ERROR:
       break;
    case VOL_NAME_ERROR:

-      Pmsg0(0, "Volume name error\n");
+      Pmsg0(0, _("Volume name error\n"));

       break;
    case VOL_CREATE_ERROR:
       break;
    case VOL_CREATE_ERROR:

-      Pmsg1(0, "Error creating label. ERR=%s", strerror_dev(dev));
+      Pmsg1(0, _("Error creating label. ERR=%s"), dev->bstrerror());

       break;
    case VOL_VERSION_ERROR:
       break;
    case VOL_VERSION_ERROR:

-      Pmsg0(0, "Volume version error.\n");
+      Pmsg0(0, _("Volume version error.\n"));

       break;
    case VOL_LABEL_ERROR:
       break;
    case VOL_LABEL_ERROR:

-      Pmsg0(0, "Bad Volume label type.\n");
+      Pmsg0(0, _("Bad Volume label type.\n"));

       break;
    default:
       break;
    default:

-      Pmsg0(0, "Unknown error.\n");
+      Pmsg0(0, _("Unknown error.\n"));

       break;
    }
 
       break;
    }
 


@@ -419,9 +454,9 @@ static void loadcmd()
 {
 
    if (!load_dev(dev)) {
 {
 
    if (!load_dev(dev)) {

-      Pmsg1(0, "Bad status from load. ERR=%s\n", strerror_dev(dev));
+      Pmsg1(0, _("Bad status from load. ERR=%s\n"), dev->bstrerror());

    } else
    } else

-      Pmsg1(0, "Loaded %s\n", dev->print_name());
+      Pmsg1(0, _("Loaded %s\n"), dev->print_name());

 }
 
 /*
 }
 
 /*


@@ -429,11 +464,11 @@ static void loadcmd()
  */
 static void rewindcmd()
 {
  */
 static void rewindcmd()
 {

-   if (!rewind_dev(dev)) {
-      Pmsg1(0, "Bad status from rewind. ERR=%s\n", strerror_dev(dev));
-      clrerror_dev(dev, -1);
+   if (!dev->rewind(dcr)) {
+      Pmsg1(0, _("Bad status from rewind. ERR=%s\n"), dev->bstrerror());
+      dev->clrerror(-1);

    } else {
    } else {

-      Pmsg1(0, "Rewound %s\n", dev->print_name());
+      Pmsg1(0, _("Rewound %s\n"), dev->print_name());

    }
 }
 
    }
 }
 


@@ -442,7 +477,7 @@ static void rewindcmd()
  */
 static void clearcmd()
 {
  */
 static void clearcmd()
 {

-   clrerror_dev(dev, -1);
+   dev->clrerror(-1);

 }
 
 /*
 }
 
 /*


@@ -450,7 +485,6 @@ static void clearcmd()
  */
 static void weofcmd()
 {
  */
 static void weofcmd()
 {

-   int stat;

    int num = 1;
    if (argc > 1) {
       num = atoi(argk[1]);
    int num = 1;
    if (argc > 1) {
       num = atoi(argk[1]);


@@ -459,11 +493,16 @@ static void weofcmd()
       num = 1;
    }
 
       num = 1;
    }
 

-   if ((stat = weof_dev(dev, num)) < 0) {
-      Pmsg2(0, "Bad status from weof %d. ERR=%s\n", stat, strerror_dev(dev));
+   if (!dev->weof(num)) {
+      Pmsg1(0, _("Bad status from weof. ERR=%s\n"), dev->bstrerror());

       return;
    } else {
       return;
    } else {

-      Pmsg3(0, "Wrote %d EOF%s to %s\n", num, num==1?"":"s", dev->print_name());
+      if (num==1) {
+         Pmsg1(0, _("Wrote 1 EOF to %s\n"), dev->print_name());
+      }
+      else {
+         Pmsg2(0, _("Wrote %d EOFs to %s\n"), num, dev->print_name());
+      }

    }
 }
 
    }
 }
 


@@ -476,8 +515,8 @@ static void weofcmd()
  */
 static void eomcmd()
 {
  */
 static void eomcmd()
 {

-   if (!eod_dev(dev)) {
-      Pmsg1(0, "%s", strerror_dev(dev));
+   if (!dev->eod(dcr)) {
+      Pmsg1(0, "%s", dev->bstrerror());

       return;
    } else {
       Pmsg0(0, _("Moved to end of medium.\n"));
       return;
    } else {
       Pmsg0(0, _("Moved to end of medium.\n"));


@@ -506,8 +545,8 @@ static void bsfcmd()
       num = 1;
    }
 
       num = 1;
    }
 

-   if (!bsf_dev(dev, num)) {
-      Pmsg1(0, _("Bad status from bsf. ERR=%s\n"), strerror_dev(dev));
+   if (!dev->bsf(num)) {
+      Pmsg1(0, _("Bad status from bsf. ERR=%s\n"), dev->bstrerror());

    } else {
       Pmsg2(0, _("Backspaced %d file%s.\n"), num, num==1?"":"s");
    }
    } else {
       Pmsg2(0, _("Backspaced %d file%s.\n"), num, num==1?"":"s");
    }


@@ -525,8 +564,8 @@ static void bsrcmd()
    if (num <= 0) {
       num = 1;
    }
    if (num <= 0) {
       num = 1;
    }

-   if (!bsr_dev(dev, num)) {
-      Pmsg1(0, _("Bad status from bsr. ERR=%s\n"), strerror_dev(dev));
+   if (!dev->bsr(num)) {
+      Pmsg1(0, _("Bad status from bsr. ERR=%s\n"), dev->bstrerror());

    } else {
       Pmsg2(0, _("Backspaced %d record%s.\n"), num, num==1?"":"s");
    }
    } else {
       Pmsg2(0, _("Backspaced %d record%s.\n"), num, num==1?"":"s");
    }


@@ -575,7 +614,7 @@ static void capcmd()
    printf("File=%u block=%u\n", dev->file, dev->block_num);
    printf("Min block=%u Max block=%u\n", dev->min_block_size, dev->max_block_size);
 
    printf("File=%u block=%u\n", dev->file, dev->block_num);
    printf("Min block=%u Max block=%u\n", dev->min_block_size, dev->max_block_size);
 

-   printf("Status:\n");
+   printf(_("Status:\n"));

    statcmd();
 
 }
    statcmd();
 
 }


@@ -590,15 +629,15 @@ static void rectestcmd()
    DEV_RECORD *rec;
    int i, blkno = 0;
 
    DEV_RECORD *rec;
    int i, blkno = 0;
 

-   Pmsg0(0, "Test writting larger and larger records.\n"
+   Pmsg0(0, _("Test writting larger and larger records.\n"

 "This is a torture test for records.\nI am going to write\n"
 "larger and larger records. It will stop when the record size\n"
 "This is a torture test for records.\nI am going to write\n"
 "larger and larger records. It will stop when the record size\n"

-"plus the header exceeds the block size (by default about 64K)\n");
+"plus the header exceeds the block size (by default about 64K)\n"));

 
 
 
 

-   get_cmd("Do you want to continue? (y/n): ");
+   get_cmd(_("Do you want to continue? (y/n): "));

    if (cmd[0] != 'y') {
    if (cmd[0] != 'y') {

-      Pmsg0(000, "Command aborted.\n");
+      Pmsg0(000, _("Command aborted.\n"));

       return;
    }
 
       return;
    }
 


@@ -614,7 +653,7 @@ static void rectestcmd()
       if (write_record_to_block(block, rec)) {
          empty_block(block);
          blkno++;
       if (write_record_to_block(block, rec)) {
          empty_block(block);
          blkno++;

-         Pmsg2(0, "Block %d i=%d\n", blkno, i);
+         Pmsg2(0, _("Block %d i=%d\n"), blkno, i);

       } else {
          break;
       }
       } else {
          break;
       }


@@ -689,34 +728,34 @@ static int re_read_block_test()
       Pmsg1(0, _("Wrote third record of %d bytes.\n"), rec->data_len);
    }
    weofcmd();
       Pmsg1(0, _("Wrote third record of %d bytes.\n"), rec->data_len);
    }
    weofcmd();

-   if (dev_cap(dev, CAP_TWOEOF)) {
+   if (dev->has_cap(CAP_TWOEOF)) {

       weofcmd();
    }
       weofcmd();
    }

-   if (!bsf_dev(dev, 1)) {
-      Pmsg1(0, _("Backspace file failed! ERR=%s\n"), strerror_dev(dev));
+   if (!dev->bsf(1)) {
+      Pmsg1(0, _("Backspace file failed! ERR=%s\n"), dev->bstrerror());

       goto bail_out;
    }
       goto bail_out;
    }

-   if (dev_cap(dev, CAP_TWOEOF)) {
-      if (!bsf_dev(dev, 1)) {
-         Pmsg1(0, _("Backspace file failed! ERR=%s\n"), strerror_dev(dev));
+   if (dev->has_cap(CAP_TWOEOF)) {
+      if (!dev->bsf(1)) {
+         Pmsg1(0, _("Backspace file failed! ERR=%s\n"), dev->bstrerror());

          goto bail_out;
       }
    }
          goto bail_out;
       }
    }

-   Pmsg0(0, "Backspaced over EOF OK.\n");
-   if (!bsr_dev(dev, 1)) {
-      Pmsg1(0, _("Backspace record failed! ERR=%s\n"), strerror_dev(dev));
+   Pmsg0(0, _("Backspaced over EOF OK.\n"));
+   if (!dev->bsr(1)) {
+      Pmsg1(0, _("Backspace record failed! ERR=%s\n"), dev->bstrerror());

       goto bail_out;
    }
       goto bail_out;
    }

-   Pmsg0(0, "Backspace record OK.\n");
+   Pmsg0(0, _("Backspace record OK.\n"));

    if (!read_block_from_dev(dcr, NO_BLOCK_NUMBER_CHECK)) {
       berrno be;
    if (!read_block_from_dev(dcr, NO_BLOCK_NUMBER_CHECK)) {
       berrno be;

-      Pmsg1(0, _("Read block failed! ERR=%s\n"), be.strerror(dev->dev_errno));
+      Pmsg1(0, _("Read block failed! ERR=%s\n"), be.bstrerror(dev->dev_errno));

       goto bail_out;
    }
    memset(rec->data, 0, rec->data_len);
       goto bail_out;
    }
    memset(rec->data, 0, rec->data_len);

-   if (!read_record_from_block(block, rec)) {
+   if (!read_record_from_block(dcr, block, rec)) {

       berrno be;
       berrno be;

-      Pmsg1(0, _("Read block failed! ERR=%s\n"), be.strerror(dev->dev_errno));
+      Pmsg1(0, _("Read block failed! ERR=%s\n"), be.bstrerror(dev->dev_errno));

       goto bail_out;
    }
    for (int i=0; i<len; i++) {
       goto bail_out;
    }
    for (int i=0; i<len; i++) {


@@ -764,8 +803,8 @@ static int write_read_test()
       "This is an *essential* feature ...\n\n"));
    block = dcr->block;
    rec = new_record();
       "This is an *essential* feature ...\n\n"));
    block = dcr->block;
    rec = new_record();

-   if (!rewind_dev(dev)) {
-      Pmsg1(0, "Bad status from rewind. ERR=%s\n", strerror_dev(dev));
+   if (!dev->rewind(dcr)) {
+      Pmsg1(0, _("Bad status from rewind. ERR=%s\n"), dev->bstrerror());

       goto bail_out;
    }
    rec->data = check_pool_memory_size(rec->data, block->buf_len);
       goto bail_out;
    }
    rec->data = check_pool_memory_size(rec->data, block->buf_len);


@@ -803,14 +842,14 @@ static int write_read_test()
    }
    Pmsg1(0, _("Wrote 1000 blocks of %d bytes.\n"), rec->data_len);
    weofcmd();
    }
    Pmsg1(0, _("Wrote 1000 blocks of %d bytes.\n"), rec->data_len);
    weofcmd();

-   if (dev_cap(dev, CAP_TWOEOF)) {
+   if (dev->has_cap(CAP_TWOEOF)) {

       weofcmd();
    }
       weofcmd();
    }

-   if (!rewind_dev(dev)) {
-      Pmsg1(0, "Bad status from rewind. ERR=%s\n", strerror_dev(dev));
+   if (!dev->rewind(dcr)) {
+      Pmsg1(0, _("Bad status from rewind. ERR=%s\n"), dev->bstrerror());

       goto bail_out;
    } else {
       goto bail_out;
    } else {

-      Pmsg0(0, "Rewind OK.\n");
+      Pmsg0(0, _("Rewind OK.\n"));

    }
    for (i=1; i<=2000; i++) {
 read_again:
    }
    for (i=1; i<=2000; i++) {
 read_again:


@@ -822,13 +861,13 @@ read_again:
                goto read_again;
             }
          }
                goto read_again;
             }
          }

-         Pmsg2(0, _("Read block %d failed! ERR=%s\n"), i, be.strerror(dev->dev_errno));
+         Pmsg2(0, _("Read block %d failed! ERR=%s\n"), i, be.bstrerror(dev->dev_errno));

          goto bail_out;
       }
       memset(rec->data, 0, rec->data_len);
          goto bail_out;
       }
       memset(rec->data, 0, rec->data_len);

-      if (!read_record_from_block(block, rec)) {
+      if (!read_record_from_block(dcr, block, rec)) {

          berrno be;
          berrno be;

-         Pmsg2(0, _("Read record failed. Block %d! ERR=%s\n"), i, be.strerror(dev->dev_errno));
+         Pmsg2(0, _("Read record failed. Block %d! ERR=%s\n"), i, be.bstrerror(dev->dev_errno));

          goto bail_out;
       }
       p = (int *)rec->data;
          goto bail_out;
       }
       p = (int *)rec->data;


@@ -876,8 +915,8 @@ static int position_test()
       "This is an *essential* feature ...\n\n"));
    empty_block(block);
    rec = new_record();
       "This is an *essential* feature ...\n\n"));
    empty_block(block);
    rec = new_record();

-   if (!rewind_dev(dev)) {
-      Pmsg1(0, "Bad status from rewind. ERR=%s\n", strerror_dev(dev));
+   if (!dev->rewind(dcr)) {
+      Pmsg1(0, _("Bad status from rewind. ERR=%s\n"), dev->bstrerror());

       goto bail_out;
    }
    rec->data = check_pool_memory_size(rec->data, block->buf_len);
       goto bail_out;
    }
    rec->data = check_pool_memory_size(rec->data, block->buf_len);


@@ -915,14 +954,14 @@ static int position_test()
    }
    Pmsg1(0, _("Wrote 1000 blocks of %d bytes.\n"), rec->data_len);
    weofcmd();
    }
    Pmsg1(0, _("Wrote 1000 blocks of %d bytes.\n"), rec->data_len);
    weofcmd();

-   if (dev_cap(dev, CAP_TWOEOF)) {
+   if (dev->has_cap(CAP_TWOEOF)) {

       weofcmd();
    }
       weofcmd();
    }

-   if (!rewind_dev(dev)) {
-      Pmsg1(0, "Bad status from rewind. ERR=%s\n", strerror_dev(dev));
+   if (!dev->rewind(dcr)) {
+      Pmsg1(0, _("Bad status from rewind. ERR=%s\n"), dev->bstrerror());

       goto bail_out;
    } else {
       goto bail_out;
    } else {

-      Pmsg0(0, "Rewind OK.\n");
+      Pmsg0(0, _("Rewind OK.\n"));

    }
 
    while(ok) {
    }
 
    while(ok) {


@@ -962,9 +1001,9 @@ static int position_test()
          ok = false;
          continue;
       }
          ok = false;
          continue;
       }

-      Pmsg2(-1, "Reposition to file:block %d:%d\n", file, blk);
-      if (!reposition_dev(dev, file, blk)) {
-         Pmsg0(0, "Reposition error.\n");
+      Pmsg2(-1, _("Reposition to file:block %d:%d\n"), file, blk);
+      if (!dev->reposition(dcr, file, blk)) {
+         Pmsg0(0, _("Reposition error.\n"));

          goto bail_out;
       }
 read_again:
          goto bail_out;
       }
 read_again:


@@ -978,7 +1017,7 @@ read_again:
             }
          }
          Pmsg4(0, _("Read block %d failed! file=%d blk=%d. ERR=%s\n\n"),
             }
          }
          Pmsg4(0, _("Read block %d failed! file=%d blk=%d. ERR=%s\n\n"),

-            recno, file, blk, be.strerror(dev->dev_errno));
+            recno, file, blk, be.bstrerror(dev->dev_errno));

          Pmsg0(0, _("This may be because the tape drive block size is not\n"
                     " set to variable blocking as normally used by Bacula.\n"
                     " Please see the Tape Testing chapter in the manual and \n"
          Pmsg0(0, _("This may be because the tape drive block size is not\n"
                     " set to variable blocking as normally used by Bacula.\n"
                     " Please see the Tape Testing chapter in the manual and \n"


@@ -993,9 +1032,9 @@ read_again:
          goto bail_out;
       }
       memset(rec->data, 0, rec->data_len);
          goto bail_out;
       }
       memset(rec->data, 0, rec->data_len);

-      if (!read_record_from_block(block, rec)) {
+      if (!read_record_from_block(dcr, block, rec)) {

          berrno be;
          berrno be;

-         Pmsg1(0, _("Read record failed! ERR=%s\n"), be.strerror(dev->dev_errno));
+         Pmsg1(0, _("Read record failed! ERR=%s\n"), be.bstrerror(dev->dev_errno));

          goto bail_out;
       }
       p = (int *)rec->data;
          goto bail_out;
       }
       p = (int *)rec->data;


@@ -1043,18 +1082,18 @@ static int append_test()
    wrcmd();
    wrcmd();
    weofcmd();     /* end file 2 */
    wrcmd();
    wrcmd();
    weofcmd();     /* end file 2 */

-   if (dev_cap(dev, CAP_TWOEOF)) {
+   if (dev->has_cap(CAP_TWOEOF)) {

       weofcmd();
    }
       weofcmd();
    }

-   force_close_device(dev);              /* release device */
+   dev->close();              /* release device */

    if (!open_the_device()) {
       return -1;
    }
    rewindcmd();
    Pmsg0(0, _("Now moving to end of medium.\n"));
    eodcmd();
    if (!open_the_device()) {
       return -1;
    }
    rewindcmd();
    Pmsg0(0, _("Now moving to end of medium.\n"));
    eodcmd();

-   Pmsg2(-1, _("We should be in file 3. I am at file %d. This is %s\n"),
-      dev->file, dev->file == 3 ? "correct!" : "NOT correct!!!!");
+   Pmsg2(-1, _("We should be in file 3. I am at file %d. %s\n"),
+      dev->file, dev->file == 3 ? _("This is correct!") : _("This is NOT correct!!!!"));

 
    if (dev->file != 3) {
       return -1;
 
    if (dev->file != 3) {
       return -1;


@@ -1063,16 +1102,16 @@ static int append_test()
    Pmsg0(-1, _("\nNow the important part, I am going to attempt to append to the tape.\n\n"));
    wrcmd();
    weofcmd();
    Pmsg0(-1, _("\nNow the important part, I am going to attempt to append to the tape.\n\n"));
    wrcmd();
    weofcmd();

-   if (dev_cap(dev, CAP_TWOEOF)) {
+   if (dev->has_cap(CAP_TWOEOF)) {

       weofcmd();
    }
    rewindcmd();
    Pmsg0(-1, _("Done appending, there should be no I/O errors\n\n"));
       weofcmd();
    }
    rewindcmd();
    Pmsg0(-1, _("Done appending, there should be no I/O errors\n\n"));

-   Pmsg0(-1, "Doing Bacula scan of blocks:\n");
+   Pmsg0(-1, _("Doing Bacula scan of blocks:\n"));

    scan_blocks();
    Pmsg0(-1, _("End scanning the tape.\n"));
    scan_blocks();
    Pmsg0(-1, _("End scanning the tape.\n"));

-   Pmsg2(-1, _("We should be in file 4. I am at file %d. This is %s\n"),
-      dev->file, dev->file == 4 ? "correct!" : "NOT correct!!!!");
+   Pmsg2(-1, _("We should be in file 4. I am at file %d. %s\n"),
+      dev->file, dev->file == 4 ? _("This is correct!") : _("This is NOT correct!!!!"));

 
    if (dev->file != 4) {
       return -2;
 
    if (dev->file != 4) {
       return -2;


@@ -1092,18 +1131,18 @@ static int autochanger_test()
    int sleep_time = 0;
 
    Dmsg1(100, "Max changer wait = %d sec\n", timeout);
    int sleep_time = 0;
 
    Dmsg1(100, "Max changer wait = %d sec\n", timeout);

-   if (!dev_cap(dev, CAP_AUTOCHANGER)) {
+   if (!dev->has_cap(CAP_AUTOCHANGER)) {

       return 1;
    }
    if (!(dcr->device && dcr->device->changer_name && dcr->device->changer_command)) {
       return 1;
    }
    if (!(dcr->device && dcr->device->changer_name && dcr->device->changer_command)) {

-      Pmsg0(-1, "\nAutochanger enabled, but no name or no command device specified.\n");
+      Pmsg0(-1, _("\nAutochanger enabled, but no name or no command device specified.\n"));

       return 1;
    }
 
       return 1;
    }
 

-   Pmsg0(-1, "\nAh, I see you have an autochanger configured.\n"
+   Pmsg0(-1, _("\nAh, I see you have an autochanger configured.\n"

              "To test the autochanger you must have a blank tape\n"
              "To test the autochanger you must have a blank tape\n"

-             " that I can write on in Slot 1.\n");
-   if (!get_cmd("\nDo you wish to continue with the Autochanger test? (y/n): ")) {
+             " that I can write on in Slot 1.\n"));
+   if (!get_cmd(_("\nDo you wish to continue with the Autochanger test? (y/n): "))) {

       return 0;
    }
    if (cmd[0] != 'y' && cmd[0] != 'Y') {
       return 0;
    }
    if (cmd[0] != 'y' && cmd[0] != 'Y') {


@@ -1129,30 +1168,29 @@ try_again:
    } else {
       berrno be;
       Pmsg1(-1, _("3991 Bad autochanger command: %s\n"), changer);
    } else {
       berrno be;
       Pmsg1(-1, _("3991 Bad autochanger command: %s\n"), changer);

-      Pmsg2(-1, _("3991 result=\"%s\": ERR=%s\n"), results, be.strerror(status));
+      Pmsg2(-1, _("3991 result=\"%s\": ERR=%s\n"), results, be.bstrerror(status));

       goto bail_out;
    }
    if (loaded) {
       goto bail_out;
    }
    if (loaded) {

-      Pmsg1(-1, "Slot %d loaded. I am going to unload it.\n", loaded);
+      Pmsg1(-1, _("Slot %d loaded. I am going to unload it.\n"), loaded);

    } else {
    } else {

-      Pmsg0(-1, "Nothing loaded in the drive. OK.\n");
+      Pmsg0(-1, _("Nothing loaded in the drive. OK.\n"));

    }
    Dmsg1(100, "Results from loaded query=%s\n", results);
    if (loaded) {
       dcr->VolCatInfo.Slot = loaded;
    }
    Dmsg1(100, "Results from loaded query=%s\n", results);
    if (loaded) {
       dcr->VolCatInfo.Slot = loaded;

-      offline_or_rewind_dev(dev);

       /* We are going to load a new tape, so close the device */
       /* We are going to load a new tape, so close the device */

-      force_close_device(dev);
+      dev->close();

       Pmsg2(-1, _("3302 Issuing autochanger \"unload %d %d\" command.\n"),
          loaded, dev->drive_index);
       changer = edit_device_codes(dcr, changer, 
                    dcr->device->changer_command, "unload");
       status = run_program(changer, timeout, results);
       Pmsg2(-1, _("3302 Issuing autochanger \"unload %d %d\" command.\n"),
          loaded, dev->drive_index);
       changer = edit_device_codes(dcr, changer, 
                    dcr->device->changer_command, "unload");
       status = run_program(changer, timeout, results);

-      Pmsg2(-1, "unload status=%s %d\n", status==0?"OK":"Bad", status);
+      Pmsg2(-1, _("unload status=%s %d\n"), status==0?_("OK"):_("Bad"), status);

       if (status != 0) {
          berrno be;
          Pmsg1(-1, _("3992 Bad autochanger command: %s\n"), changer);
       if (status != 0) {
          berrno be;
          Pmsg1(-1, _("3992 Bad autochanger command: %s\n"), changer);

-         Pmsg2(-1, _("3992 result=\"%s\": ERR=%s\n"), results, be.strerror(status));
+         Pmsg2(-1, _("3992 result=\"%s\": ERR=%s\n"), results, be.bstrerror(status));

       }
    }
 
       }
    }
 


@@ -1167,7 +1205,7 @@ try_again:
    changer = edit_device_codes(dcr, changer, 
                 dcr->device->changer_command, "load");
    Dmsg1(100, "Changer=%s\n", changer);
    changer = edit_device_codes(dcr, changer, 
                 dcr->device->changer_command, "load");
    Dmsg1(100, "Changer=%s\n", changer);

-   force_close_device(dev);
+   dev->close();

    status = run_program(changer, timeout, results);
    if (status == 0) {
       Pmsg2(-1,  _("3303 Autochanger \"load %d %d\" status is OK.\n"),
    status = run_program(changer, timeout, results);
    if (status == 0) {
       Pmsg2(-1,  _("3303 Autochanger \"load %d %d\" status is OK.\n"),


@@ -1175,7 +1213,7 @@ try_again:
    } else {
       berrno be;
       Pmsg1(-1, _("3993 Bad autochanger command: %s\n"), changer);
    } else {
       berrno be;
       Pmsg1(-1, _("3993 Bad autochanger command: %s\n"), changer);

-      Pmsg2(-1, _("3993 result=\"%s\": ERR=%s\n"), results, be.strerror(status));
+      Pmsg2(-1, _("3993 result=\"%s\": ERR=%s\n"), results, be.bstrerror(status));

       goto bail_out;
    }
 
       goto bail_out;
    }
 


@@ -1187,32 +1225,32 @@ try_again:
     * a failure.
     */
    bmicrosleep(sleep_time, 0);
     * a failure.
     */
    bmicrosleep(sleep_time, 0);

-   if (!rewind_dev(dev) || weof_dev(dev,1) < 0) {
-      Pmsg1(0, "Bad status from rewind. ERR=%s\n", strerror_dev(dev));
-      clrerror_dev(dev, -1);
-      Pmsg0(-1, "\nThe test failed, probably because you need to put\n"
+   if (!dev->rewind(dcr) || !dev->weof(1)) {
+      Pmsg1(0, _("Bad status from rewind. ERR=%s\n"), dev->bstrerror());
+      dev->clrerror(-1);
+      Pmsg0(-1, _("\nThe test failed, probably because you need to put\n"

                 "a longer sleep time in the mtx-script in the load) case.\n"
                 "a longer sleep time in the mtx-script in the load) case.\n"

-                "Adding a 30 second sleep and trying again ...\n");
+                "Adding a 30 second sleep and trying again ...\n"));

       sleep_time += 30;
       goto try_again;
    } else {
       sleep_time += 30;
       goto try_again;
    } else {

-      Pmsg1(0, "Rewound %s\n", dev->print_name());
+      Pmsg1(0, _("Rewound %s\n"), dev->print_name());

    }
 
    }
 

-   if ((status = weof_dev(dev, 1)) < 0) {
-      Pmsg2(0, "Bad status from weof %d. ERR=%s\n", status, strerror_dev(dev));
+   if (!dev->weof(1)) {
+      Pmsg1(0, _("Bad status from weof. ERR=%s\n"), dev->bstrerror());

       goto bail_out;
    } else {
       goto bail_out;
    } else {

-      Pmsg1(0, "Wrote EOF to %s\n", dev->print_name());
+      Pmsg1(0, _("Wrote EOF to %s\n"), dev->print_name());

    }
 
    if (sleep_time) {
    }
 
    if (sleep_time) {

-      Pmsg1(-1, "\nThe test worked this time. Please add:\n\n"
+      Pmsg1(-1, _("\nThe test worked this time. Please add:\n\n"

                 "   sleep %d\n\n"
                 "   sleep %d\n\n"

-                "to your mtx-changer script in the load) case.\n\n",
+                "to your mtx-changer script in the load) case.\n\n"),

                 sleep_time);
    } else {
                 sleep_time);
    } else {

-      Pmsg0(-1, "\nThe test autochanger worked!!\n\n");
+      Pmsg0(-1, _("\nThe test autochanger worked!!\n\n"));

    }
 
    free_pool_memory(changer);
    }
 
    free_pool_memory(changer);


@@ -1223,7 +1261,7 @@ try_again:
 bail_out:
    free_pool_memory(changer);
    free_pool_memory(results);
 bail_out:
    free_pool_memory(changer);
    free_pool_memory(results);

-   Pmsg0(-1, "You must correct this error or the Autochanger will not work.\n");
+   Pmsg0(-1, _("You must correct this error or the Autochanger will not work.\n"));

    return -2;
 }
 
    return -2;
 }
 


@@ -1260,31 +1298,31 @@ static int fsf_test()
    weofcmd();     /* end file 3 */
    wrcmd();
    weofcmd();     /* end file 4 */
    weofcmd();     /* end file 3 */
    wrcmd();
    weofcmd();     /* end file 4 */

-   if (dev_cap(dev, CAP_TWOEOF)) {
+   if (dev->has_cap(CAP_TWOEOF)) {

       weofcmd();
    }
 
 test_again:
    rewindcmd();
    Pmsg0(0, _("Now forward spacing 1 file.\n"));
       weofcmd();
    }
 
 test_again:
    rewindcmd();
    Pmsg0(0, _("Now forward spacing 1 file.\n"));

-   if (!fsf_dev(dev, 1)) {
-      Pmsg1(0, "Bad status from fsr. ERR=%s\n", strerror_dev(dev));
+   if (!dev->fsf(1)) {
+      Pmsg1(0, _("Bad status from fsr. ERR=%s\n"), dev->bstrerror());

       goto bail_out;
    }
       goto bail_out;
    }

-   Pmsg2(-1, _("We should be in file 1. I am at file %d. This is %s\n"),
-      dev->file, dev->file == 1 ? "correct!" : "NOT correct!!!!");
+   Pmsg2(-1, _("We should be in file 1. I am at file %d. %s\n"),
+      dev->file, dev->file == 1 ? _("This is correct!") : _("This is NOT correct!!!!"));

 
    if (dev->file != 1) {
       goto bail_out;
    }
 
    Pmsg0(0, _("Now forward spacing 2 files.\n"));
 
    if (dev->file != 1) {
       goto bail_out;
    }
 
    Pmsg0(0, _("Now forward spacing 2 files.\n"));

-   if (!fsf_dev(dev, 2)) {
-      Pmsg1(0, "Bad status from fsr. ERR=%s\n", strerror_dev(dev));
+   if (!dev->fsf(2)) {
+      Pmsg1(0, _("Bad status from fsr. ERR=%s\n"), dev->bstrerror());

       goto bail_out;
    }
       goto bail_out;
    }

-   Pmsg2(-1, _("We should be in file 3. I am at file %d. This is %s\n"),
-      dev->file, dev->file == 3 ? "correct!" : "NOT correct!!!!");
+   Pmsg2(-1, _("We should be in file 3. I am at file %d. %s\n"),
+      dev->file, dev->file == 3 ? _("This is correct!") : _("This is NOT correct!!!!"));

 
    if (dev->file != 3) {
       goto bail_out;
 
    if (dev->file != 3) {
       goto bail_out;


@@ -1292,29 +1330,29 @@ test_again:
 
    rewindcmd();
    Pmsg0(0, _("Now forward spacing 4 files.\n"));
 
    rewindcmd();
    Pmsg0(0, _("Now forward spacing 4 files.\n"));

-   if (!fsf_dev(dev, 4)) {
-      Pmsg1(0, "Bad status from fsr. ERR=%s\n", strerror_dev(dev));
+   if (!dev->fsf(4)) {
+      Pmsg1(0, _("Bad status from fsr. ERR=%s\n"), dev->bstrerror());

       goto bail_out;
    }
       goto bail_out;
    }

-   Pmsg2(-1, _("We should be in file 4. I am at file %d. This is %s\n"),
-      dev->file, dev->file == 4 ? "correct!" : "NOT correct!!!!");
+   Pmsg2(-1, _("We should be in file 4. I am at file %d. %s\n"),
+      dev->file, dev->file == 4 ? _("This is correct!") : _("This is NOT correct!!!!"));

 
    if (dev->file != 4) {
       goto bail_out;
    }
    if (set_off) {
 
    if (dev->file != 4) {
       goto bail_out;
    }
    if (set_off) {

-      Pmsg0(-1, "The test worked this time. Please add:\n\n"
+      Pmsg0(-1, _("The test worked this time. Please add:\n\n"

                 "   Fast Forward Space File = no\n\n"
                 "   Fast Forward Space File = no\n\n"

-                "to your Device resource for this drive.\n");
+                "to your Device resource for this drive.\n"));

    }
 
    Pmsg0(-1, "\n");
    Pmsg0(0, _("Now forward spacing 1 more file.\n"));
    }
 
    Pmsg0(-1, "\n");
    Pmsg0(0, _("Now forward spacing 1 more file.\n"));

-   if (!fsf_dev(dev, 1)) {
-      Pmsg1(0, "Bad status from fsr. ERR=%s\n", strerror_dev(dev));
+   if (!dev->fsf(1)) {
+      Pmsg1(0, _("Bad status from fsr. ERR=%s\n"), dev->bstrerror());

    }
    }

-   Pmsg2(-1, _("We should be in file 5. I am at file %d. This is %s\n"),
-      dev->file, dev->file == 5 ? "correct!" : "NOT correct!!!!");
+   Pmsg2(-1, _("We should be in file 5. I am at file %d. %s\n"),
+      dev->file, dev->file == 5 ? _("This is correct!") : _("This is NOT correct!!!!"));

    if (dev->file != 5) {
       goto bail_out;
    }
    if (dev->file != 5) {
       goto bail_out;
    }


@@ -1323,17 +1361,17 @@ test_again:
 
 bail_out:
    Pmsg0(-1, _("\nThe forward space file test failed.\n"));
 
 bail_out:
    Pmsg0(-1, _("\nThe forward space file test failed.\n"));

-   if (dev_cap(dev, CAP_FASTFSF)) {
-      Pmsg0(-1, "You have Fast Forward Space File enabled.\n"
-              "I am turning it off then retrying the test.\n");
-      dev->capabilities &= ~CAP_FASTFSF;
+   if (dev->has_cap(CAP_FASTFSF)) {
+      Pmsg0(-1, _("You have Fast Forward Space File enabled.\n"
+              "I am turning it off then retrying the test.\n"));
+      dev->clear_cap(CAP_FASTFSF);

       set_off = true;
       goto test_again;
    }
       set_off = true;
       goto test_again;
    }

-   Pmsg0(-1, "You must correct this error or Bacula will not work.\n"
+   Pmsg0(-1, _("You must correct this error or Bacula will not work.\n"

             "Some systems, e.g. OpenBSD, require you to set\n"
             "   Use MTIOCGET= no\n"
             "Some systems, e.g. OpenBSD, require you to set\n"
             "   Use MTIOCGET= no\n"

-            "in your device resource. Use with caution.\n");
+            "in your device resource. Use with caution.\n"));

    return -2;
 }
 
    return -2;
 }
 


@@ -1361,48 +1399,48 @@ static void testcmd()
       goto all_done;
    }
    if (stat == -1) {                  /* first test failed */
       goto all_done;
    }
    if (stat == -1) {                  /* first test failed */

-      if (dev_cap(dev, CAP_EOM) || dev_cap(dev, CAP_FASTFSF)) {
-         Pmsg0(-1, "\nAppend test failed. Attempting again.\n"
+      if (dev->has_cap(CAP_EOM) || dev->has_cap(CAP_FASTFSF)) {
+         Pmsg0(-1, _("\nAppend test failed. Attempting again.\n"

                    "Setting \"Hardware End of Medium = no\n"
                    "    and \"Fast Forward Space File = no\n"
                    "Setting \"Hardware End of Medium = no\n"
                    "    and \"Fast Forward Space File = no\n"

-                   "and retrying append test.\n\n");
-         dev->capabilities &= ~CAP_EOM; /* turn off eom */
-         dev->capabilities &= ~CAP_FASTFSF; /* turn off fast fsf */
+                   "and retrying append test.\n\n"));
+         dev->clear_cap(CAP_EOM);      /* turn off eom */
+         dev->clear_cap(CAP_FASTFSF);  /* turn off fast fsf */

          stat = append_test();
          if (stat == 1) {
          stat = append_test();
          if (stat == 1) {

-            Pmsg0(-1, "\n\nIt looks like the test worked this time, please add:\n\n"
+            Pmsg0(-1, _("\n\nIt looks like the test worked this time, please add:\n\n"

                      "    Hardware End of Medium = No\n\n"
                      "    Fast Forward Space File = No\n"
                      "    Hardware End of Medium = No\n\n"
                      "    Fast Forward Space File = No\n"

-                     "to your Device resource in the Storage conf file.\n");
+                     "to your Device resource in the Storage conf file.\n"));

             goto all_done;
          }
          if (stat == -1) {
             goto all_done;
          }
          if (stat == -1) {

-            Pmsg0(-1, "\n\nThat appears *NOT* to have corrected the problem.\n");
+            Pmsg0(-1, _("\n\nThat appears *NOT* to have corrected the problem.\n"));

             goto failed;
          }
          /* Wrong count after append */
          if (stat == -2) {
             goto failed;
          }
          /* Wrong count after append */
          if (stat == -2) {

-            Pmsg0(-1, "\n\nIt looks like the append failed. Attempting again.\n"
-                     "Setting \"BSF at EOM = yes\" and retrying append test.\n");
+            Pmsg0(-1, _("\n\nIt looks like the append failed. Attempting again.\n"
+                     "Setting \"BSF at EOM = yes\" and retrying append test.\n"));

             dev->capabilities |= CAP_BSFATEOM; /* backspace on eom */
             stat = append_test();
             if (stat == 1) {
             dev->capabilities |= CAP_BSFATEOM; /* backspace on eom */
             stat = append_test();
             if (stat == 1) {

-               Pmsg0(-1, "\n\nIt looks like the test worked this time, please add:\n\n"
+               Pmsg0(-1, _("\n\nIt looks like the test worked this time, please add:\n\n"

                      "    Hardware End of Medium = No\n"
                      "    Fast Forward Space File = No\n"
                      "    BSF at EOM = yes\n\n"
                      "    Hardware End of Medium = No\n"
                      "    Fast Forward Space File = No\n"
                      "    BSF at EOM = yes\n\n"

-                     "to your Device resource in the Storage conf file.\n");
+                     "to your Device resource in the Storage conf file.\n"));

                goto all_done;
             }
          }
 
       }
 failed:
                goto all_done;
             }
          }
 
       }
 failed:

-      Pmsg0(-1, "\nAppend test failed.\n\n");
-      Pmsg0(-1, "\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"
+      Pmsg0(-1, _("\nAppend test failed.\n\n"
+            "\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"

             "Unable to correct the problem. You MUST fix this\n"
             "Unable to correct the problem. You MUST fix this\n"

-             "problem before Bacula can use your tape drive correctly\n");
-      Pmsg0(-1, "\nPerhaps running Bacula in fixed block mode will work.\n"
+             "problem before Bacula can use your tape drive correctly\n"
+            "\nPerhaps running Bacula in fixed block mode will work.\n"

             "Do so by setting:\n\n"
             "Minimum Block Size = nnn\n"
             "Maximum Block Size = nnn\n\n"
             "Do so by setting:\n\n"
             "Minimum Block Size = nnn\n"
             "Maximum Block Size = nnn\n\n"


@@ -1414,7 +1452,7 @@ failed:
             "\n"
             "Some systems, e.g. OpenBSD, require you to set\n"
             "   Use MTIOCGET= no\n"
             "\n"
             "Some systems, e.g. OpenBSD, require you to set\n"
             "   Use MTIOCGET= no\n"

-            "in your device resource. Use with caution.\n");
+            "in your device resource. Use with caution.\n"));

        return;
    }
 
        return;
    }
 


@@ -1431,12 +1469,11 @@ all_done:
         "1 block of 64448 bytes in file 4\n"
         "End of File mark.\n"
         "Total files=4, blocks=7, bytes = 451,136\n"
         "1 block of 64448 bytes in file 4\n"
         "End of File mark.\n"
         "Total files=4, blocks=7, bytes = 451,136\n"

-        "=== End sample correct output ===\n\n"));
-
-   Pmsg0(-1, _("If the above scan output is not identical to the\n"
-               "sample output, you MUST correct the problem\n"
-               "or Bacula will not be able to write multiple Jobs to \n"
-               "the tape.\n\n"));
+        "=== End sample correct output ===\n\n"
+        "If the above scan output is not identical to the\n"
+        "sample output, you MUST correct the problem\n"
+        "or Bacula will not be able to write multiple Jobs to \n"
+        "the tape.\n\n"));

 
    if (stat == 1) {
       re_read_block_test();
 
    if (stat == 1) {
       re_read_block_test();


@@ -1458,11 +1495,16 @@ static void fsfcmd()
    if (num <= 0) {
       num = 1;
    }
    if (num <= 0) {
       num = 1;
    }

-   if (!fsf_dev(dev, num)) {
-      Pmsg1(0, "Bad status from fsf. ERR=%s\n", strerror_dev(dev));
+   if (!dev->fsf(num)) {
+      Pmsg1(0, _("Bad status from fsf. ERR=%s\n"), dev->bstrerror());

       return;
    }
       return;
    }

-   Pmsg2(0, "Forward spaced %d file%s.\n", num, num==1?"":"s");
+   if (num == 1) {
+      Pmsg0(0, _("Forward spaced 1 file.\n"));
+   }
+   else {
+      Pmsg1(0, _("Forward spaced %d files.\n"), num);
+   }

 }
 
 /* Forward space a record */
 }
 
 /* Forward space a record */


@@ -1476,12 +1518,25 @@ static void fsrcmd()
       num = 1;
    }
    if (!dev->fsr(num)) {
       num = 1;
    }
    if (!dev->fsr(num)) {

-      Pmsg1(0, "Bad status from fsr. ERR=%s\n", strerror_dev(dev));
+      Pmsg1(0, _("Bad status from fsr. ERR=%s\n"), dev->bstrerror());

       return;
    }
       return;
    }

-   Pmsg2(0, "Forward spaced %d record%s.\n", num, num==1?"":"s");
+   if (num == 1) {
+      Pmsg0(0, _("Forward spaced 1 record.\n"));
+   }
+   else {
+      Pmsg1(0, _("Forward spaced %d records.\n"), num);
+   }

 }
 
 }
 

+/*
+ * Read a Bacula block from the tape
+ */
+static void rbcmd()
+{
+   dev->open(dcr, OPEN_READ_ONLY);
+   read_block_from_dev(dcr, NO_BLOCK_NUMBER_CHECK);  
+}

 
 /*
  * Write a Bacula block to the tape
 
 /*
  * Write a Bacula block to the tape


@@ -1492,6 +1547,9 @@ static void wrcmd()
    DEV_RECORD *rec = dcr->rec;
    int i;
 
    DEV_RECORD *rec = dcr->rec;
    int i;
 

+   if (!dev->is_open()) {
+      open_the_device();
+   }

    sm_check(__FILE__, __LINE__, false);
    empty_block(block);
    if (verbose > 1) {
    sm_check(__FILE__, __LINE__, false);
    empty_block(block);
    if (verbose > 1) {


@@ -1529,7 +1587,7 @@ static void rrcmd()
    char *buf;
    int stat, len;
 
    char *buf;
    int stat, len;
 

-   if (!get_cmd("Enter length to read: ")) {
+   if (!get_cmd(_("Enter length to read: "))) {

       return;
    }
    len = atoi(cmd);
       return;
    }
    len = atoi(cmd);


@@ -1538,13 +1596,13 @@ static void rrcmd()
       len = 1024;
    }
    buf = (char *)malloc(len);
       len = 1024;
    }
    buf = (char *)malloc(len);

-   stat = read(dev->fd, buf, len);
+   stat = read(dev->fd(), buf, len);

    if (stat > 0 && stat <= len) {
       errno = 0;
    }
    berrno be;
    Pmsg3(0, _("Read of %d bytes gives stat=%d. ERR=%s\n"),
    if (stat > 0 && stat <= len) {
       errno = 0;
    }
    berrno be;
    Pmsg3(0, _("Read of %d bytes gives stat=%d. ERR=%s\n"),

-      len, stat, be.strerror());
+      len, stat, be.bstrerror());

    free(buf);
 }
 
    free(buf);
 }
 


@@ -1566,38 +1624,47 @@ static void scancmd()
    blocks = block_size = tot_blocks = 0;
    bytes = 0;
    if (dev->state & ST_EOT) {
    blocks = block_size = tot_blocks = 0;
    bytes = 0;
    if (dev->state & ST_EOT) {

-      Pmsg0(0, "End of tape\n");
+      Pmsg0(0, _("End of tape\n"));

       return;
    }
       return;
    }

-   update_pos_dev(dev);
+   dev->update_pos(dcr);

    tot_files = dev->file;
    Pmsg1(0, _("Starting scan at file %u\n"), dev->file);
    for (;;) {
    tot_files = dev->file;
    Pmsg1(0, _("Starting scan at file %u\n"), dev->file);
    for (;;) {

-      if ((stat = read(dev->fd, buf, sizeof(buf))) < 0) {
+      if ((stat = read(dev->fd(), buf, sizeof(buf))) < 0) {

          berrno be;
          berrno be;

-         clrerror_dev(dev, -1);
-         Mmsg2(dev->errmsg, "read error on %s. ERR=%s.\n",
-            dev->dev_name, be.strerror());
-         Pmsg2(0, "Bad status from read %d. ERR=%s\n", stat, strerror_dev(dev));
-         if (blocks > 0)
-            printf("%d block%s of %d bytes in file %d\n",
-                    blocks, blocks>1?"s":"", block_size, dev->file);
+         dev->clrerror(-1);
+         Mmsg2(dev->errmsg, _("read error on %s. ERR=%s.\n"),
+            dev->dev_name, be.bstrerror());
+         Pmsg2(0, _("Bad status from read %d. ERR=%s\n"), stat, dev->bstrerror());
+         if (blocks > 0) {
+            if (blocks==1) {
+               printf(_("1 block of %d bytes in file %d\n"), block_size, dev->file);
+            }
+            else {
+               printf(_("%d blocks of %d bytes in file %d\n"), blocks, block_size, dev->file);
+            }
+         }

          return;
       }
       Dmsg1(200, "read status = %d\n", stat);
 /*    sleep(1); */
       if (stat != block_size) {
          return;
       }
       Dmsg1(200, "read status = %d\n", stat);
 /*    sleep(1); */
       if (stat != block_size) {

-         update_pos_dev(dev);
+         dev->update_pos(dcr);

          if (blocks > 0) {
          if (blocks > 0) {

-            printf("%d block%s of %d bytes in file %d\n",
-                 blocks, blocks>1?"s":"", block_size, dev->file);
+            if (blocks==1) {
+               printf(_("1 block of %d bytes in file %d\n"), block_size, dev->file);
+            }
+            else {
+               printf(_("%d blocks of %d bytes in file %d\n"), blocks, block_size, dev->file);
+            }

             blocks = 0;
          }
          block_size = stat;
       }
       if (stat == 0) {                /* EOF */
             blocks = 0;
          }
          block_size = stat;
       }
       if (stat == 0) {                /* EOF */

-         update_pos_dev(dev);
-         printf("End of File mark.\n");
+         dev->update_pos(dcr);
+         printf(_("End of File mark.\n"));

          /* Two reads of zero means end of tape */
          if (dev->state & ST_EOF)
             dev->state |= ST_EOT;
          /* Two reads of zero means end of tape */
          if (dev->state & ST_EOF)
             dev->state |= ST_EOT;


@@ -1606,7 +1673,7 @@ static void scancmd()
             dev->file++;
          }
          if (dev->state & ST_EOT) {
             dev->file++;
          }
          if (dev->state & ST_EOT) {

-            printf("End of tape\n");
+            printf(_("End of tape\n"));

             break;
          }
       } else {                        /* Got data */
             break;
          }
       } else {                        /* Got data */


@@ -1616,9 +1683,9 @@ static void scancmd()
          bytes += stat;
       }
    }
          bytes += stat;
       }
    }

-   update_pos_dev(dev);
+   dev->update_pos(dcr);

    tot_files = dev->file - tot_files;
    tot_files = dev->file - tot_files;

-   printf("Total files=%d, blocks=%d, bytes = %s\n", tot_files, tot_blocks,
+   printf(_("Total files=%d, blocks=%d, bytes = %s\n"), tot_files, tot_blocks,

       edit_uint64_with_commas(bytes, ec1));
 }
 
       edit_uint64_with_commas(bytes, ec1));
 }
 


@@ -1636,28 +1703,37 @@ static void scan_blocks()
    uint64_t bytes;
    DEV_BLOCK *block = dcr->block;
    char ec1[50];
    uint64_t bytes;
    DEV_BLOCK *block = dcr->block;
    char ec1[50];

+   char buf1[100], buf2[100];

 
    blocks = block_size = tot_blocks = 0;
    bytes = 0;
 
    empty_block(block);
 
    blocks = block_size = tot_blocks = 0;
    bytes = 0;
 
    empty_block(block);

-   update_pos_dev(dev);
+   dev->update_pos(dcr);

    tot_files = dev->file;
    for (;;) {
       if (!read_block_from_device(dcr, NO_BLOCK_NUMBER_CHECK)) {
    tot_files = dev->file;
    for (;;) {
       if (!read_block_from_device(dcr, NO_BLOCK_NUMBER_CHECK)) {

-         Dmsg1(100, "!read_block(): ERR=%s\n", strerror_dev(dev));
+         Dmsg1(100, "!read_block(): ERR=%s\n", dev->bstrerror());

          if (dev->state & ST_EOT) {
             if (blocks > 0) {
          if (dev->state & ST_EOT) {
             if (blocks > 0) {

-               printf("%d block%s of %d bytes in file %d\n",
-                    blocks, blocks>1?"s":"", block_size, dev->file);
+               if (blocks==1) {
+                  printf(_("1 block of %d bytes in file %d\n"), block_size, dev->file);
+               }
+               else {
+                  printf(_("%d blocks of %d bytes in file %d\n"), blocks, block_size, dev->file);
+               }

                blocks = 0;
             }
             goto bail_out;
          }
          if (dev->state & ST_EOF) {
             if (blocks > 0) {
                blocks = 0;
             }
             goto bail_out;
          }
          if (dev->state & ST_EOF) {
             if (blocks > 0) {

-               printf("%d block%s of %d bytes in file %d\n",
-                       blocks, blocks>1?"s":"", block_size, dev->file);
+               if (blocks==1) {
+                  printf(_("1 block of %d bytes in file %d\n"), block_size, dev->file);
+               }
+               else {
+                  printf(_("%d blocks of %d bytes in file %d\n"), blocks, block_size, dev->file);
+               }

                blocks = 0;
             }
             printf(_("End of File mark.\n"));
                blocks = 0;
             }
             printf(_("End of File mark.\n"));


@@ -1665,20 +1741,28 @@ static void scan_blocks()
          }
          if (dev->state & ST_SHORT) {
             if (blocks > 0) {
          }
          if (dev->state & ST_SHORT) {
             if (blocks > 0) {

-               printf("%d block%s of %d bytes in file %d\n",
-                       blocks, blocks>1?"s":"", block_size, dev->file);
+               if (blocks==1) {
+                  printf(_("1 block of %d bytes in file %d\n"), block_size, dev->file);
+               }
+               else {
+                  printf(_("%d blocks of %d bytes in file %d\n"), blocks, block_size, dev->file);
+               }

                blocks = 0;
             }
             printf(_("Short block read.\n"));
             continue;
          }
                blocks = 0;
             }
             printf(_("Short block read.\n"));
             continue;
          }

-         printf(_("Error reading block. ERR=%s\n"), strerror_dev(dev));
+         printf(_("Error reading block. ERR=%s\n"), dev->bstrerror());

          goto bail_out;
       }
       if (block->block_len != block_size) {
          if (blocks > 0) {
          goto bail_out;
       }
       if (block->block_len != block_size) {
          if (blocks > 0) {

-            printf("%d block%s of %d bytes in file %d\n",
-                    blocks, blocks>1?"s":"", block_size, dev->file);
+            if (blocks==1) {
+               printf(_("1 block of %d bytes in file %d\n"), block_size, dev->file);
+            }
+            else {
+               printf(_("%d blocks of %d bytes in file %d\n"), blocks, block_size, dev->file);
+            }

             blocks = 0;
          }
          block_size = block->block_len;
             blocks = 0;
          }
          block_size = block->block_len;


@@ -1691,11 +1775,11 @@ static void scan_blocks()
          block->VolSessionId, block->VolSessionTime);
       if (verbose == 1) {
          DEV_RECORD *rec = new_record();
          block->VolSessionId, block->VolSessionTime);
       if (verbose == 1) {
          DEV_RECORD *rec = new_record();

-         read_record_from_block(block, rec);
-         Pmsg8(-1, "Blk_block: %u dev_blk=%u blen=%u First rec FI=%s SessId=%u SessTim=%u Strm=%s rlen=%d\n",
+         read_record_from_block(dcr, block, rec);
+         Pmsg8(-1, _("Blk_block: %u dev_blk=%u blen=%u First rec FI=%s SessId=%u SessTim=%u Strm=%s rlen=%d\n"),

               block->BlockNumber, dev->block_num, block->block_len,
               block->BlockNumber, dev->block_num, block->block_len,

-              FI_to_ascii(rec->FileIndex), rec->VolSessionId, rec->VolSessionTime,
-              stream_to_ascii(rec->Stream, rec->FileIndex), rec->data_len);
+              FI_to_ascii(buf1, rec->FileIndex), rec->VolSessionId, rec->VolSessionTime,
+              stream_to_ascii(buf2, rec->Stream, rec->FileIndex), rec->data_len);

          rec->remainder = 0;
          free_record(rec);
       } else if (verbose > 1) {
          rec->remainder = 0;
          free_record(rec);
       } else if (verbose > 1) {


@@ -1705,7 +1789,7 @@ static void scan_blocks()
    }
 bail_out:
    tot_files = dev->file - tot_files;
    }
 bail_out:
    tot_files = dev->file - tot_files;

-   printf("Total files=%d, blocks=%d, bytes = %s\n", tot_files, tot_blocks,
+   printf(_("Total files=%d, blocks=%d, bytes = %s\n"), tot_files, tot_blocks,

       edit_uint64_with_commas(bytes, ec1));
 }
 
       edit_uint64_with_commas(bytes, ec1));
 }
 


@@ -1714,7 +1798,7 @@ static void statcmd()
 {
    int debug = debug_level;
    debug_level = 30;
 {
    int debug = debug_level;
    debug_level = 30;

-   Pmsg2(0, "Device status: %u. ERR=%s\n", status_dev(dev), strerror_dev(dev));
+   Pmsg2(0, _("Device status: %u. ERR=%s\n"), status_dev(dev), dev->bstrerror());

 #ifdef xxxx
    dump_volume_label(dev);
 #endif
 #ifdef xxxx
    dump_volume_label(dev);
 #endif


@@ -1731,9 +1815,11 @@ static void fillcmd()
    DEV_RECORD rec;
    DEV_BLOCK  *block = dcr->block;
    char ec1[50];
    DEV_RECORD rec;
    DEV_BLOCK  *block = dcr->block;
    char ec1[50];

+   char buf1[100], buf2[100];

    int fd;
    uint32_t i;
    uint32_t min_block_size;
    int fd;
    uint32_t i;
    uint32_t min_block_size;

+   struct tm tm;

 
    ok = true;
    stop = 0;
 
    ok = true;
    stop = 0;


@@ -1742,7 +1828,7 @@ static void fillcmd()
    last_block_num = 0;
    BlockNumber = 0;
 
    last_block_num = 0;
    BlockNumber = 0;
 

-   Pmsg0(-1, "\n"
+   Pmsg0(-1, _("\n"

 "This command simulates Bacula writing to a tape.\n"
 "It requires either one or two blank tapes, which it\n"
 "will label and write.\n\n"
 "This command simulates Bacula writing to a tape.\n"
 "It requires either one or two blank tapes, which it\n"
 "will label and write.\n\n"


@@ -1757,18 +1843,18 @@ static void fillcmd()
 "fills, it will ask for a second, and after writing a few more \n"
 "blocks, it will stop.  Then it will begin re-reading the\n"
 "two tapes.\n\n"
 "fills, it will ask for a second, and after writing a few more \n"
 "blocks, it will stop.  Then it will begin re-reading the\n"
 "two tapes.\n\n"

-"This may take a long time -- hours! ...\n\n");
+"This may take a long time -- hours! ...\n\n"));

 
 

-   get_cmd("Do you want to run the simplified test (s) with one tape\n"
-           "or the complete multiple tape (m) test: (s/m) ");
+   get_cmd(_("Do you want to run the simplified test (s) with one tape\n"
+           "or the complete multiple tape (m) test: (s/m) "));

    if (cmd[0] == 's') {
    if (cmd[0] == 's') {

-      Pmsg0(-1, "Simple test (single tape) selected.\n");
+      Pmsg0(-1, _("Simple test (single tape) selected.\n"));

       simple = true;
    } else if (cmd[0] == 'm') {
       simple = true;
    } else if (cmd[0] == 'm') {

-      Pmsg0(-1, "Multiple tape test selected.\n");
+      Pmsg0(-1, _("Multiple tape test selected.\n"));

       simple = false;
    } else {
       simple = false;
    } else {

-      Pmsg0(000, "Command aborted.\n");
+      Pmsg0(000, _("Command aborted.\n"));

       return;
    }
 
       return;
    }
 


@@ -1779,14 +1865,7 @@ static void fillcmd()
    min_block_size = dev->min_block_size;
    dev->min_block_size = dev->max_block_size;
    set_volume_name("TestVolume1", 1);
    min_block_size = dev->min_block_size;
    dev->min_block_size = dev->max_block_size;
    set_volume_name("TestVolume1", 1);

-
-   if (!dev->rewind()) {
-      Pmsg0(000, "Rewind failed.\n");
-   }
-   if (!dev->weof()) {
-      Pmsg0(000, "Write EOF failed.\n");
-   }
-   labelcmd();
+   dir_ask_sysop_to_create_appendable_volume(dcr);

    dev->set_append();                 /* force volume to be relabeled */
 
    /*
    dev->set_append();                 /* force volume to be relabeled */
 
    /*


@@ -1808,10 +1887,10 @@ static void fillcmd()
    if (!write_session_label(dcr, SOS_LABEL)) {
       set_jcr_job_status(jcr, JS_ErrorTerminated);
       Jmsg1(jcr, M_FATAL, 0, _("Write session label failed. ERR=%s\n"),
    if (!write_session_label(dcr, SOS_LABEL)) {
       set_jcr_job_status(jcr, JS_ErrorTerminated);
       Jmsg1(jcr, M_FATAL, 0, _("Write session label failed. ERR=%s\n"),

-         strerror_dev(dev));
+         dev->bstrerror());

       ok = false;
    }
       ok = false;
    }

-   Pmsg0(-1, "Wrote Start of Session label.\n");
+   Pmsg0(-1, _("Wrote Start of Session label.\n"));

 
    memset(&rec, 0, sizeof(rec));
    rec.data = get_memory(100000);     /* max record size */
 
    memset(&rec, 0, sizeof(rec));
    rec.data = get_memory(100000);     /* max record size */


@@ -1823,7 +1902,7 @@ static void fillcmd()
     * Put some random data in the record
     */
    fd = open("/dev/urandom", O_RDONLY);
     * Put some random data in the record
     */
    fd = open("/dev/urandom", O_RDONLY);

-   if (fd) {
+   if (fd != -1) {

       read(fd, rec.data, rec.data_len);
       close(fd);
    } else {
       read(fd, rec.data, rec.data_len);
       close(fd);
    } else {


@@ -1839,10 +1918,12 @@ static void fillcmd()
     */
    jcr->dcr->VolFirstIndex = 0;
    time(&jcr->run_time);              /* start counting time for rates */
     */
    jcr->dcr->VolFirstIndex = 0;
    time(&jcr->run_time);              /* start counting time for rates */

+   (void)localtime_r(&jcr->run_time, &tm);
+   strftime(buf1, sizeof(buf1), "%H:%M:%S", &tm);

    if (simple) {
    if (simple) {

-      Pmsg0(-1, "Begin writing Bacula records to tape ...\n");
+      Pmsg1(-1, _("%s Begin writing Bacula records to tape ...\n"), buf1);

    } else {
    } else {

-      Pmsg0(-1, "Begin writing Bacula records to first tape ...\n");
+      Pmsg1(-1, _("%s Begin writing Bacula records to first tape ...\n"), buf1);

    }
    for (file_index = 0; ok && !job_canceled(jcr); ) {
       rec.VolSessionId = jcr->VolSessionId;
    }
    for (file_index = 0; ok && !job_canceled(jcr); ) {
       rec.VolSessionId = jcr->VolSessionId;


@@ -1858,7 +1939,8 @@ static void fillcmd()
       }
 
       Dmsg4(250, "before write_rec FI=%d SessId=%d Strm=%s len=%d\n",
       }
 
       Dmsg4(250, "before write_rec FI=%d SessId=%d Strm=%s len=%d\n",

-         rec.FileIndex, rec.VolSessionId, stream_to_ascii(rec.Stream, rec.FileIndex),
+         rec.FileIndex, rec.VolSessionId, 
+         stream_to_ascii(buf1, rec.Stream, rec.FileIndex),

          rec.data_len);
 
       while (!write_record_to_block(block, &rec)) {
          rec.data_len);
 
       while (!write_record_to_block(block, &rec)) {


@@ -1882,16 +1964,19 @@ static void fillcmd()
                now = 1;          /* prevent divide error */
             }
             kbs = (double)dev->VolCatInfo.VolCatBytes / (1000.0 * (double)now);
                now = 1;          /* prevent divide error */
             }
             kbs = (double)dev->VolCatInfo.VolCatBytes / (1000.0 * (double)now);

-            Pmsg4(-1, "Wrote blk_block=%u, dev_blk_num=%u VolBytes=%s rate=%.1f KB/s\n",
+            Pmsg4(-1, _("Wrote blk_block=%u, dev_blk_num=%u VolBytes=%s rate=%.1f KB/s\n"),

                block->BlockNumber, dev->block_num,
                edit_uint64_with_commas(dev->VolCatInfo.VolCatBytes, ec1), (float)kbs);
          }
                block->BlockNumber, dev->block_num,
                edit_uint64_with_commas(dev->VolCatInfo.VolCatBytes, ec1), (float)kbs);
          }

-         /* Every 15000 blocks (approx 1GB) write an EOF.
+         /* Every 32000 blocks (approx 2GB) write an EOF.

           */
           */

-         if ((block->BlockNumber % 15000) == 0) {
-            Pmsg0(-1, "Flush block, write EOF\n");
+         if ((block->BlockNumber % 32000) == 0) {
+            now = time(NULL);
+            (void)localtime_r(&now, &tm);
+            strftime(buf1, sizeof(buf1), "%H:%M:%S", &tm);
+            Pmsg1(-1, _("%s Flush block, write EOF\n"), buf1);

             flush_block(block, 0);
             flush_block(block, 0);

-            weof_dev(dev, 1);
+            dev->weof(1);

          }
 
          /* Get out after writing 10 blocks to the second tape */
          }
 
          /* Get out after writing 10 blocks to the second tape */


@@ -1905,12 +1990,14 @@ static void fillcmd()
       }
       jcr->JobBytes += rec.data_len;   /* increment bytes this job */
       Dmsg4(190, "write_record FI=%s SessId=%d Strm=%s len=%d\n",
       }
       jcr->JobBytes += rec.data_len;   /* increment bytes this job */
       Dmsg4(190, "write_record FI=%s SessId=%d Strm=%s len=%d\n",

-         FI_to_ascii(rec.FileIndex), rec.VolSessionId,
-         stream_to_ascii(rec.Stream, rec.FileIndex), rec.data_len);
+         FI_to_ascii(buf1, rec.FileIndex), rec.VolSessionId,
+         stream_to_ascii(buf2, rec.Stream, rec.FileIndex), rec.data_len);

 
       /* Get out after writing 10 blocks to the second tape */
       if (BlockNumber > 10 && stop != 0) {      /* get out */
 
       /* Get out after writing 10 blocks to the second tape */
       if (BlockNumber > 10 && stop != 0) {      /* get out */

-         Pmsg0(-1, "Done writing ...\n");
+         char ed1[50];
+         Pmsg1(-1, "Done writing %s records ...\n", 
+             edit_uint64_with_commas(write_count, ed1));

          break;
       }
    }
          break;
       }
    }


@@ -1923,7 +2010,7 @@ static void fillcmd()
          set_jcr_job_status(jcr, JS_ErrorTerminated);
       }
       if (!write_session_label(dcr, EOS_LABEL)) {
          set_jcr_job_status(jcr, JS_ErrorTerminated);
       }
       if (!write_session_label(dcr, EOS_LABEL)) {

-         Pmsg1(000, _("Error writting end session label. ERR=%s\n"), strerror_dev(dev));
+         Pmsg1(000, _("Error writting end session label. ERR=%s\n"), dev->bstrerror());

          ok = false;
       }
       /* Write out final block of this session */
          ok = false;
       }
       /* Write out final block of this session */


@@ -1955,16 +2042,25 @@ static void fillcmd()
       write(fd, last_block2->buf, last_block2->buf_len);
       write(fd, first_block->buf, first_block->buf_len);
       close(fd);
       write(fd, last_block2->buf, last_block2->buf_len);
       write(fd, first_block->buf, first_block->buf_len);
       close(fd);

-      Pmsg2(-1, "Wrote state file last_block_num1=%d last_block_num2=%d\n",
+      Pmsg2(-1, _("Wrote state file last_block_num1=%d last_block_num2=%d\n"),

          last_block_num1, last_block_num2);
    } else {
       berrno be;
       Pmsg2(-1, _("Could not create state file: %s ERR=%s\n"), buf,
          last_block_num1, last_block_num2);
    } else {
       berrno be;
       Pmsg2(-1, _("Could not create state file: %s ERR=%s\n"), buf,

-                 be.strerror());
+                 be.bstrerror());

    }
 
    }
 

-   Pmsg4(-1, _("\n\nDone filling tape%s at %d:%d. Now beginning re-read of %stape ...\n"),
-      simple?"":"s", jcr->dcr->dev->file, jcr->dcr->dev->block_num, simple?"":"first ");
+   now = time(NULL);
+   (void)localtime_r(&now, &tm);
+   strftime(buf1, sizeof(buf1), "%H:%M:%S", &tm);
+   if (simple) {
+      Pmsg3(-1, _("\n\n%s Done filling tape at %d:%d. Now beginning re-read of tape ...\n"),
+         buf1, jcr->dcr->dev->file, jcr->dcr->dev->block_num);
+   }
+   else {
+      Pmsg3(-1, _("\n\n%s Done filling tapes at %d:%d. Now beginning re-read of first tape ...\n"),
+         buf1, jcr->dcr->dev->file, jcr->dcr->dev->block_num);
+   }

 
    jcr->dcr->block = block;
    do_unfill();
 
    jcr->dcr->block = block;
    do_unfill();


@@ -2001,14 +2097,14 @@ static void unfillcmd()
       read(fd, first_block->buf, first_block->buf_len);
       close(fd);
       if (state_level != btape_state_level) {
       read(fd, first_block->buf, first_block->buf_len);
       close(fd);
       if (state_level != btape_state_level) {

-          Pmsg0(-1, "\nThe state file level has changed. You must redo\n"
-                  "the fill command.\n");
+          Pmsg0(-1, _("\nThe state file level has changed. You must redo\n"
+                  "the fill command.\n"));

           return;
        }
    } else {
       berrno be;
           return;
        }
    } else {
       berrno be;

-      Pmsg2(-1, "\nCould not find the state file: %s ERR=%s\n"
-             "You must redo the fill command.\n", buf, be.strerror());
+      Pmsg2(-1, _("\nCould not find the state file: %s ERR=%s\n"
+             "You must redo the fill command.\n"), buf, be.bstrerror());

       return;
    }
    do_unfill();
       return;
    }
    do_unfill();


@@ -2018,15 +2114,15 @@ static void unfillcmd()
 static void do_unfill()
 {
    DEV_BLOCK *block = dcr->block;
 static void do_unfill()
 {
    DEV_BLOCK *block = dcr->block;

-   bool autochanger;
+   int autochanger;

 
    dumped = 0;
    VolBytes = 0;
    LastBlock = 0;
 
    Dmsg0(20, "Enter do_unfill\n");
 
    dumped = 0;
    VolBytes = 0;
    LastBlock = 0;
 
    Dmsg0(20, "Enter do_unfill\n");

-   dev->capabilities |= CAP_ANONVOLS; /* allow reading any volume */
-   dev->capabilities &= ~CAP_LABEL;   /* don't label anything here */
+   dev->set_cap(CAP_ANONVOLS);        /* allow reading any volume */
+   dev->clear_cap(CAP_LABEL);         /* don't label anything here */

 
    end_of_tape = 0;
 
 
    end_of_tape = 0;
 


@@ -2035,56 +2131,67 @@ static void do_unfill()
    file_index = 0;
    if (last_block) {
       free_block(last_block);
    file_index = 0;
    if (last_block) {
       free_block(last_block);

+      last_block = NULL;

    }
    last_block_num = last_block_num1;
    last_file = last_file1;
    last_block = last_block1;
 
    }
    last_block_num = last_block_num1;
    last_file = last_file1;
    last_block = last_block1;
 

+   free_restore_volume_list(jcr);
+   jcr->bsr = NULL;
+   bstrncpy(dcr->VolumeName, "TestVolume1|TestVolume2", sizeof(dcr->VolumeName));
+   create_restore_volume_list(jcr);
+   if (jcr->VolList != NULL) {
+      jcr->VolList->Slot = 1;
+      if (jcr->VolList->next != NULL) {
+         jcr->VolList->next->Slot = 2;
+      }
+   }
+
+   set_volume_name("TestVolume1", 1);
+

    if (!simple) {
       /* Multiple Volume tape */
       /* Close device so user can use autochanger if desired */
    if (!simple) {
       /* Multiple Volume tape */
       /* Close device so user can use autochanger if desired */

-      if (dev_cap(dev, CAP_OFFLINEUNMOUNT)) {
-         offline_dev(dev);
+      if (dev->has_cap(CAP_OFFLINEUNMOUNT)) {
+         dev->offline();

       }
       autochanger = autoload_device(dcr, 1, NULL);
       }
       autochanger = autoload_device(dcr, 1, NULL);

-      if (!autochanger) {
-         force_close_device(dev);
+      if (autochanger != 1) {
+         dev->close();

          get_cmd(_("Mount first tape. Press enter when ready: "));
       }
          get_cmd(_("Mount first tape. Press enter when ready: "));
       }

-      free_restore_volume_list(jcr);
-      jcr->dcr = new_dcr(jcr, dev);
-      set_volume_name("TestVolume1", 1);
-      jcr->bsr = NULL;
-      create_restore_volume_list(jcr);
-      close_device(dev);
-      dev->state &= ~(ST_READ|ST_APPEND);
-      dev->num_writers = 0;
-      if (!acquire_device_for_read(dcr)) {
-         Pmsg1(-1, "%s", dev->errmsg);
-         goto bail_out;
-      }
+   }
+
+   dev->close();
+   dev->num_writers = 0;
+   if (!acquire_device_for_read(dcr)) {
+      Pmsg1(-1, "%s", dev->errmsg);
+      goto bail_out;

    }
    /*
     * We now have the first tape mounted.
     * Note, re-reading last block may have caused us to
     *   loose track of where we are (block number unknown).
     */
    }
    /*
     * We now have the first tape mounted.
     * Note, re-reading last block may have caused us to
     *   loose track of where we are (block number unknown).
     */

-   if (!rewind_dev(dev)) {                /* get to a known place on tape */
+   Pmsg0(-1, _("Rewinding.\n"));
+   if (!dev->rewind(dcr)) {                /* get to a known place on tape */

       goto bail_out;
    }
    /* Read the first 10000 records */
       goto bail_out;
    }
    /* Read the first 10000 records */

-   Pmsg0(-1, _("Reading the first 10000 records.\n"));
+   Pmsg2(-1, _("Reading the first 10000 records from %u:%u.\n"),
+      dev->file, dev->block_num);

    quickie_count = 0;
    read_records(dcr, quickie_cb, my_mount_next_read_volume);
    Pmsg4(-1, _("Reposition from %u:%u to %u:%u\n"), dev->file, dev->block_num,
          last_file, last_block_num);
    quickie_count = 0;
    read_records(dcr, quickie_cb, my_mount_next_read_volume);
    Pmsg4(-1, _("Reposition from %u:%u to %u:%u\n"), dev->file, dev->block_num,
          last_file, last_block_num);

-   if (!reposition_dev(dev, last_file, last_block_num)) {
-      Pmsg1(-1, "Reposition error. ERR=%s\n", strerror_dev(dev));
+   if (!dev->reposition(dcr, last_file, last_block_num)) {
+      Pmsg1(-1, _("Reposition error. ERR=%s\n"), dev->bstrerror());

       goto bail_out;
    }
    Pmsg1(-1, _("Reading block %u.\n"), last_block_num);
    if (!read_block_from_device(dcr, NO_BLOCK_NUMBER_CHECK)) {
       goto bail_out;
    }
    Pmsg1(-1, _("Reading block %u.\n"), last_block_num);
    if (!read_block_from_device(dcr, NO_BLOCK_NUMBER_CHECK)) {

-      Pmsg1(-1, _("Error reading block: ERR=%s\n"), strerror_dev(dev));
+      Pmsg1(-1, _("Error reading block: ERR=%s\n"), dev->bstrerror());

       goto bail_out;
    }
    if (compare_blocks(last_block, block)) {
       goto bail_out;
    }
    if (compare_blocks(last_block, block)) {


@@ -2105,17 +2212,15 @@ static void do_unfill()
 
    /* Multiple Volume tape */
    /* Close device so user can use autochanger if desired */
 
    /* Multiple Volume tape */
    /* Close device so user can use autochanger if desired */

-   if (dev_cap(dev, CAP_OFFLINEUNMOUNT)) {
-      offline_dev(dev);
+   if (dev->has_cap(CAP_OFFLINEUNMOUNT)) {
+      dev->offline();

    }
 
    }
 

-   free_restore_volume_list(jcr);

    set_volume_name("TestVolume2", 2);
    set_volume_name("TestVolume2", 2);

-   jcr->bsr = NULL;
-   create_restore_volume_list(jcr);
+

    autochanger = autoload_device(dcr, 1, NULL);
    autochanger = autoload_device(dcr, 1, NULL);

-   if (!autochanger) {
-      force_close_device(dev);
+   if (autochanger != 1) {
+      dev->close();

       get_cmd(_("Mount second tape. Press enter when ready: "));
    }
 
       get_cmd(_("Mount second tape. Press enter when ready: "));
    }
 


@@ -2129,13 +2234,13 @@ static void do_unfill()
     * on the previous tape.
     */
    Pmsg2(-1, _("Reposition from %u:%u to 0:1\n"), dev->file, dev->block_num);
     * on the previous tape.
     */
    Pmsg2(-1, _("Reposition from %u:%u to 0:1\n"), dev->file, dev->block_num);

-   if (!reposition_dev(dev, 0, 1)) {
-      Pmsg1(-1, "Reposition error. ERR=%s\n", strerror_dev(dev));
+   if (!dev->reposition(dcr, 0, 1)) {
+      Pmsg1(-1, _("Reposition error. ERR=%s\n"), dev->bstrerror());

       goto bail_out;
    }
    Pmsg1(-1, _("Reading block %d.\n"), dev->block_num);
    if (!read_block_from_device(dcr, NO_BLOCK_NUMBER_CHECK)) {
       goto bail_out;
    }
    Pmsg1(-1, _("Reading block %d.\n"), dev->block_num);
    if (!read_block_from_device(dcr, NO_BLOCK_NUMBER_CHECK)) {

-      Pmsg1(-1, _("Error reading block: ERR=%s\n"), strerror_dev(dev));
+      Pmsg1(-1, _("Error reading block: ERR=%s\n"), dev->bstrerror());

       goto bail_out;
    }
    if (compare_blocks(first_block, block)) {
       goto bail_out;
    }
    if (compare_blocks(first_block, block)) {


@@ -2145,13 +2250,13 @@ static void do_unfill()
    /* Now find and compare the last block */
    Pmsg4(-1, _("Reposition from %u:%u to %u:%u\n"), dev->file, dev->block_num,
          last_file, last_block_num);
    /* Now find and compare the last block */
    Pmsg4(-1, _("Reposition from %u:%u to %u:%u\n"), dev->file, dev->block_num,
          last_file, last_block_num);

-   if (!reposition_dev(dev, last_file, last_block_num)) {
-      Pmsg1(-1, "Reposition error. ERR=%s\n", strerror_dev(dev));
+   if (!dev->reposition(dcr, last_file, last_block_num)) {
+      Pmsg1(-1, _("Reposition error. ERR=%s\n"), dev->bstrerror());

       goto bail_out;
    }
    Pmsg1(-1, _("Reading block %d.\n"), dev->block_num);
    if (!read_block_from_device(dcr, NO_BLOCK_NUMBER_CHECK)) {
       goto bail_out;
    }
    Pmsg1(-1, _("Reading block %d.\n"), dev->block_num);
    if (!read_block_from_device(dcr, NO_BLOCK_NUMBER_CHECK)) {

-      Pmsg1(-1, _("Error reading block: ERR=%s\n"), strerror_dev(dev));
+      Pmsg1(-1, _("Error reading block: ERR=%s\n"), dev->bstrerror());

       goto bail_out;
    }
    if (compare_blocks(last_block, block)) {
       goto bail_out;
    }
    if (compare_blocks(last_block, block)) {


@@ -2168,14 +2273,9 @@ bail_out:
 static bool quickie_cb(DCR *dcr, DEV_RECORD *rec)
 {
    DEVICE *dev = dcr->dev;
 static bool quickie_cb(DCR *dcr, DEV_RECORD *rec)
 {
    DEVICE *dev = dcr->dev;

-   if (dev->file != 0) {
-      Pmsg3(-1, "ERROR! device at %d:%d count=%d\n", dev->file, dev->block_num,
-         quickie_count);
-      return false;
-   }

    quickie_count++;
    if (quickie_count == 10000) {
    quickie_count++;
    if (quickie_count == 10000) {

-      Pmsg2(-1, "1000 records read now at %d:%d\n", dev->file, dev->block_num);
+      Pmsg2(-1, _("10000 records read now at %d:%d\n"), dev->file, dev->block_num);

    }
    return quickie_count < 10000;
 }
    }
    return quickie_count < 10000;
 }


@@ -2201,11 +2301,11 @@ static bool compare_blocks(DEV_BLOCK *last_block, DEV_BLOCK *block)
       dump_block(last_block, _("Last block written"));
       Pmsg0(-1, "\n");
       dump_block(block, _("Block read back"));
       dump_block(last_block, _("Last block written"));
       Pmsg0(-1, "\n");
       dump_block(block, _("Block read back"));

-      Pmsg1(-1, "\n\nThe blocks differ at byte %u\n", p - last_block->buf);
-      Pmsg0(-1, "\n\n!!!! The last block written and the block\n"
+      Pmsg1(-1, _("\n\nThe blocks differ at byte %u\n"), p - last_block->buf);
+      Pmsg0(-1, _("\n\n!!!! The last block written and the block\n"

                 "that was read back differ. The test FAILED !!!!\n"
                 "This must be corrected before you use Bacula\n"
                 "that was read back differ. The test FAILED !!!!\n"
                 "This must be corrected before you use Bacula\n"

-                "to write multi-tape Volumes.!!!!\n");
+                "to write multi-tape Volumes.!!!!\n"));

       return false;
    }
    if (verbose) {
       return false;
    }
    if (verbose) {


@@ -2230,7 +2330,7 @@ static int flush_block(DEV_BLOCK *block, int dump)
    DEV_BLOCK *tblock;
    uint32_t this_file, this_block_num;
 
    DEV_BLOCK *tblock;
    uint32_t this_file, this_block_num;
 

-   lock_device(dev);
+   dev->r_dlock();

    if (!this_block) {
       this_block = new_block(dev);
    }
    if (!this_block) {
       this_block = new_block(dev);
    }


@@ -2241,7 +2341,7 @@ static int flush_block(DEV_BLOCK *block, int dump)
    this_file = dev->file;
    this_block_num = dev->block_num;
    if (!write_block_to_dev(dcr)) {
    this_file = dev->file;
    this_block_num = dev->block_num;
    if (!write_block_to_dev(dcr)) {

-      Pmsg3(000, "Last block at: %u:%u this_dev_block_num=%d\n",
+      Pmsg3(000, _("Last block at: %u:%u this_dev_block_num=%d\n"),

                   last_file, last_block_num, this_block_num);
       if (vol_num == 1) {
          /*
                   last_file, last_block_num, this_block_num);
       if (vol_num == 1) {
          /*


@@ -2255,11 +2355,11 @@ static int flush_block(DEV_BLOCK *block, int dump)
          first_block = dup_block(block); /* first block second tape */
       }
       if (verbose) {
          first_block = dup_block(block); /* first block second tape */
       }
       if (verbose) {

-         Pmsg3(000, "Block not written: FileIndex=%u blk_block=%u Size=%u\n",
+         Pmsg3(000, _("Block not written: FileIndex=%u blk_block=%u Size=%u\n"),

             (unsigned)file_index, block->BlockNumber, block->block_len);
             (unsigned)file_index, block->BlockNumber, block->block_len);

-         dump_block(last_block, "Last block written");
+         dump_block(last_block, _("Last block written"));

          Pmsg0(-1, "\n");
          Pmsg0(-1, "\n");

-         dump_block(block, "Block not written");
+         dump_block(block, _("Block not written"));

       }
       if (stop == 0) {
          eot_block = block->BlockNumber;
       }
       if (stop == 0) {
          eot_block = block->BlockNumber;


@@ -2274,7 +2374,7 @@ static int flush_block(DEV_BLOCK *block, int dump)
       }
       kbs = (double)dev->VolCatInfo.VolCatBytes / (1000 * now);
       vol_size = dev->VolCatInfo.VolCatBytes;
       }
       kbs = (double)dev->VolCatInfo.VolCatBytes / (1000 * now);
       vol_size = dev->VolCatInfo.VolCatBytes;

-      Pmsg4(000, "End of tape %d:%d. VolumeCapacity=%s. Write rate = %.1f KB/s\n",
+      Pmsg4(000, _("End of tape %d:%d. VolumeCapacity=%s. Write rate = %.1f KB/s\n"),

          dev->file, dev->block_num,
          edit_uint64_with_commas(dev->VolCatInfo.VolCatBytes, ec1), kbs);
 
          dev->file, dev->block_num,
          edit_uint64_with_commas(dev->VolCatInfo.VolCatBytes, ec1), kbs);
 


@@ -2283,14 +2383,14 @@ static int flush_block(DEV_BLOCK *block, int dump)
       } else {
          /* Full test in progress */
          if (!fixup_device_block_write_error(jcr->dcr)) {
       } else {
          /* Full test in progress */
          if (!fixup_device_block_write_error(jcr->dcr)) {

-            Pmsg1(000, _("Cannot fixup device error. %s\n"), strerror_dev(dev));
+            Pmsg1(000, _("Cannot fixup device error. %s\n"), dev->bstrerror());

             ok = false;
             ok = false;

-            unlock_device(dev);
+            dev->dunlock();

             return 0;
          }
          BlockNumber = 0;             /* start counting for second tape */
       }
             return 0;
          }
          BlockNumber = 0;             /* start counting for second tape */
       }

-      unlock_device(dev);
+      dev->dunlock();

       return 1;                       /* end of tape reached */
    }
 
       return 1;                       /* end of tape reached */
    }
 


@@ -2309,7 +2409,7 @@ static int flush_block(DEV_BLOCK *block, int dump)
    last_file = this_file;
    last_block_num = this_block_num;
 
    last_file = this_file;
    last_block_num = this_block_num;
 

-   unlock_device(dev);
+   dev->dunlock();

    return 1;
 }
 
    return 1;
 }
 


@@ -2324,9 +2424,9 @@ static void qfillcmd()
    DEV_RECORD *rec = dcr->rec;
    int i, count;
 
    DEV_RECORD *rec = dcr->rec;
    int i, count;
 

-   Pmsg0(0, "Test writing blocks of 64512 bytes to tape.\n");
+   Pmsg0(0, _("Test writing blocks of 64512 bytes to tape.\n"));

 
 

-   get_cmd("How many blocks do you want to write? (1000): ");
+   get_cmd(_("How many blocks do you want to write? (1000): "));

 
    count = atoi(cmd);
    if (count <= 0) {
 
    count = atoi(cmd);
    if (count <= 0) {


@@ -2341,7 +2441,7 @@ static void qfillcmd()
    memset(rec->data, i & 0xFF, i);
    rec->data_len = i;
    rewindcmd();
    memset(rec->data, i & 0xFF, i);
    rec->data_len = i;
    rewindcmd();

-   Pmsg1(0, "Begin writing %d Bacula blocks to tape ...\n", count);
+   Pmsg1(0, _("Begin writing %d Bacula blocks to tape ...\n"), count);

    for (i=0; i < count; i++) {
       if (i % 100 == 0) {
          printf("+");
    for (i=0; i < count; i++) {
       if (i % 100 == 0) {
          printf("+");


@@ -2358,7 +2458,7 @@ static void qfillcmd()
    }
    printf("\n");
    weofcmd();
    }
    printf("\n");
    weofcmd();

-   if (dev_cap(dev, CAP_TWOEOF)) {
+   if (dev->has_cap(CAP_TWOEOF)) {

       weofcmd();
    }
    rewindcmd();
       weofcmd();
    }
    rewindcmd();


@@ -2393,10 +2493,14 @@ static void rawfill_cmd()
       }
    }
    p = (uint32_t *)block->buf;
       }
    }
    p = (uint32_t *)block->buf;

-   Pmsg1(0, "Begin writing raw blocks of %u bytes.\n", block->buf_len);
+   Pmsg1(0, _("Begin writing raw blocks of %u bytes.\n"), block->buf_len);

    for ( ;; ) {
       *p = block_num;
    for ( ;; ) {
       *p = block_num;

-      stat = write(dev->fd, block->buf, block->buf_len);
+      if (dev->is_tape()) {
+         stat = tape_write(dev->fd(), block->buf, block->buf_len);
+      } else {
+         stat = write(dev->fd(), block->buf, block->buf_len);
+      }

       if (stat == (int)block->buf_len) {
          if ((block_num++ % 100) == 0) {
             printf("+");
       if (stat == (int)block->buf_len) {
          if ((block_num++ % 100) == 0) {
             printf("+");


@@ -2413,90 +2517,43 @@ static void rawfill_cmd()
    my_errno = errno;
    printf("\n");
    berrno be;
    my_errno = errno;
    printf("\n");
    berrno be;

-   printf("Write failed at block %u. stat=%d ERR=%s\n", block_num, stat,
-      be.strerror(my_errno));
+   printf(_("Write failed at block %u. stat=%d ERR=%s\n"), block_num, stat,
+      be.bstrerror(my_errno));

    weofcmd();
 }
 
 
    weofcmd();
 }
 
 

-/*
- * Fill a tape using Bacula block writes
- */
-static void bfill_cmd()
-{
-   DEV_BLOCK *block = dcr->block;
-   uint32_t block_num = 0;
-   uint32_t *p;
-   int my_errno;
-   int fd;
-   uint32_t i;
-
-   fd = open("/dev/urandom", O_RDONLY);
-   if (fd) {
-      read(fd, block->buf, block->buf_len);
-      close(fd);
-   } else {
-      uint32_t *p = (uint32_t *)block->buf;
-      srandom(time(NULL));
-      for (i=0; i<block->buf_len/sizeof(uint32_t); i++) {
-         p[i] = random();
-      }
-   }
-   p = (uint32_t *)block->buf;
-   Pmsg1(0, "Begin writing Bacula blocks of %u bytes.\n", block->buf_len);
-   for ( ;; ) {
-      *p = block_num;
-      block->binbuf = block->buf_len;
-      block->bufp = block->buf + block->binbuf;
-      if (!write_block_to_dev(dcr)) {
-         break;
-      }
-      if ((block_num++ % 100) == 0) {
-         printf("+");
-         fflush(stdout);
-      }
-      p[0] += p[13];
-      for (i=1; i<(block->buf_len/sizeof(uint32_t)-1); i++) {
-         p[i] += p[i-1];
-      }
-   }
-   my_errno = errno;
-   printf("\n");
-   printf("Write failed at block %u.\n", block_num);
-   weofcmd();
-}
-

 
 struct cmdstruct { const char *key; void (*func)(); const char *help; };
 static struct cmdstruct commands[] = {
 
 struct cmdstruct { const char *key; void (*func)(); const char *help; };
 static struct cmdstruct commands[] = {

- {"autochanger", autochangercmd, "test autochanger"},
- {"bsf",        bsfcmd,       "backspace file"},
- {"bsr",        bsrcmd,       "backspace record"},
- {"bfill",      bfill_cmd,    "fill tape using Bacula writes"},
- {"cap",        capcmd,       "list device capabilities"},
- {"clear",      clearcmd,     "clear tape errors"},
- {"eod",        eodcmd,       "go to end of Bacula data for append"},
- {"eom",        eomcmd,       "go to the physical end of medium"},
- {"fill",       fillcmd,      "fill tape, write onto second volume"},
- {"unfill",     unfillcmd,    "read filled tape"},
- {"fsf",        fsfcmd,       "forward space a file"},
- {"fsr",        fsrcmd,       "forward space a record"},
- {"help",       helpcmd,      "print this command"},
- {"label",      labelcmd,     "write a Bacula label to the tape"},
- {"load",       loadcmd,      "load a tape"},
- {"quit",       quitcmd,      "quit btape"},
- {"rawfill",    rawfill_cmd,  "use write() to fill tape"},
- {"readlabel",  readlabelcmd, "read and print the Bacula tape label"},
- {"rectest",    rectestcmd,   "test record handling functions"},
- {"rewind",     rewindcmd,    "rewind the tape"},
- {"scan",       scancmd,      "read() tape block by block to EOT and report"},
- {"scanblocks", scan_blocks,  "Bacula read block by block to EOT and report"},
- {"status",     statcmd,      "print tape status"},
- {"test",       testcmd,      "General test Bacula tape functions"},
- {"weof",       weofcmd,      "write an EOF on the tape"},
- {"wr",         wrcmd,        "write a single Bacula block"},
- {"rr",         rrcmd,        "read a single record"},
- {"qfill",      qfillcmd,     "quick fill command"},
+ {NT_("autochanger"),autochangercmd, _("test autochanger")},
+ {NT_("bsf"),       bsfcmd,       _("backspace file")},
+ {NT_("bsr"),       bsrcmd,       _("backspace record")},
+ {NT_("cap"),       capcmd,       _("list device capabilities")},
+ {NT_("clear"),     clearcmd,     _("clear tape errors")},
+ {NT_("eod"),       eodcmd,       _("go to end of Bacula data for append")},
+ {NT_("eom"),       eomcmd,       _("go to the physical end of medium")},
+ {NT_("fill"),      fillcmd,      _("fill tape, write onto second volume")},
+ {NT_("unfill"),    unfillcmd,    _("read filled tape")},
+ {NT_("fsf"),       fsfcmd,       _("forward space a file")},
+ {NT_("fsr"),       fsrcmd,       _("forward space a record")},
+ {NT_("help"),      helpcmd,      _("print this command")},
+ {NT_("label"),     labelcmd,     _("write a Bacula label to the tape")},
+ {NT_("load"),      loadcmd,      _("load a tape")},
+ {NT_("quit"),      quitcmd,      _("quit btape")},
+ {NT_("rawfill"),   rawfill_cmd,  _("use write() to fill tape")},
+ {NT_("readlabel"), readlabelcmd, _("read and print the Bacula tape label")},
+ {NT_("rectest"),   rectestcmd,   _("test record handling functions")},
+ {NT_("rewind"),    rewindcmd,    _("rewind the tape")},
+ {NT_("scan"),      scancmd,      _("read() tape block by block to EOT and report")},
+ {NT_("scanblocks"),scan_blocks,  _("Bacula read block by block to EOT and report")},
+ {NT_("status"),    statcmd,      _("print tape status")},
+ {NT_("test"),      testcmd,      _("General test Bacula tape functions")},
+ {NT_("weof"),      weofcmd,      _("write an EOF on the tape")},
+ {NT_("wr"),        wrcmd,        _("write a single Bacula block")},
+ {NT_("rr"),        rrcmd,        _("read a single record")},
+ {NT_("rb"),        rbcmd,        _("read a single Bacula block")},
+ {NT_("qfill"),     qfillcmd,     _("quick fill command")}

              };
 #define comsize (sizeof(commands)/sizeof(struct cmdstruct))
 
              };
 #define comsize (sizeof(commands)/sizeof(struct cmdstruct))
 


@@ -2506,7 +2563,7 @@ do_tape_cmds()
    unsigned int i;
    bool found;
 
    unsigned int i;
    bool found;
 

-   while (get_cmd("*")) {
+   while (!quit && get_cmd("*")) {

       sm_check(__FILE__, __LINE__, false);
       found = false;
       parse_args(cmd, &args, &argc, argk, argv, MAX_CMD_ARGS);
       sm_check(__FILE__, __LINE__, false);
       found = false;
       parse_args(cmd, &args, &argc, argk, argv, MAX_CMD_ARGS);


@@ -2516,10 +2573,9 @@ do_tape_cmds()
             found = true;
             break;
          }
             found = true;
             break;
          }

-      if (!found)
-         Pmsg1(0, _("%s is an illegal command\n"), cmd);
-      if (quit)
-         break;
+      if (!found) {
+         Pmsg1(0, _("\"%s\" is an invalid command\n"), cmd);
+      }

    }
 }
 
    }
 }
 


@@ -2537,8 +2593,8 @@ static void helpcmd()
 static void usage()
 {
    fprintf(stderr, _(
 static void usage()
 {
    fprintf(stderr, _(

-"Copyright (C) 2000-2005 Kern Sibbald.\n"
-"\nVersion: " VERSION " (" BDATE ")\n\n"
+PROG_COPYRIGHT
+"\nVersion: %s (%s)\n\n"

 "Usage: btape <options> <device_name>\n"
 "       -b <file>   specify bootstrap file\n"
 "       -c <file>   set configuration file to file\n"
 "Usage: btape <options> <device_name>\n"
 "       -b <file>   specify bootstrap file\n"
 "       -c <file>   set configuration file to file\n"


@@ -2547,7 +2603,7 @@ static void usage()
 "       -s          turn off signals\n"
 "       -v          be verbose\n"
 "       -?          print this message.\n"
 "       -s          turn off signals\n"
 "       -v          be verbose\n"
 "       -?          print this message.\n"

-"\n"));
+"\n"), 2000, VERSION, BDATE);

 
 }
 
 
 }
 


@@ -2621,26 +2677,22 @@ bool dir_ask_sysop_to_mount_volume(DCR *dcr)
    if (dcr->VolumeName[0] == 0) {
       return dir_ask_sysop_to_create_appendable_volume(dcr);
    }
    if (dcr->VolumeName[0] == 0) {
       return dir_ask_sysop_to_create_appendable_volume(dcr);
    }

-   /* Close device so user can use autochanger if desired */
-   if (dev_cap(dev, CAP_OFFLINEUNMOUNT)) {
-      offline_dev(dev);
-   }
-   force_close_device(dev);

    Pmsg1(-1, "%s", dev->errmsg);           /* print reason */
    if (dcr->VolumeName[0] == 0 || strcmp(dcr->VolumeName, "TestVolume2") == 0) {
    Pmsg1(-1, "%s", dev->errmsg);           /* print reason */
    if (dcr->VolumeName[0] == 0 || strcmp(dcr->VolumeName, "TestVolume2") == 0) {

-      fprintf(stderr, "Mount second Volume on device %s and press return when ready: ",
+      fprintf(stderr, _("Mount second Volume on device %s and press return when ready: "),

          dev->print_name());
    } else {
          dev->print_name());
    } else {

-      fprintf(stderr, "Mount Volume \"%s\" on device %s and press return when ready: ",
+      fprintf(stderr, _("Mount Volume \"%s\" on device %s and press return when ready: "),

          dcr->VolumeName, dev->print_name());
    }
          dcr->VolumeName, dev->print_name());
    }

+   dev->close();

    getchar();
    return true;
 }
 
 bool dir_ask_sysop_to_create_appendable_volume(DCR *dcr)
 {
    getchar();
    return true;
 }
 
 bool dir_ask_sysop_to_create_appendable_volume(DCR *dcr)
 {

-   bool autochanger;
+   int autochanger;

    DEVICE *dev = dcr->dev;
    Dmsg0(20, "Enter dir_ask_sysop_to_create_appendable_volume\n");
    if (stop == 0) {
    DEVICE *dev = dcr->dev;
    Dmsg0(20, "Enter dir_ask_sysop_to_create_appendable_volume\n");
    if (stop == 0) {


@@ -2649,17 +2701,16 @@ bool dir_ask_sysop_to_create_appendable_volume(DCR *dcr)
       set_volume_name("TestVolume2", 2);
    }
    /* Close device so user can use autochanger if desired */
       set_volume_name("TestVolume2", 2);
    }
    /* Close device so user can use autochanger if desired */

-   if (dev_cap(dev, CAP_OFFLINEUNMOUNT)) {
-      offline_dev(dev);
+   if (dev->has_cap(CAP_OFFLINEUNMOUNT)) {
+      dev->offline();

    }
    autochanger = autoload_device(dcr, 1, NULL);
    }
    autochanger = autoload_device(dcr, 1, NULL);

-   if (!autochanger) {
-      force_close_device(dev);
-      fprintf(stderr, "Mount blank Volume on device %s and press return when ready: ",
+   if (autochanger != 1) {
+      fprintf(stderr, _("Mount blank Volume on device %s and press return when ready: "),

          dev->print_name());
          dev->print_name());

+      dev->close();

       getchar();
    }
       getchar();
    }

-   open_device(dcr);

    labelcmd();
    VolumeName = NULL;
    BlockNumber = 0;
    labelcmd();
    VolumeName = NULL;
    BlockNumber = 0;


@@ -2673,7 +2724,8 @@ static bool my_mount_next_read_volume(DCR *dcr)
    DEV_BLOCK *block = dcr->block;
 
    Dmsg0(20, "Enter my_mount_next_read_volume\n");
    DEV_BLOCK *block = dcr->block;
 
    Dmsg0(20, "Enter my_mount_next_read_volume\n");

-   Pmsg1(000, "End of Volume \"%s\"\n", dcr->VolumeName);
+   Pmsg2(000, _("End of Volume \"%s\" %d records.\n"), dcr->VolumeName,
+      quickie_count);

 
    if (LastBlock != block->BlockNumber) {
       VolBytes += block->block_len;
 
    if (LastBlock != block->BlockNumber) {
       VolBytes += block->block_len;


@@ -2685,7 +2737,7 @@ static bool my_mount_next_read_volume(DCR *dcr)
       now = 1;
    }
    kbs = (double)VolBytes / (1000.0 * (double)now);
       now = 1;
    }
    kbs = (double)VolBytes / (1000.0 * (double)now);

-   Pmsg3(-1, "Read block=%u, VolBytes=%s rate=%.1f KB/s\n", block->BlockNumber,
+   Pmsg3(-1, _("Read block=%u, VolBytes=%s rate=%.1f KB/s\n"), block->BlockNumber,

             edit_uint64_with_commas(VolBytes, ec1), (float)kbs);
 
    if (strcmp(dcr->VolumeName, "TestVolume2") == 0) {
             edit_uint64_with_commas(VolBytes, ec1), (float)kbs);
 
    if (strcmp(dcr->VolumeName, "TestVolume2") == 0) {


@@ -2693,14 +2745,11 @@ static bool my_mount_next_read_volume(DCR *dcr)
       return false;
    }
 
       return false;
    }
 

-   free_restore_volume_list(jcr);

    set_volume_name("TestVolume2", 2);
    set_volume_name("TestVolume2", 2);

-   jcr->bsr = NULL;
-   create_restore_volume_list(jcr);
-   close_device(dev);
-   dev->clear_read();
+
+   dev->close();

    if (!acquire_device_for_read(dcr)) {
    if (!acquire_device_for_read(dcr)) {

-      Pmsg2(0, "Cannot open Dev=%s, Vol=%s\n", dev->print_name(), dcr->VolumeName);
+      Pmsg2(0, _("Cannot open Dev=%s, Vol=%s\n"), dev->print_name(), dcr->VolumeName);

       return false;
    }
    return true;                    /* next volume mounted */
       return false;
    }
    return true;                    /* next volume mounted */


@@ -2715,8 +2764,5 @@ static void set_volume_name(const char *VolName, int volnum)
    bstrncpy(dcr->VolCatInfo.VolCatName, VolName, sizeof(dcr->VolCatInfo.VolCatName));
    bstrncpy(dcr->VolumeName, VolName, sizeof(dcr->VolumeName));
    dcr->VolCatInfo.Slot = volnum;
    bstrncpy(dcr->VolCatInfo.VolCatName, VolName, sizeof(dcr->VolCatInfo.VolCatName));
    bstrncpy(dcr->VolumeName, VolName, sizeof(dcr->VolumeName));
    dcr->VolCatInfo.Slot = volnum;

+   dcr->VolCatInfo.InChanger = true;

 }
 }

-
-VOLRES *new_volume(DCR *dcr, const char *VolumeName) { return NULL; }
-bool    free_volume(DEVICE *dev) { return true; }
-void    free_unused_volume(DCR *dcr) { }