X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fbtape.c;h=251f4488879975394ccfa390a84dd634770b7a7e;hb=deec9a70c43f5dc4901aa8efddeda03085c9c5a5;hp=50a8bf52e2bef27a7a509b8e651446bdc08debb6;hpb=8ac13167ad6fe6f4543c7ab61e4aeb878d228564;p=bacula%2Fbacula diff --git a/bacula/src/stored/btape.c b/bacula/src/stored/btape.c index 50a8bf52e2..251f448887 100644 --- a/bacula/src/stored/btape.c +++ b/bacula/src/stored/btape.c @@ -14,28 +14,25 @@ * */ /* - Copyright (C) 2000-2004 Kern Sibbald and John Walker + 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 as - published by the Free Software Foundation; either version 2 of - the License, or (at your option) any later version. + modify it under the terms of the GNU General Public License + version 2 as amended 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 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., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + the file LICENSE for additional details. */ #include "bacula.h" #include "stored.h" +/* Dummy functions */ +int generate_daemon_event(JCR *jcr, const char *event) { return 1; } /* External subroutines */ extern void free_config_resources(); @@ -45,19 +42,22 @@ int quit = 0; char buf[100000]; int bsize = TAPE_BSIZE; char VolName[MAX_NAME_LENGTH]; -bool forge_on = false; +STORES *me = NULL; /* our Global resource */ +bool forge_on = false; /* proceed inspite of I/O errors */ +pthread_mutex_t device_release_mutex = PTHREAD_MUTEX_INITIALIZER; +pthread_cond_t wait_device_release = PTHREAD_COND_INITIALIZER; /* - * If you change the format of the state file, + * If you change the format of the state file, * increment this value - */ + */ static uint32_t btape_state_level = 2; DEVICE *dev = NULL; DCR *dcr; DEVRES *device = NULL; - + /* Forward referenced subroutines */ static void do_tape_cmds(); static void helpcmd(); @@ -86,7 +86,7 @@ static void do_unfill(); /* Static variables */ #define CONFIG_FILE "bacula-sd.conf" -char *configfile; +char *configfile = NULL; #define MAX_CMD_ARGS 30 static POOLMEM *cmd; @@ -123,7 +123,7 @@ static uint32_t last_block_num1 = 0; static uint32_t last_block_num2 = 0; static uint32_t last_block_num = 0; static uint32_t BlockNumber = 0; -static bool simple = true; +static bool simple = true; static const char *VolumeName = NULL; static int vol_num = 0; @@ -138,7 +138,7 @@ int get_cmd(const char *prompt); /********************************************************************* * - * Main Bacula Pool Creation Program + * Main Bacula Pool Creation Program * */ int main(int margc, char *margv[]) @@ -147,24 +147,28 @@ int main(int margc, char *margv[]) uint32_t x32, y32; uint64_t x64, y64; char buf[1000]; + + setlocale(LC_ALL, ""); + bindtextdomain("bacula", LOCALEDIR); + textdomain("bacula"); /* Sanity checks */ - if (TAPE_BSIZE % DEV_BSIZE != 0 || TAPE_BSIZE / DEV_BSIZE == 0) { - Emsg2(M_ABORT, 0, "Tape block size (%d) not multiple of system size (%d)\n", - TAPE_BSIZE, DEV_BSIZE); + 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"), + 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)); + Pmsg1(-1, _("\n\n!!!! Warning large disk addressing disabled. off_t=%d should be 8 or more !!!!!\n\n\n"), + sizeof(off_t)); } x32 = 123456789; bsnprintf(buf, sizeof(buf), "%u", x32); i = bsscanf(buf, "%u", &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; @@ -173,11 +177,11 @@ int main(int margc, char *margv[]) 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); } - 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"); @@ -186,49 +190,49 @@ int main(int margc, char *margv[]) while ((ch = getopt(margc, margv, "b:c:d:psv?")) != -1) { switch (ch) { case 'b': /* bootstrap file */ - bsr = parse_bsr(NULL, optarg); -// dump_bsr(bsr, true); - break; + bsr = parse_bsr(NULL, optarg); +// dump_bsr(bsr, true); + break; case 'c': /* specify config file */ - if (configfile != NULL) { - free(configfile); - } - configfile = bstrdup(optarg); - break; + if (configfile != NULL) { + free(configfile); + } + configfile = bstrdup(optarg); + break; case 'd': /* set debug level */ - debug_level = atoi(optarg); - if (debug_level <= 0) { - debug_level = 1; - } - break; + debug_level = atoi(optarg); + if (debug_level <= 0) { + debug_level = 1; + } + break; case 'p': - forge_on = true; - break; + forge_on = true; + break; case 's': - signals = false; - break; + signals = false; + break; case 'v': - verbose++; - break; + verbose++; + break; case '?': default: - helpcmd(); - exit(0); + helpcmd(); + exit(0); - } + } } margc -= optind; margv += optind; cmd = get_pool_memory(PM_FNAME); args = get_pool_memory(PM_FNAME); - + if (signals) { init_signals(terminate_btape); } @@ -244,11 +248,11 @@ int main(int margc, char *margv[]) /* 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) { - Pmsg0(000, "Improper number of arguments specified.\n"); + Pmsg0(000, _("Improper number of arguments specified.\n")); usage(); exit(1); } @@ -268,7 +272,7 @@ int main(int margc, char *margv[]) Dmsg0(200, "Do tape commands\n"); do_tape_cmds(); - + terminate: terminate_btape(0); return 0; @@ -303,7 +307,7 @@ static void terminate_btape(int stat) } if (debug_level > 10) - print_memory_pool_stats(); + print_memory_pool_stats(); if (this_block) { free_block(this_block); @@ -311,7 +315,8 @@ static void terminate_btape(int stat) stop_watchdog(); term_msg(); - close_memory_pool(); /* free memory in pool */ + close_memory_pool(); /* free memory in pool */ + term_last_jobs_list(); sm_dump(false); exit(stat); @@ -320,20 +325,18 @@ static void terminate_btape(int stat) static bool open_the_device() { DEV_BLOCK *block; - + block = new_block(dev); lock_device(dev); - if (!(dev->state & ST_OPENED)) { - Dmsg1(200, "Opening device %s\n", dcr->VolumeName); - if (open_dev(dev, dcr->VolumeName, OPEN_READ_WRITE) < 0) { - Emsg1(M_FATAL, 0, _("dev open failed: %s\n"), dev->errmsg); - unlock_device(dev); - free_block(block); - return false; - } + 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; } - Pmsg1(000, "open_dev %s OK\n", dev_name(dev)); - dev->state |= ST_APPEND; + Pmsg1(000, _("open device %s: OK\n"), dev->print_name()); + dev->set_append(); /* put volume in append mode */ unlock_device(dev); free_block(block); return true; @@ -346,30 +349,30 @@ void quitcmd() } /* - * Write a label to the tape + * Write a label to the tape */ static void labelcmd() { if (VolumeName) { pm_strcpy(cmd, VolumeName); } else { - if (!get_cmd("Enter Volume Name: ")) { - return; + if (!get_cmd(_("Enter Volume Name: "))) { + return; } } - - if (!(dev->state & ST_OPENED)) { - if (!first_open_device(dev)) { - Pmsg1(0, "Device open failed. ERR=%s\n", strerror_dev(dev)); + + if (!dev->is_open()) { + if (!first_open_device(dcr)) { + Pmsg1(0, _("Device open failed. ERR=%s\n"), strerror_dev(dev)); } } rewind_dev(dev); write_new_volume_label_to_dev(dcr, cmd, "Default"); - Pmsg1(-1, "Wrote Volume label for volume \"%s\".\n", cmd); + Pmsg1(-1, _("Wrote Volume label for volume \"%s\".\n"), cmd); } /* - * Read the tape label + * Read the tape label */ static void readlabelcmd() { @@ -379,33 +382,33 @@ static void readlabelcmd() 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: - Pmsg0(0, "Volume label read correctly.\n"); + Pmsg0(0, _("Volume label read correctly.\n")); 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"), strerror_dev(dev)); break; case VOL_NAME_ERROR: - Pmsg0(0, "Volume name error\n"); + Pmsg0(0, _("Volume name error\n")); break; case VOL_CREATE_ERROR: - Pmsg1(0, "Error creating label. ERR=%s", strerror_dev(dev)); + Pmsg1(0, _("Error creating label. ERR=%s"), strerror_dev(dev)); break; case VOL_VERSION_ERROR: - Pmsg0(0, "Volume version error.\n"); + Pmsg0(0, _("Volume version error.\n")); break; case VOL_LABEL_ERROR: - Pmsg0(0, "Bad Volume label type.\n"); + Pmsg0(0, _("Bad Volume label type.\n")); break; default: - Pmsg0(0, "Unknown error.\n"); + Pmsg0(0, _("Unknown error.\n")); break; } debug_level = 20; - dump_volume_label(dev); + dump_volume_label(dev); debug_level = save_debug_level; } @@ -418,26 +421,26 @@ static void loadcmd() { 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"), strerror_dev(dev)); } else - Pmsg1(0, "Loaded %s\n", dev_name(dev)); + Pmsg1(0, _("Loaded %s\n"), dev->print_name()); } /* - * Rewind the tape. + * Rewind the tape. */ static void rewindcmd() { if (!rewind_dev(dev)) { - Pmsg1(0, "Bad status from rewind. ERR=%s\n", strerror_dev(dev)); + Pmsg1(0, _("Bad status from rewind. ERR=%s\n"), strerror_dev(dev)); clrerror_dev(dev, -1); } else { - Pmsg1(0, "Rewound %s\n", dev_name(dev)); + Pmsg1(0, _("Rewound %s\n"), dev->print_name()); } } /* - * Clear any tape error + * Clear any tape error */ static void clearcmd() { @@ -445,7 +448,7 @@ static void clearcmd() } /* - * Write and end of file on the tape + * Write and end of file on the tape */ static void weofcmd() { @@ -459,15 +462,20 @@ static void weofcmd() } if ((stat = weof_dev(dev, num)) < 0) { - Pmsg2(0, "Bad status from weof %d. ERR=%s\n", stat, strerror_dev(dev)); + Pmsg2(0, _("Bad status from weof %d. ERR=%s\n"), stat, strerror_dev(dev)); return; } else { - Pmsg3(0, "Wrote %d EOF%s to %s\n", num, num==1?"":"s", dev_name(dev)); + 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()); + } } } -/* Go to the end of the medium -- raw command +/* Go to the end of the medium -- raw command * The idea was orginally that the end of the Bacula * medium would be flagged differently. This is not * currently the case. So, this is identical to the @@ -493,7 +501,7 @@ static void eodcmd() } /* - * Backspace file + * Backspace file */ static void bsfcmd() { @@ -513,7 +521,7 @@ static void bsfcmd() } /* - * Backspace record + * Backspace record */ static void bsrcmd() { @@ -532,7 +540,7 @@ static void bsrcmd() } /* - * List device capabilities as defined in the + * List device capabilities as defined in the * stored.conf file. */ static void capcmd() @@ -556,15 +564,15 @@ static void capcmd() printf("\n"); printf(_("Device status:\n")); - printf("%sOPENED ", dev->state & ST_OPENED ? "" : "!"); - printf("%sTAPE ", dev->state & ST_TAPE ? "" : "!"); - printf("%sLABEL ", dev->state & ST_LABEL ? "" : "!"); + printf("%sOPENED ", dev->is_open() ? "" : "!"); + printf("%sTAPE ", dev->is_tape() ? "" : "!"); + printf("%sLABEL ", dev->is_labeled() ? "" : "!"); printf("%sMALLOC ", dev->state & ST_MALLOC ? "" : "!"); - printf("%sAPPEND ", dev->state & ST_APPEND ? "" : "!"); - printf("%sREAD ", dev->state & ST_READ ? "" : "!"); - printf("%sEOT ", dev->state & ST_EOT ? "" : "!"); + printf("%sAPPEND ", dev->can_append() ? "" : "!"); + printf("%sREAD ", dev->can_read() ? "" : "!"); + printf("%sEOT ", dev->at_eot() ? "" : "!"); printf("%sWEOT ", dev->state & ST_WEOT ? "" : "!"); - printf("%sEOF ", dev->state & ST_EOF ? "" : "!"); + printf("%sEOF ", dev->at_eof() ? "" : "!"); printf("%sNEXTVOL ", dev->state & ST_NEXTVOL ? "" : "!"); printf("%sSHORT ", dev->state & ST_SHORT ? "" : "!"); printf("\n"); @@ -574,13 +582,13 @@ 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("Status:\n"); + printf(_("Status:\n")); statcmd(); } /* - * Test writting larger and larger records. + * Test writting larger and larger records. * This is a torture test for records. */ static void rectestcmd() @@ -589,15 +597,15 @@ static void rectestcmd() 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" -"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') { - Pmsg0(000, "Command aborted.\n"); + Pmsg0(000, _("Command aborted.\n")); return; } @@ -611,11 +619,11 @@ static void rectestcmd() rec->data_len = i; sm_check(__FILE__, __LINE__, false); if (write_record_to_block(block, rec)) { - empty_block(block); - blkno++; - Pmsg2(0, "Block %d i=%d\n", blkno, i); + empty_block(block); + blkno++; + Pmsg2(0, _("Block %d i=%d\n"), blkno, i); } else { - break; + break; } sm_check(__FILE__, __LINE__, false); } @@ -645,10 +653,10 @@ static int re_read_block_test() Pmsg0(-1, _("\n=== Write, backup, and re-read test ===\n\n" "I'm going to write three records and an EOF\n" - "then backup over the EOF and re-read the last record.\n" + "then backup over the EOF and re-read the last record.\n" "Bacula does this after writing the last block on the\n" "tape to verify that the block was written correctly.\n\n" - "This is not an *essential* feature ...\n\n")); + "This is not an *essential* feature ...\n\n")); rewindcmd(); empty_block(block); rec = new_record(); @@ -656,33 +664,33 @@ static int re_read_block_test() len = rec->data_len = block->buf_len-100; memset(rec->data, 1, rec->data_len); if (!write_record_to_block(block, rec)) { - Pmsg0(0, _("Error writing record to block.\n")); + Pmsg0(0, _("Error writing record to block.\n")); goto bail_out; } if (!write_block_to_dev(dcr)) { - Pmsg0(0, _("Error writing block to device.\n")); + Pmsg0(0, _("Error writing block to device.\n")); goto bail_out; } else { Pmsg1(0, _("Wrote first record of %d bytes.\n"), rec->data_len); } memset(rec->data, 2, rec->data_len); if (!write_record_to_block(block, rec)) { - Pmsg0(0, _("Error writing record to block.\n")); + Pmsg0(0, _("Error writing record to block.\n")); goto bail_out; } if (!write_block_to_dev(dcr)) { - Pmsg0(0, _("Error writing block to device.\n")); + Pmsg0(0, _("Error writing block to device.\n")); goto bail_out; } else { Pmsg1(0, _("Wrote second record of %d bytes.\n"), rec->data_len); } memset(rec->data, 3, rec->data_len); if (!write_record_to_block(block, rec)) { - Pmsg0(0, _("Error writing record to block.\n")); + Pmsg0(0, _("Error writing record to block.\n")); goto bail_out; } if (!write_block_to_dev(dcr)) { - Pmsg0(0, _("Error writing block to device.\n")); + Pmsg0(0, _("Error writing block to device.\n")); goto bail_out; } else { Pmsg1(0, _("Wrote third record of %d bytes.\n"), rec->data_len); @@ -698,15 +706,15 @@ static int re_read_block_test() if (dev_cap(dev, CAP_TWOEOF)) { if (!bsf_dev(dev, 1)) { Pmsg1(0, _("Backspace file failed! ERR=%s\n"), strerror_dev(dev)); - goto bail_out; + goto bail_out; } } - Pmsg0(0, "Backspaced over EOF OK.\n"); + Pmsg0(0, _("Backspaced over EOF OK.\n")); if (!bsr_dev(dev, 1)) { Pmsg1(0, _("Backspace record failed! ERR=%s\n"), strerror_dev(dev)); 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; Pmsg1(0, _("Read block failed! ERR=%s\n"), be.strerror(dev->dev_errno)); @@ -721,7 +729,7 @@ static int re_read_block_test() for (int i=0; idata[i] != 3) { Pmsg0(0, _("Bad data in record. Test failed!\n")); - goto bail_out; + goto bail_out; } } Pmsg0(0, _("\nBlock re-read correct. Test succeeded!\n")); @@ -738,7 +746,7 @@ bail_out: "if you add:\n\n" "Backward Space Record = No\n\n" "to your Storage daemon's Device resource definition.\n")); - } + } return stat; } @@ -758,13 +766,13 @@ static int write_read_test() Pmsg0(-1, _("\n=== Write, rewind, and re-read test ===\n\n" "I'm going to write 1000 records and an EOF\n" - "then write 1000 records and an EOF, then rewind,\n" + "then write 1000 records and an EOF, then rewind,\n" "and re-read the data to verify that it is correct.\n\n" - "This is an *essential* feature ...\n\n")); + "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)); + Pmsg1(0, _("Bad status from rewind. ERR=%s\n"), strerror_dev(dev)); goto bail_out; } rec->data = check_pool_memory_size(rec->data, block->buf_len); @@ -773,15 +781,15 @@ static int write_read_test() for (i=1; i<=1000; i++) { p = (int *)rec->data; for (j=0; jdata_len); @@ -789,15 +797,15 @@ static int write_read_test() for (i=1001; i<=2000; i++) { p = (int *)rec->data; for (j=0; jdata_len); @@ -806,38 +814,38 @@ static int write_read_test() weofcmd(); } if (!rewind_dev(dev)) { - Pmsg1(0, "Bad status from rewind. ERR=%s\n", strerror_dev(dev)); + Pmsg1(0, _("Bad status from rewind. ERR=%s\n"), strerror_dev(dev)); goto bail_out; } else { - Pmsg0(0, "Rewind OK.\n"); + Pmsg0(0, _("Rewind OK.\n")); } for (i=1; i<=2000; i++) { read_again: if (!read_block_from_dev(dcr, NO_BLOCK_NUMBER_CHECK)) { - berrno be; - if (dev_state(dev, ST_EOF)) { + berrno be; + if (dev_state(dev, ST_EOF)) { Pmsg0(-1, _("Got EOF on tape.\n")); - if (i == 1001) { - goto read_again; - } - } + if (i == 1001) { + goto read_again; + } + } Pmsg2(0, _("Read block %d failed! ERR=%s\n"), i, be.strerror(dev->dev_errno)); - goto bail_out; + goto bail_out; } memset(rec->data, 0, rec->data_len); if (!read_record_from_block(block, rec)) { - berrno be; + berrno be; Pmsg2(0, _("Read record failed. Block %d! ERR=%s\n"), i, be.strerror(dev->dev_errno)); - goto bail_out; + goto bail_out; } p = (int *)rec->data; for (j=0; jdata = check_pool_memory_size(rec->data, block->buf_len); @@ -885,15 +893,15 @@ static int position_test() for (i=1; i<=1000; i++) { p = (int *)rec->data; for (j=0; jdata_len); @@ -901,15 +909,15 @@ static int position_test() for (i=1001; i<=2000; i++) { p = (int *)rec->data; for (j=0; jdata_len); @@ -918,66 +926,66 @@ static int position_test() weofcmd(); } if (!rewind_dev(dev)) { - Pmsg1(0, "Bad status from rewind. ERR=%s\n", strerror_dev(dev)); + Pmsg1(0, _("Bad status from rewind. ERR=%s\n"), strerror_dev(dev)); goto bail_out; } else { - Pmsg0(0, "Rewind OK.\n"); + Pmsg0(0, _("Rewind OK.\n")); } while(ok) { /* Set up next item to read based on where we are */ switch (recno) { case 0: - recno = 5; - file = 0; - blk = 4; - break; + recno = 5; + file = 0; + blk = 4; + break; case 5: - recno = 201; - file = 0; - blk = 200; - break; + recno = 201; + file = 0; + blk = 200; + break; case 201: - recno = 1000; - file = 0; - blk = 999; - break; + recno = 1000; + file = 0; + blk = 999; + break; case 1000: - recno = 1001; - file = 1; - blk = 0; - break; + recno = 1001; + file = 1; + blk = 0; + break; case 1001: - recno = 1601; - file = 1; - blk = 600; - break; + recno = 1601; + file = 1; + blk = 600; + break; case 1601: - recno = 2000; - file = 1; - blk = 999; - break; + recno = 2000; + file = 1; + blk = 999; + break; case 2000: - ok = false; - continue; + ok = false; + continue; } - Pmsg2(-1, "Reposition to file:block %d:%d\n", file, blk); + Pmsg2(-1, _("Reposition to file:block %d:%d\n"), file, blk); if (!reposition_dev(dev, file, blk)) { - Pmsg0(0, "Reposition error.\n"); - goto bail_out; + Pmsg0(0, _("Reposition error.\n")); + goto bail_out; } read_again: if (!read_block_from_dev(dcr, NO_BLOCK_NUMBER_CHECK)) { - berrno be; - if (dev_state(dev, ST_EOF)) { + berrno be; + if (dev_state(dev, ST_EOF)) { Pmsg0(-1, _("Got EOF on tape.\n")); - if (!got_eof) { - got_eof = true; - goto read_again; - } - } - Pmsg4(0, _("Read block %d failed! file=%d blk=%d. ERR=%s\n\n"), - recno, file, blk, be.strerror(dev->dev_errno)); + if (!got_eof) { + got_eof = true; + goto read_again; + } + } + Pmsg4(0, _("Read block %d failed! file=%d blk=%d. ERR=%s\n\n"), + recno, file, blk, be.strerror(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" @@ -989,21 +997,21 @@ read_again: " Fast Forward Space File = no\n" " in your Device resource.\n")); - goto bail_out; + goto bail_out; } memset(rec->data, 0, rec->data_len); if (!read_record_from_block(block, rec)) { - berrno be; + berrno be; Pmsg1(0, _("Read record failed! ERR=%s\n"), be.strerror(dev->dev_errno)); - goto bail_out; + goto bail_out; } p = (int *)rec->data; for (j=0; jfile, 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; } Pmsg0(-1, _("\nNow the important part, I am going to attempt to append to the tape.\n\n")); - wrcmd(); + wrcmd(); weofcmd(); if (dev_cap(dev, CAP_TWOEOF)) { 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")); - 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; @@ -1087,22 +1095,22 @@ static int autochanger_test() { POOLMEM *results, *changer; int slot, status, loaded; - int timeout = jcr->device->max_changer_wait; + int timeout = dcr->device->max_changer_wait; int sleep_time = 0; Dmsg1(100, "Max changer wait = %d sec\n", timeout); if (!dev_cap(dev, CAP_AUTOCHANGER)) { return 1; } - if (!(jcr->device && jcr->device->changer_name && jcr->device->changer_command)) { - Pmsg0(-1, "\nAutochanger enabled, but no name or no command device specified.\n"); + if (!(dcr->device && dcr->device->changer_name && dcr->device->changer_command)) { + Pmsg0(-1, _("\nAutochanger enabled, but no name or no command device specified.\n")); 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" - " 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') { @@ -1119,8 +1127,8 @@ try_again: dcr->VolCatInfo.Slot = slot; /* Find out what is loaded, zero means device is unloaded */ Pmsg0(-1, _("3301 Issuing autochanger \"loaded\" command.\n")); - changer = edit_device_codes(jcr, changer, jcr->device->changer_command, - "loaded"); + changer = edit_device_codes(dcr, changer, + dcr->device->changer_command, "loaded"); status = run_program(changer, timeout, results); Dmsg3(100, "run_prog: %s stat=%d result=\"%s\"\n", changer, status, results); if (status == 0) { @@ -1132,24 +1140,24 @@ try_again: 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 { - 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; offline_or_rewind_dev(dev); /* We are going to load a new tape, so close the device */ - force_close_dev(dev); + force_close_device(dev); Pmsg2(-1, _("3302 Issuing autochanger \"unload %d %d\" command.\n"), - loaded, dev->drive_index); - changer = edit_device_codes(jcr, changer, - jcr->device->changer_command, "unload"); + 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; + berrno be; Pmsg1(-1, _("3992 Bad autochanger command: %s\n"), changer); Pmsg2(-1, _("3992 result=\"%s\": ERR=%s\n"), results, be.strerror(status)); } @@ -1158,18 +1166,19 @@ try_again: /* * Load the Slot 1 */ - + slot = 1; dcr->VolCatInfo.Slot = slot; - Pmsg2(-1, _("3303 Issuing autochanger \"load slot %d %d\" command.\n"), + Pmsg2(-1, _("3303 Issuing autochanger \"load %d %d\" command.\n"), slot, dev->drive_index); - changer = edit_device_codes(jcr, changer, jcr->device->changer_command, "load"); + changer = edit_device_codes(dcr, changer, + dcr->device->changer_command, "load"); Dmsg1(100, "Changer=%s\n", changer); - force_close_dev(dev); + force_close_device(dev); status = run_program(changer, timeout, results); if (status == 0) { - Pmsg2(-1, _("3303 Autochanger \"load slot %d %d\" status is OK.\n"), - slot, dev->drive_index); + Pmsg2(-1, _("3303 Autochanger \"load %d %d\" status is OK.\n"), + slot, dev->drive_index); } else { berrno be; Pmsg1(-1, _("3993 Bad autochanger command: %s\n"), changer); @@ -1180,37 +1189,37 @@ try_again: if (!open_the_device()) { goto bail_out; } - /* + /* * Start with sleep_time 0 then increment by 30 seconds if we get * 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)); + 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" - "a longer sleep time in the mtx-script in the load) case.\n" - "Adding a 30 second sleep and trying again ...\n"); + 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" + "Adding a 30 second sleep and trying again ...\n")); sleep_time += 30; goto try_again; } else { - Pmsg1(0, "Rewound %s\n", dev_name(dev)); + 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)); + Pmsg2(0, _("Bad status from weof %d. ERR=%s\n"), status, strerror_dev(dev)); goto bail_out; } else { - Pmsg1(0, "Wrote EOF to %s\n", dev_name(dev)); + Pmsg1(0, _("Wrote EOF to %s\n"), dev->print_name()); } 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" - "to your mtx-changer script in the load) case.\n\n", - sleep_time); + "to your mtx-changer script in the load) case.\n\n"), + sleep_time); } else { - Pmsg0(-1, "\nThe test autochanger worked!!\n\n"); + Pmsg0(-1, _("\nThe test autochanger worked!!\n\n")); } free_pool_memory(changer); @@ -1221,7 +1230,7 @@ try_again: 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; } @@ -1238,26 +1247,26 @@ static void autochangercmd() static int fsf_test() { bool set_off = false; - + Pmsg0(-1, _("\n\n=== Forward space files test ===\n\n" "This test is essential to Bacula.\n\n" "I'm going to write five files then test forward spacing\n\n")); argc = 1; rewindcmd(); wrcmd(); - weofcmd(); /* end file 0 */ + weofcmd(); /* end file 0 */ wrcmd(); wrcmd(); - weofcmd(); /* end file 1 */ + weofcmd(); /* end file 1 */ wrcmd(); wrcmd(); wrcmd(); - weofcmd(); /* end file 2 */ + weofcmd(); /* end file 2 */ wrcmd(); wrcmd(); - weofcmd(); /* end file 3 */ + weofcmd(); /* end file 3 */ wrcmd(); - weofcmd(); /* end file 4 */ + weofcmd(); /* end file 4 */ if (dev_cap(dev, CAP_TWOEOF)) { weofcmd(); } @@ -1265,24 +1274,24 @@ static int fsf_test() 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"), strerror_dev(dev)); 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 (!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"), strerror_dev(dev)); 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; @@ -1290,29 +1299,29 @@ test_again: 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"), strerror_dev(dev)); 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) { - 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" - "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")); - 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"), strerror_dev(dev)); } - 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; } @@ -1322,16 +1331,16 @@ test_again: 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"); + Pmsg0(-1, _("You have Fast Forward Space File enabled.\n" + "I am turning it off then retrying the test.\n")); dev->capabilities &= ~CAP_FASTFSF; 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" - "in your device resource. Use with caution.\n"); + "in your device resource. Use with caution.\n")); return -2; } @@ -1339,7 +1348,7 @@ bail_out: -/* +/* * This is a general test of Bacula's functions * needed to read and write the tape. */ @@ -1355,52 +1364,52 @@ static void testcmd() } stat = append_test(); - if (stat == 1) { /* OK get out */ + if (stat == 1) { /* OK get out */ goto all_done; } - if (stat == -1) { /* first test failed */ + 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" + Pmsg0(-1, _("\nAppend test failed. Attempting again.\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 */ - stat = append_test(); - if (stat == 1) { - Pmsg0(-1, "\n\nIt looks like the test worked this time, please add:\n\n" + "and retrying append test.\n\n")); + dev->capabilities &= ~CAP_EOM; /* turn off eom */ + dev->capabilities &= ~CAP_FASTFSF; /* turn off fast fsf */ + stat = append_test(); + if (stat == 1) { + 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" - "to your Device resource in the Storage conf file.\n"); - goto all_done; - } - if (stat == -1) { - Pmsg0(-1, "\n\nThat appears *NOT* to have corrected the problem.\n"); - 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"); - 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" + "to your Device resource in the Storage conf file.\n")); + goto all_done; + } + if (stat == -1) { + Pmsg0(-1, _("\n\nThat appears *NOT* to have corrected the problem.\n")); + 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")); + 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" " 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"); - goto all_done; - } - } + "to your Device resource in the Storage conf file.\n")); + 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" - "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" @@ -1412,7 +1421,7 @@ failed: "\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; } @@ -1426,24 +1435,23 @@ all_done: "End of File mark.\n" "3 blocks of 64448 bytes in file 3\n" "End of File mark.\n" - "1 block of 64448 bytes in file 4\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(); } - fsf_test(); /* do fast forward space file test */ + fsf_test(); /* do fast forward space file test */ + + autochanger_test(); /* do autochanger test */ - autochanger_test(); /* do autochanger test */ - } /* Forward space a file */ @@ -1456,11 +1464,16 @@ static void fsfcmd() 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"), strerror_dev(dev)); 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 */ @@ -1473,11 +1486,16 @@ static void fsrcmd() if (num <= 0) { num = 1; } - if (!fsr_dev(dev, num)) { - Pmsg1(0, "Bad status from fsr. ERR=%s\n", strerror_dev(dev)); + if (!dev->fsr(num)) { + Pmsg1(0, _("Bad status from fsr. ERR=%s\n"), strerror_dev(dev)); 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); + } } @@ -1503,11 +1521,11 @@ static void wrcmd() rec->data_len = i; sm_check(__FILE__, __LINE__, false); if (!write_record_to_block(block, rec)) { - Pmsg0(0, _("Error writing record to block.\n")); + Pmsg0(0, _("Error writing record to block.\n")); goto bail_out; } if (!write_block_to_dev(dcr)) { - Pmsg0(0, _("Error writing block to device.\n")); + Pmsg0(0, _("Error writing block to device.\n")); goto bail_out; } else { Pmsg1(0, _("Wrote one record of %d bytes.\n"), i); @@ -1519,7 +1537,7 @@ bail_out: sm_check(__FILE__, __LINE__, false); } -/* +/* * Read a record from the tape */ static void rrcmd() @@ -1527,7 +1545,7 @@ static void rrcmd() char *buf; int stat, len; - if (!get_cmd("Enter length to read: ")) { + if (!get_cmd(_("Enter length to read: "))) { return; } len = atoi(cmd); @@ -1564,59 +1582,68 @@ static void scancmd() blocks = block_size = tot_blocks = 0; bytes = 0; if (dev->state & ST_EOT) { - Pmsg0(0, "End of tape\n"); - return; + Pmsg0(0, _("End of tape\n")); + return; } update_pos_dev(dev); tot_files = dev->file; Pmsg1(0, _("Starting scan at file %u\n"), dev->file); for (;;) { if ((stat = read(dev->fd, buf, sizeof(buf))) < 0) { - 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); - return; + 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) { + 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) { - update_pos_dev(dev); - if (blocks > 0) { - printf("%d block%s of %d bytes in file %d\n", - blocks, blocks>1?"s":"", block_size, dev->file); - blocks = 0; - } - block_size = stat; - } - if (stat == 0) { /* EOF */ - update_pos_dev(dev); - printf("End of File mark.\n"); - /* Two reads of zero means end of tape */ - if (dev->state & ST_EOF) - dev->state |= ST_EOT; - else { - dev->state |= ST_EOF; - dev->file++; - } - if (dev->state & ST_EOT) { - printf("End of tape\n"); - break; - } - } else { /* Got data */ - dev->state &= ~ST_EOF; - blocks++; - tot_blocks++; - bytes += stat; + update_pos_dev(dev); + 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); + } + blocks = 0; + } + block_size = stat; + } + if (stat == 0) { /* EOF */ + update_pos_dev(dev); + printf(_("End of File mark.\n")); + /* Two reads of zero means end of tape */ + if (dev->state & ST_EOF) + dev->state |= ST_EOT; + else { + dev->state |= ST_EOF; + dev->file++; + } + if (dev->state & ST_EOT) { + printf(_("End of tape\n")); + break; + } + } else { /* Got data */ + dev->state &= ~ST_EOF; + blocks++; + tot_blocks++; + bytes += stat; } } update_pos_dev(dev); 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)); } @@ -1634,6 +1661,7 @@ static void scan_blocks() uint64_t bytes; DEV_BLOCK *block = dcr->block; char ec1[50]; + char buf1[100], buf2[100]; blocks = block_size = tot_blocks = 0; bytes = 0; @@ -1644,58 +1672,74 @@ static void scan_blocks() for (;;) { if (!read_block_from_device(dcr, NO_BLOCK_NUMBER_CHECK)) { Dmsg1(100, "!read_block(): ERR=%s\n", strerror_dev(dev)); - 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); - 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); - blocks = 0; - } + if (dev->state & ST_EOT) { + 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); + } + blocks = 0; + } + goto bail_out; + } + if (dev->state & ST_EOF) { + 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); + } + blocks = 0; + } printf(_("End of File mark.\n")); - continue; - } - 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); - blocks = 0; - } + continue; + } + if (dev->state & ST_SHORT) { + 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); + } + blocks = 0; + } printf(_("Short block read.\n")); - continue; - } + continue; + } printf(_("Error reading block. ERR=%s\n"), strerror_dev(dev)); - goto bail_out; + 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); - blocks = 0; - } - block_size = block->block_len; + 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); + } + blocks = 0; + } + block_size = block->block_len; } blocks++; tot_blocks++; bytes += block->block_len; Dmsg6(100, "Blk_blk=%u dev_blk=%u blen=%u bVer=%d SessId=%u SessTim=%u\n", - block->BlockNumber, dev->block_num, block->block_len, block->BlockVer, - block->VolSessionId, block->VolSessionTime); + block->BlockNumber, dev->block_num, block->block_len, block->BlockVer, + 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", - 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); - rec->remainder = 0; - free_record(rec); + 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"), + block->BlockNumber, dev->block_num, block->block_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) { dump_block(block, ""); } @@ -1703,7 +1747,7 @@ static void scan_blocks() } 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)); } @@ -1712,7 +1756,7 @@ static void statcmd() { 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), strerror_dev(dev)); #ifdef xxxx dump_volume_label(dev); #endif @@ -1720,15 +1764,16 @@ static void statcmd() } -/* +/* * First we label the tape, then we fill * it with data get a new tape and write a few blocks. - */ + */ static void fillcmd() { 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; @@ -1740,37 +1785,37 @@ static void fillcmd() last_block_num = 0; BlockNumber = 0; - 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\ -If you have an autochanger configured, it will use\n\ -the tapes that are in slots 1 and 2, otherwise, you will\n\ -be prompted to insert the tapes when necessary.\n\n\ -It will print a status approximately\n\ -every 322 MB, and write an EOF every 3.2 GB. If you have\n\ -selected the simple test option, after writing the first tape\n\ -it will rewind it and re-read the last block written.\n\n\ -If you have selected the multiple tape test, when the first tape\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"); - - get_cmd("Do you want to run the simplified test (s) with one tape\n" - "or the complete multiple tape (m) test: (s/m) "); + 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" +"If you have an autochanger configured, it will use\n" +"the tapes that are in slots 1 and 2, otherwise, you will\n" +"be prompted to insert the tapes when necessary.\n\n" +"It will print a status approximately\n" +"every 322 MB, and write an EOF every 3.2 GB. If you have\n" +"selected the simple test option, after writing the first tape\n" +"it will rewind it and re-read the last block written.\n\n" +"If you have selected the multiple tape test, when the first tape\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")); + + 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') { - Pmsg0(-1, "Simple test (single tape) selected.\n"); + Pmsg0(-1, _("Simple test (single tape) selected.\n")); simple = true; } else if (cmd[0] == 'm') { - Pmsg0(-1, "Multiple tape test selected.\n"); + Pmsg0(-1, _("Multiple tape test selected.\n")); simple = false; } else { - Pmsg0(000, "Command aborted.\n"); + Pmsg0(000, _("Command aborted.\n")); return; } - Dmsg1(20, "Begin append device=%s\n", dev_name(dev)); + Dmsg1(20, "Begin append device=%s\n", dev->print_name()); Dmsg1(20, "MaxVolSize=%s\n", edit_uint64(dev->max_volume_size, ec1)); /* Use fixed block size to simplify read back */ @@ -1778,18 +1823,22 @@ This may take a long time -- hours! ...\n\n"); dev->min_block_size = dev->max_block_size; set_volume_name("TestVolume1", 1); - rewind_dev(dev); - weof_dev(dev, 1); + if (!dev->rewind()) { + Pmsg0(000, _("Rewind failed.\n")); + } + if (!dev->weof()) { + Pmsg0(000, _("Write EOF failed.\n")); + } labelcmd(); - dev->state &= ~ST_APPEND; /* force volume to be relabeled */ + dev->set_append(); /* force volume to be relabeled */ - /* + /* * Acquire output device for writing. Note, after acquiring a - * device, we MUST release it, which is done at the end of this - * subroutine. + * device, we MUST release it, which is done at the end of this + * subroutine. */ Dmsg0(100, "just before acquire_device\n"); - if (!acquire_device_for_append(jcr)) { + if (!acquire_device_for_append(dcr)) { set_jcr_job_status(jcr, JS_ErrorTerminated); return; } @@ -1802,10 +1851,10 @@ This may take a long time -- hours! ...\n\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)); + strerror_dev(dev)); 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 */ @@ -1813,7 +1862,7 @@ This may take a long time -- hours! ...\n\n"); #define REC_SIZE 32768 rec.data_len = REC_SIZE; - /* + /* * Put some random data in the record */ fd = open("/dev/urandom", O_RDONLY); @@ -1824,19 +1873,19 @@ This may take a long time -- hours! ...\n\n"); uint32_t *p = (uint32_t *)rec.data; srandom(time(NULL)); for (i=0; idcr->VolFirstIndex = 0; - time(&jcr->run_time); /* start counting time for rates */ + time(&jcr->run_time); /* start counting time for rates */ if (simple) { - Pmsg0(-1, "Begin writing Bacula records to tape ...\n"); + Pmsg0(-1, _("Begin writing Bacula records to tape ...\n")); } else { - Pmsg0(-1, "Begin writing Bacula records to first tape ...\n"); + Pmsg0(-1, _("Begin writing Bacula records to first tape ...\n")); } for (file_index = 0; ok && !job_canceled(jcr); ) { rec.VolSessionId = jcr->VolSessionId; @@ -1848,82 +1897,83 @@ This may take a long time -- hours! ...\n\n"); uint32_t *lp = (uint32_t *)rec.data; lp[0] += lp[13]; for (i=1; i < (rec.data_len-sizeof(uint32_t))/sizeof(uint32_t)-1; i++) { - lp[i] += lp[i-1]; + lp[i] += lp[i-1]; } 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.data_len); - + rec.FileIndex, rec.VolSessionId, + stream_to_ascii(buf1, rec.Stream, rec.FileIndex), + rec.data_len); + while (!write_record_to_block(block, &rec)) { - /* - * When we get here we have just filled a block - */ + /* + * When we get here we have just filled a block + */ Dmsg2(150, "!write_record_to_block data_len=%d rem=%d\n", rec.data_len, - rec.remainder); - - /* Write block to tape */ - if (!flush_block(block, 1)) { - break; - } - - /* Every 5000 blocks (approx 322MB) report where we are. - */ - if ((block->BlockNumber % 5000) == 0) { - now = time(NULL); - now -= jcr->run_time; - if (now <= 0) { - 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", - block->BlockNumber, dev->block_num, - edit_uint64_with_commas(dev->VolCatInfo.VolCatBytes, ec1), (float)kbs); - } - /* Every 15000 blocks (approx 1GB) write an EOF. - */ - if ((block->BlockNumber % 15000) == 0) { - Pmsg0(-1, "Flush block, write EOF\n"); - flush_block(block, 0); - weof_dev(dev, 1); - } - - /* Get out after writing 10 blocks to the second tape */ - if (++BlockNumber > 10 && stop != 0) { /* get out */ - break; - } + rec.remainder); + + /* Write block to tape */ + if (!flush_block(block, 1)) { + break; + } + + /* Every 5000 blocks (approx 322MB) report where we are. + */ + if ((block->BlockNumber % 5000) == 0) { + now = time(NULL); + now -= jcr->run_time; + if (now <= 0) { + 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"), + block->BlockNumber, dev->block_num, + edit_uint64_with_commas(dev->VolCatInfo.VolCatBytes, ec1), (float)kbs); + } + /* Every 15000 blocks (approx 1GB) write an EOF. + */ + if ((block->BlockNumber % 15000) == 0) { + Pmsg0(-1, _("Flush block, write EOF\n")); + flush_block(block, 0); + weof_dev(dev, 1); + } + + /* Get out after writing 10 blocks to the second tape */ + if (++BlockNumber > 10 && stop != 0) { /* get out */ + break; + } } if (!ok) { Pmsg0(000, _("Not OK\n")); - break; + break; } 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 */ + if (BlockNumber > 10 && stop != 0) { /* get out */ Pmsg0(-1, "Done writing ...\n"); - break; + break; } } if (vol_num > 1) { Dmsg0(100, "Write_end_session_label()\n"); /* Create Job status for end of session label */ if (!job_canceled(jcr) && ok) { - set_jcr_job_status(jcr, JS_Terminated); + set_jcr_job_status(jcr, JS_Terminated); } else if (!ok) { - set_jcr_job_status(jcr, JS_ErrorTerminated); + 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)); - ok = false; + ok = false; } /* Write out final block of this session */ if (!write_block_to_device(dcr)) { Pmsg0(-1, _("Set ok=false after write_block_to_device.\n")); - ok = false; + ok = false; } Pmsg0(-1, _("Wrote End of Session label.\n")); @@ -1931,7 +1981,7 @@ This may take a long time -- hours! ...\n\n"); last_block_num2 = last_block_num; last_file2 = last_file; if (last_block2) { - free_block(last_block2); + free_block(last_block2); } last_block2 = dup_block(last_block); } @@ -1949,24 +1999,24 @@ This may take a long time -- hours! ...\n\n"); 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", - last_block_num1, last_block_num2); + 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, - be.strerror()); + be.strerror()); } - 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 "); + if (simple) { + Pmsg2(-1, _("\n\nDone filling tape at %d:%d. Now beginning re-read of tape ...\n"), + jcr->dcr->dev->file, jcr->dcr->dev->block_num); + } + else { + Pmsg2(-1, _("\n\nDone filling tapes at %d:%d. Now beginning re-read of first tape ...\n"), + jcr->dcr->dev->file, jcr->dcr->dev->block_num); + } jcr->dcr->block = block; - /* Release the device if multiple tapes being used */ -// if (!simple && !release_device(jcr)) { -// Pmsg0(-1, _("Error in release_device\n")); -// ok = false; -// } - do_unfill(); dev->min_block_size = min_block_size; @@ -1989,7 +2039,7 @@ static void unfillcmd() sprintf(buf, "%s/btape.state", working_directory); fd = open(buf, O_RDONLY); if (fd >= 0) { - uint32_t state_level; + uint32_t state_level; read(fd, &state_level, sizeof(btape_state_level)); read(fd, &simple, sizeof(simple)); read(fd, &last_block_num1, sizeof(last_block_num1)); @@ -2001,14 +2051,14 @@ static void unfillcmd() 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"); - return; + Pmsg0(-1, _("\nThe state file level has changed. You must redo\n" + "the fill command.\n")); + 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.strerror()); return; } do_unfill(); @@ -2030,7 +2080,7 @@ static void do_unfill() end_of_tape = 0; - time(&jcr->run_time); /* start counting time for rates */ + time(&jcr->run_time); /* start counting time for rates */ stop = 0; file_index = 0; if (last_block) { @@ -2044,42 +2094,42 @@ static void do_unfill() /* Multiple Volume tape */ /* Close device so user can use autochanger if desired */ if (dev_cap(dev, CAP_OFFLINEUNMOUNT)) { - offline_dev(dev); + offline_dev(dev); } autochanger = autoload_device(dcr, 1, NULL); if (!autochanger) { - force_close_dev(dev); - get_cmd(_("Mount first tape. Press enter when ready: ")); + force_close_device(dev); + get_cmd(_("Mount first tape. Press enter when ready: ")); } - free_vol_list(jcr); + free_restore_volume_list(jcr); jcr->dcr = new_dcr(jcr, dev); set_volume_name("TestVolume1", 1); jcr->bsr = NULL; - create_vol_list(jcr); - close_dev(dev); + create_restore_volume_list(jcr); + close_device(dev); dev->state &= ~(ST_READ|ST_APPEND); dev->num_writers = 0; - if (!acquire_device_for_read(jcr)) { + if (!acquire_device_for_read(dcr)) { Pmsg1(-1, "%s", dev->errmsg); - goto bail_out; + 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). + * 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 */ + if (!rewind_dev(dev)) { /* get to a known place on tape */ goto bail_out; } - /* Read the first 1000 records */ - Pmsg0(-1, _("Reading the first 1000 records.\n")); + /* Read the first 10000 records */ + Pmsg0(-1, _("Reading the first 10000 records.\n")); 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); + last_file, last_block_num); if (!reposition_dev(dev, last_file, last_block_num)) { - Pmsg1(-1, "Reposition error. ERR=%s\n", strerror_dev(dev)); + Pmsg1(-1, _("Reposition error. ERR=%s\n"), strerror_dev(dev)); goto bail_out; } Pmsg1(-1, _("Reading block %u.\n"), last_block_num); @@ -2109,18 +2159,18 @@ static void do_unfill() offline_dev(dev); } - free_vol_list(jcr); + free_restore_volume_list(jcr); set_volume_name("TestVolume2", 2); jcr->bsr = NULL; - create_vol_list(jcr); + create_restore_volume_list(jcr); autochanger = autoload_device(dcr, 1, NULL); if (!autochanger) { - force_close_dev(dev); - get_cmd(_("Mount second tape. Press enter when ready: ")); + force_close_device(dev); + get_cmd(_("Mount second tape. Press enter when ready: ")); } - dev->state &= ~ST_READ; - if (!acquire_device_for_read(jcr)) { + dev->clear_read(); + if (!acquire_device_for_read(dcr)) { Pmsg1(-1, "%s", dev->errmsg); goto bail_out; } @@ -2130,7 +2180,7 @@ static void do_unfill() */ 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)); + Pmsg1(-1, _("Reposition error. ERR=%s\n"), strerror_dev(dev)); goto bail_out; } Pmsg1(-1, _("Reading block %d.\n"), dev->block_num); @@ -2144,9 +2194,9 @@ 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); + last_file, last_block_num); if (!reposition_dev(dev, last_file, last_block_num)) { - Pmsg1(-1, "Reposition error. ERR=%s\n", strerror_dev(dev)); + Pmsg1(-1, _("Reposition error. ERR=%s\n"), strerror_dev(dev)); goto bail_out; } Pmsg1(-1, _("Reading block %d.\n"), dev->block_num); @@ -2164,48 +2214,48 @@ bail_out: free_block(first_block); } -/* Read 1000 records then stop */ +/* Read 10000 records then stop */ 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); + Pmsg3(-1, _("ERROR! device at %d:%d count=%d\n"), dev->file, dev->block_num, + quickie_count); return false; } quickie_count++; - if (quickie_count == 1000) { - Pmsg2(-1, "1000 records read now at %d:%d\n", dev->file, dev->block_num); + if (quickie_count == 10000) { + Pmsg2(-1, _("1000 records read now at %d:%d\n"), dev->file, dev->block_num); } - return quickie_count < 1000; + return quickie_count < 10000; } -static bool compare_blocks(DEV_BLOCK *last_block, DEV_BLOCK *block) +static bool compare_blocks(DEV_BLOCK *last_block, DEV_BLOCK *block) { char *p, *q; uint32_t CheckSum, block_len; ser_declare; - p = last_block->buf; + p = last_block->buf; q = block->buf; unser_begin(q, BLKHDR2_LENGTH); unser_uint32(CheckSum); unser_uint32(block_len); while (q < (block->buf+block_len)) { if (*p == *q) { - p++; - q++; - continue; + p++; + q++; + continue; } Pmsg0(-1, "\n"); 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" - "to write multi-tape Volumes.!!!!\n"); + "to write multi-tape Volumes.!!!!\n")); return false; } if (verbose) { @@ -2241,31 +2291,31 @@ 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)) { - Pmsg3(000, "Last block at: %u:%u this_dev_block_num=%d\n", - last_file, last_block_num, this_block_num); + 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) { - /* - * This is 1st tape, so save first tape info separate - * from second tape info - */ - last_block_num1 = last_block_num; - last_file1 = last_file; - last_block1 = dup_block(last_block); - last_block2 = dup_block(last_block); - first_block = dup_block(block); /* first block second tape */ + /* + * This is 1st tape, so save first tape info separate + * from second tape info + */ + last_block_num1 = last_block_num; + last_file1 = last_file; + last_block1 = dup_block(last_block); + last_block2 = dup_block(last_block); + first_block = dup_block(block); /* first block second tape */ } if (verbose) { - Pmsg3(000, "Block not written: FileIndex=%u blk_block=%u Size=%u\n", - (unsigned)file_index, block->BlockNumber, block->block_len); - dump_block(last_block, "Last block written"); + Pmsg3(000, _("Block not written: FileIndex=%u blk_block=%u Size=%u\n"), + (unsigned)file_index, block->BlockNumber, block->block_len); + dump_block(last_block, _("Last block written")); Pmsg0(-1, "\n"); - dump_block(block, "Block not written"); + dump_block(block, _("Block not written")); } if (stop == 0) { - eot_block = block->BlockNumber; - eot_block_len = block->block_len; - eot_FileIndex = file_index; - stop = 1; + eot_block = block->BlockNumber; + eot_block_len = block->block_len; + eot_FileIndex = file_index; + stop = 1; } now = time(NULL); now -= jcr->run_time; @@ -2274,24 +2324,24 @@ static int flush_block(DEV_BLOCK *block, int dump) } 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", - dev->file, dev->block_num, - edit_uint64_with_commas(dev->VolCatInfo.VolCatBytes, ec1), kbs); + 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); if (simple) { - stop = -1; /* stop, but do simplified test */ + stop = -1; /* stop, but do simplified test */ } else { - /* Full test in progress */ - if (!fixup_device_block_write_error(jcr->dcr)) { + /* Full test in progress */ + if (!fixup_device_block_write_error(jcr->dcr)) { Pmsg1(000, _("Cannot fixup device error. %s\n"), strerror_dev(dev)); - ok = false; - unlock_device(dev); - return 0; - } - BlockNumber = 0; /* start counting for second tape */ + ok = false; + unlock_device(dev); + return 0; + } + BlockNumber = 0; /* start counting for second tape */ } unlock_device(dev); - return 1; /* end of tape reached */ + return 1; /* end of tape reached */ } /* Save contents after write so that the header is serialized */ @@ -2301,10 +2351,10 @@ static int flush_block(DEV_BLOCK *block, int dump) * Note, we always read/write to block, but we toggle * copying it to one or another of two allocated blocks. * Switch blocks so that the block just successfully written is - * always in last_block. + * always in last_block. */ tblock = last_block; - last_block = this_block; + last_block = this_block; this_block = tblock; last_file = this_file; last_block_num = this_block_num; @@ -2314,19 +2364,19 @@ static int flush_block(DEV_BLOCK *block, int dump) } -/* +/* * First we label the tape, then we fill * it with data get a new tape and write a few blocks. - */ + */ static void qfillcmd() { DEV_BLOCK *block = dcr->block; 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) { @@ -2341,19 +2391,19 @@ static void qfillcmd() 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("+"); - fflush(stdout); + fflush(stdout); } if (!write_record_to_block(block, rec)) { - Pmsg0(0, _("Error writing record to block.\n")); - goto bail_out; + Pmsg0(0, _("Error writing record to block.\n")); + goto bail_out; } if (!write_block_to_dev(dcr)) { - Pmsg0(0, _("Error writing block to device.\n")); - goto bail_out; + Pmsg0(0, _("Error writing block to device.\n")); + goto bail_out; } } printf("\n"); @@ -2389,38 +2439,38 @@ static void rawfill_cmd() uint32_t *p = (uint32_t *)block->buf; srandom(time(NULL)); for (i=0; ibuf_len/sizeof(uint32_t); i++) { - p[i] = random(); + p[i] = random(); } } 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; stat = write(dev->fd, block->buf, block->buf_len); if (stat == (int)block->buf_len) { - if ((block_num++ % 100) == 0) { + if ((block_num++ % 100) == 0) { printf("+"); - fflush(stdout); - } - p[0] += p[13]; - for (i=1; i<(block->buf_len-sizeof(uint32_t))/sizeof(uint32_t)-1; i++) { - p[i] += p[i-1]; - } - continue; + fflush(stdout); + } + p[0] += p[13]; + for (i=1; i<(block->buf_len-sizeof(uint32_t))/sizeof(uint32_t)-1; i++) { + p[i] += p[i-1]; + } + continue; } break; } my_errno = errno; printf("\n"); berrno be; - printf("Write failed at block %u. stat=%d ERR=%s\n", block_num, stat, + printf(_("Write failed at block %u. stat=%d ERR=%s\n"), block_num, stat, be.strerror(my_errno)); weofcmd(); } /* - * Fill a tape using raw write() command + * Fill a tape using Bacula block writes */ static void bfill_cmd() { @@ -2428,7 +2478,7 @@ static void bfill_cmd() uint32_t block_num = 0; uint32_t *p; int my_errno; - int fd; + int fd; uint32_t i; fd = open("/dev/urandom", O_RDONLY); @@ -2439,65 +2489,65 @@ static void bfill_cmd() uint32_t *p = (uint32_t *)block->buf; srandom(time(NULL)); for (i=0; ibuf_len/sizeof(uint32_t); i++) { - p[i] = random(); + p[i] = random(); } } p = (uint32_t *)block->buf; - Pmsg1(0, "Begin writing Bacula blocks of %u bytes.\n", block->buf_len); + 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; + break; } if ((block_num++ % 100) == 0) { printf("+"); - fflush(stdout); + fflush(stdout); } p[0] += p[13]; for (i=1; i<(block->buf_len/sizeof(uint32_t)-1); i++) { - p[i] += p[i-1]; + p[i] += p[i-1]; } } my_errno = errno; printf("\n"); - printf("Write failed at block %u.\n", block_num); + printf(_("Write failed at block %u.\n"), block_num); weofcmd(); } -struct cmdstruct { const char *key; void (*func)(); const char *help; }; +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"}, - }; + {N_("autochanger"),autochangercmd, _("test autochanger")}, + {N_("bsf"), bsfcmd, _("backspace file")}, + {N_("bsr"), bsrcmd, _("backspace record")}, + {N_("bfill"), bfill_cmd, _("fill tape using Bacula writes")}, + {N_("cap"), capcmd, _("list device capabilities")}, + {N_("clear"), clearcmd, _("clear tape errors")}, + {N_("eod"), eodcmd, _("go to end of Bacula data for append")}, + {N_("eom"), eomcmd, _("go to the physical end of medium")}, + {N_("fill"), fillcmd, _("fill tape, write onto second volume")}, + {N_("unfill"), unfillcmd, _("read filled tape")}, + {N_("fsf"), fsfcmd, _("forward space a file")}, + {N_("fsr"), fsrcmd, _("forward space a record")}, + {N_("help"), helpcmd, _("print this command")}, + {N_("label"), labelcmd, _("write a Bacula label to the tape")}, + {N_("load"), loadcmd, _("load a tape")}, + {N_("quit"), quitcmd, _("quit btape")}, + {N_("rawfill"), rawfill_cmd, _("use write() to fill tape")}, + {N_("readlabel"), readlabelcmd, _("read and print the Bacula tape label")}, + {N_("rectest"), rectestcmd, _("test record handling functions")}, + {N_("rewind"), rewindcmd, _("rewind the tape")}, + {N_("scan"), scancmd, _("read() tape block by block to EOT and report")}, + {N_("scanblocks"),scan_blocks, _("Bacula read block by block to EOT and report")}, + {N_("status"), statcmd, _("print tape status")}, + {N_("test"), testcmd, _("General test Bacula tape functions")}, + {N_("weof"), weofcmd, _("write an EOF on the tape")}, + {N_("wr"), wrcmd, _("write a single Bacula block")}, + {N_("rr"), rrcmd, _("read a single record")}, + {N_("qfill"), qfillcmd, _("quick fill command")} + }; #define comsize (sizeof(commands)/sizeof(struct cmdstruct)) static void @@ -2511,15 +2561,15 @@ do_tape_cmds() found = false; parse_args(cmd, &args, &argc, argk, argv, MAX_CMD_ARGS); for (i=0; i 0 && fstrsch(argk[0], commands[i].key)) { - (*commands[i].func)(); /* go execute command */ - found = true; - break; - } + if (argc > 0 && fstrsch(argk[0], commands[i].key)) { + (*commands[i].func)(); /* go execute command */ + found = true; + break; + } if (!found) Pmsg1(0, _("%s is an illegal command\n"), cmd); if (quit) - break; + break; } } @@ -2537,8 +2587,8 @@ static void helpcmd() static void usage() { fprintf(stderr, _( -"Copyright (C) 2000-2004 Kern Sibbald and John Walker.\n" -"\nVersion: " VERSION " (" BDATE ")\n\n" +"Copyright (C) 2000-2005 Kern Sibbald.\n" +"\nVersion: %s (%s)\n\n" "Usage: btape \n" " -b specify bootstrap file\n" " -c set configuration file to file\n" @@ -2546,17 +2596,17 @@ static void usage() " -p proceed inspite of I/O errors\n" " -s turn off signals\n" " -v be verbose\n" -" -? print this message.\n" -"\n")); +" -? print this message.\n" +"\n"), VERSION, BDATE); } -/* +/* * Get next input command from terminal. This * routine is REALLY primitive, and should be enhanced * to have correct backspacing, etc. */ -int +int get_cmd(const char *prompt) { int i = 0; @@ -2567,16 +2617,16 @@ get_cmd(const char *prompt) * up a bit. */ cmd[i] = 0; - while ((ch = fgetc(stdin)) != EOF) { + while ((ch = fgetc(stdin)) != EOF) { if (ch == '\n') { - strip_trailing_junk(cmd); - return 1; + strip_trailing_junk(cmd); + return 1; } else if (ch == 4 || ch == 0xd3 || ch == 0x8) { - if (i > 0) - cmd[--i] = 0; - continue; - } - + if (i > 0) + cmd[--i] = 0; + continue; + } + cmd[i++] = ch; cmd[i] = 0; } @@ -2585,16 +2635,16 @@ get_cmd(const char *prompt) } /* Dummies to replace askdir.c */ -bool dir_update_file_attributes(DCR *dcr, DEV_RECORD *rec) { return 1;} -bool dir_send_job_status(JCR *jcr) {return 1;} +bool dir_update_file_attributes(DCR *dcr, DEV_RECORD *rec) { return 1;} +bool dir_send_job_status(JCR *jcr) {return 1;} -bool dir_update_volume_info(DCR *dcr, bool relabel) -{ +bool dir_update_volume_info(DCR *dcr, bool relabel) +{ return 1; } -bool dir_get_volume_info(DCR *dcr, enum get_vol_info_rw writing) +bool dir_get_volume_info(DCR *dcr, enum get_vol_info_rw writing) { Dmsg0(20, "Enter dir_get_volume_info\n"); bstrncpy(dcr->VolCatInfo.VolCatName, dcr->VolumeName, sizeof(dcr->VolCatInfo.VolCatName)); @@ -2608,8 +2658,8 @@ bool dir_create_jobmedia_record(DCR *dcr) } -bool dir_find_next_appendable_volume(DCR *dcr) -{ +bool dir_find_next_appendable_volume(DCR *dcr) +{ Dmsg1(20, "Enter dir_find_next_appendable_volume. stop=%d\n", stop); return dcr->VolumeName[0] != 0; } @@ -2625,16 +2675,16 @@ bool dir_ask_sysop_to_mount_volume(DCR *dcr) if (dev_cap(dev, CAP_OFFLINEUNMOUNT)) { offline_dev(dev); } - force_close_dev(dev); + force_close_device(dev); 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: ", - dev_name(dev)); + fprintf(stderr, _("Mount second Volume on device %s and press return when ready: "), + dev->print_name()); } else { - fprintf(stderr, "Mount Volume \"%s\" on device %s and press return when ready: ", - dcr->VolumeName, dev_name(dev)); + fprintf(stderr, _("Mount Volume \"%s\" on device %s and press return when ready: "), + dcr->VolumeName, dev->print_name()); } - getchar(); + getchar(); return true; } @@ -2654,10 +2704,10 @@ bool dir_ask_sysop_to_create_appendable_volume(DCR *dcr) } autochanger = autoload_device(dcr, 1, NULL); if (!autochanger) { - force_close_dev(dev); - fprintf(stderr, "Mount blank Volume on device %s and press return when ready: ", - dev_name(dev)); - getchar(); + force_close_device(dev); + fprintf(stderr, _("Mount blank Volume on device %s and press return when ready: "), + dev->print_name()); + getchar(); } open_device(dcr); labelcmd(); @@ -2673,7 +2723,7 @@ static bool my_mount_next_read_volume(DCR *dcr) DEV_BLOCK *block = dcr->block; Dmsg0(20, "Enter my_mount_next_read_volume\n"); - Pmsg1(000, "End of Volume \"%s\"\n", dcr->VolumeName); + Pmsg1(000, _("End of Volume \"%s\"\n"), dcr->VolumeName); if (LastBlock != block->BlockNumber) { VolBytes += block->block_len; @@ -2685,28 +2735,28 @@ static bool my_mount_next_read_volume(DCR *dcr) now = 1; } kbs = (double)VolBytes / (1000.0 * (double)now); - Pmsg3(-1, "Read block=%u, VolBytes=%s rate=%.1f KB/s\n", block->BlockNumber, - edit_uint64_with_commas(VolBytes, ec1), (float)kbs); + 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) { end_of_tape = 1; return false; } - free_vol_list(jcr); + free_restore_volume_list(jcr); set_volume_name("TestVolume2", 2); jcr->bsr = NULL; - create_vol_list(jcr); - close_dev(dev); - dev->state &= ~ST_READ; - if (!acquire_device_for_read(jcr)) { - Pmsg2(0, "Cannot open Dev=%s, Vol=%s\n", dev_name(dev), dcr->VolumeName); + create_restore_volume_list(jcr); + close_device(dev); + dev->clear_read(); + if (!acquire_device_for_read(dcr)) { + Pmsg2(0, _("Cannot open Dev=%s, Vol=%s\n"), dev->print_name(), dcr->VolumeName); return false; } - return true; /* next volume mounted */ + return true; /* next volume mounted */ } -static void set_volume_name(const char *VolName, int volnum) +static void set_volume_name(const char *VolName, int volnum) { DCR *dcr = jcr->dcr; VolumeName = VolName; @@ -2716,3 +2766,7 @@ static void set_volume_name(const char *VolName, int volnum) bstrncpy(dcr->VolumeName, VolName, sizeof(dcr->VolumeName)); dcr->VolCatInfo.Slot = volnum; } + +VOLRES *new_volume(DCR *dcr, const char *VolumeName) { return NULL; } +bool free_volume(DEVICE *dev) { return true; } +void free_unused_volume(DCR *dcr) { }