X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fbextract.c;h=a300792f3cf3fb1bd8eea788c1e9715e1282ead9;hb=09e8d4dc189357f44968dc257301bdf26becefa1;hp=99a9438bd7807a993d01d09b0e7618bbf40f496c;hpb=544ab3d6540a48ab4363138bee972a13c89594c0;p=bacula%2Fbacula diff --git a/bacula/src/stored/bextract.c b/bacula/src/stored/bextract.c index 99a9438bd7..a300792f3c 100644 --- a/bacula/src/stored/bextract.c +++ b/bacula/src/stored/bextract.c @@ -1,42 +1,41 @@ +/* + Bacula(R) - The Network Backup Solution + + Copyright (C) 2000-2016 Kern Sibbald + + The original author of Bacula is Kern Sibbald, with contributions + from many others, a complete list can be found in the file AUTHORS. + + You may use this file and others of this release according to the + license defined in the LICENSE file, which includes the Affero General + Public License, v3.0 ("AGPLv3") and some additional permissions and + terms pursuant to its AGPLv3 Section 7. + + This notice must be preserved when any source code is + conveyed and/or propagated. + + Bacula(R) is a registered trademark of Kern Sibbald. +*/ /* * * Dumb program to extract files from a Bacula backup. * * Kern E. Sibbald, MM * - * 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 as - published by the Free Software Foundation; either version 2 of - the License, or (at your option) any later version. - - 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. - */ #include "bacula.h" #include "stored.h" +#include "ch.h" #include "findlib/find.h" -#if defined(HAVE_CYGWIN) || defined(HAVE_WIN32) -int win32_client = 1; -#else -int win32_client = 0; +#ifdef HAVE_LZO +#include +#include #endif +extern bool parse_sd_config(CONFIG *config, const char *configfile, int exit_code); + static void do_extract(char *fname); static bool record_cb(DCR *dcr, DEV_RECORD *rec); @@ -50,7 +49,10 @@ static bool extract = false; static int non_support_data = 0; static long total = 0; static ATTR *attr; +static POOLMEM *curr_fname; static char *where; +static uint64_t num_errors = 0; +static uint64_t num_records = 0; static uint32_t num_files = 0; static uint32_t compress_buf_size = 70000; static POOLMEM *compress_buf; @@ -62,28 +64,35 @@ static char *wbuf; /* write buffer address */ static uint32_t wsize; /* write size */ static uint64_t fileAddr = 0; /* file write address */ +static CONFIG *config; #define CONFIG_FILE "bacula-sd.conf" -char *configfile; + +void *start_heap; +char *configfile = NULL; STORES *me = NULL; /* our Global resource */ bool forge_on = false; +bool skip_extract = false; pthread_mutex_t device_release_mutex = PTHREAD_MUTEX_INITIALIZER; pthread_cond_t wait_device_release = PTHREAD_COND_INITIALIZER; static void usage() { - fprintf(stderr, -"Copyright (C) 2000-2005 Kern Sibbald.\n" -"\nVersion: " VERSION " (" BDATE ")\n\n" + fprintf(stderr, _( +PROG_COPYRIGHT +"\n%sVersion: %s (%s)\n\n" "Usage: bextract \n" " -b specify a bootstrap file\n" -" -c specify a configuration file\n" -" -d set debug level to nn\n" +" -c specify a Storage configuration file\n" +" -d set debug level to \n" +" -dt print timestamp in debug output\n" +" -T send debug traces to trace file (stored in /tmp)\n" " -e exclude list\n" " -i include list\n" " -p proceed inspite of I/O errors\n" +" -t read data from volume, do not write anything\n" " -v verbose\n" " -V specify Volume names (separated by |)\n" -" -? print this message\n\n"); +" -? print this message\n\n"), 2000, "", VERSION, BDATE); exit(1); } @@ -95,20 +104,36 @@ int main (int argc, char *argv[]) char line[1000]; bool got_inc = false; + setlocale(LC_ALL, ""); + bindtextdomain("bacula", LOCALEDIR); + textdomain("bacula"); + init_stack_dump(); + lmgr_init_thread(); + working_directory = "/tmp"; my_name_is(argc, argv, "bextract"); init_msg(NULL, NULL); /* setup message handler */ + OSDependentInit(); + ff = init_find_files(); binit(&bfd); - while ((ch = getopt(argc, argv, "b:c:d:e:i:pvV:?")) != -1) { + while ((ch = getopt(argc, argv, "Ttb:c:d:e:i:pvV:?")) != -1) { switch (ch) { + case 't': + skip_extract = true; + break; + case 'b': /* bootstrap file */ bsr = parse_bsr(NULL, optarg); // dump_bsr(bsr, true); break; + case 'T': /* Send debug to trace file */ + set_trace(1); + break; + case 'c': /* specify config file */ if (configfile != NULL) { free(configfile); @@ -117,20 +142,28 @@ int main (int argc, char *argv[]) break; case 'd': /* debug level */ - debug_level = atoi(optarg); - if (debug_level <= 0) - debug_level = 1; + if (*optarg == 't') { + dbg_timestamp = true; + } else { + debug_level = atoi(optarg); + if (debug_level <= 0) { + debug_level = 1; + } + } break; case 'e': /* exclude list */ - if ((fd = fopen(optarg, "r")) == NULL) { + if ((fd = fopen(optarg, "rb")) == NULL) { berrno be; - Pmsg2(0, "Could not open exclude file: %s, ERR=%s\n", - optarg, be.strerror()); + Pmsg2(0, _("Could not open exclude file: %s, ERR=%s\n"), + optarg, be.bstrerror()); exit(1); } while (fgets(line, sizeof(line), fd) != NULL) { strip_trailing_junk(line); + if (line[0] == 0) { /* skip blank lines */ + continue; + } Dmsg1(900, "add_exclude %s\n", line); add_fname_to_exclude_list(ff, line); } @@ -138,14 +171,17 @@ int main (int argc, char *argv[]) break; case 'i': /* include list */ - if ((fd = fopen(optarg, "r")) == NULL) { + if ((fd = fopen(optarg, "rb")) == NULL) { berrno be; - Pmsg2(0, "Could not open include file: %s, ERR=%s\n", - optarg, be.strerror()); + Pmsg2(0, _("Could not open include file: %s, ERR=%s\n"), + optarg, be.bstrerror()); exit(1); } while (fgets(line, sizeof(line), fd) != NULL) { strip_trailing_junk(line); + if (line[0] == 0) { /* skip blank lines */ + continue; + } Dmsg1(900, "add_include %s\n", line); add_fname_to_include_list(ff, 0, line); } @@ -175,7 +211,7 @@ int main (int argc, char *argv[]) argv += optind; if (argc != 2) { - Pmsg0(0, "Wrong number of arguments: \n"); + Pmsg0(0, _("Wrong number of arguments: \n")); usage(); } @@ -183,7 +219,10 @@ int main (int argc, char *argv[]) configfile = bstrdup(CONFIG_FILE); } - parse_config(configfile); + config = new_config_parser(); + parse_sd_config(config, configfile, M_ERROR_TERM); + setup_me(); + load_sd_plugins(me->plugin_directory); if (!got_inc) { /* If no include file, */ add_fname_to_include_list(ff, 0, "/"); /* include everything */ @@ -196,11 +235,11 @@ int main (int argc, char *argv[]) free_bsr(bsr); } if (prog_name_msg) { - Pmsg1(000, "%d Program Name and/or Program Data Stream records ignored.\n", + Pmsg1(000, _("%d Program Name and/or Program Data Stream records ignored.\n"), prog_name_msg); } if (win32_data_msg) { - Pmsg1(000, "%d Win32 data or Win32 gzip data stream records. Ignored.\n", + Pmsg1(000, _("%d Win32 data or Win32 gzip data stream records. Ignored.\n"), win32_data_msg); } term_include_exclude_files(ff); @@ -210,32 +249,38 @@ int main (int argc, char *argv[]) static void do_extract(char *devname) { + char ed1[50]; struct stat statp; - jcr = setup_jcr("bextract", devname, bsr, VolumeName, 1); /* acquire for read */ + + enable_backup_privileges(NULL, 1); + + jcr = setup_jcr("bextract", devname, bsr, VolumeName, SD_READ, false/*read dedup data*/); if (!jcr) { exit(1); } - dev = jcr->dcr->dev; + dev = jcr->read_dcr->dev; if (!dev) { exit(1); } - dcr = jcr->dcr; + dcr = jcr->read_dcr; /* Make sure where directory exists and that it is a directory */ if (stat(where, &statp) < 0) { berrno be; - Emsg2(M_ERROR_TERM, 0, "Cannot stat %s. It must exist. ERR=%s\n", - where, be.strerror()); + Emsg2(M_ERROR_TERM, 0, _("Cannot stat %s. It must exist. ERR=%s\n"), + where, be.bstrerror()); } if (!S_ISDIR(statp.st_mode)) { - Emsg1(M_ERROR_TERM, 0, "%s must be a directory.\n", where); + Emsg1(M_ERROR_TERM, 0, _("%s must be a directory.\n"), where); } free(jcr->where); jcr->where = bstrdup(where); - attr = new_attr(); + attr = new_attr(jcr); compress_buf = get_memory(compress_buf_size); + curr_fname = get_pool_memory(PM_FNAME); + *curr_fname = 0; read_records(dcr, record_cb, mount_next_read_volume); /* If output file is still open, it was the last one in the @@ -247,27 +292,85 @@ static void do_extract(char *devname) release_device(dcr); free_attr(attr); free_jcr(jcr); - term_dev(dev); + dev->term(); + free_pool_memory(curr_fname); - printf("%u files restored.\n", num_files); + printf(_("%u files restored.\n"), num_files); + if (num_errors) { + printf(_("Found %s error%s\n"), edit_uint64(num_errors, ed1), num_errors>1? "s":""); + } return; } +static bool store_data(BFILE *bfd, char *data, const int32_t length) +{ + if (is_win32_stream(attr->data_stream) && !have_win32_api()) { + set_portable_backup(bfd); + if (!processWin32BackupAPIBlock(bfd, data, length)) { + berrno be; + Emsg2(M_ERROR_TERM, 0, _("Write error on %s: %s\n"), + attr->ofname, be.bstrerror()); + return false; + } + } else if (bwrite(bfd, data, length) != (ssize_t)length) { + berrno be; + Emsg2(M_ERROR_TERM, 0, _("Write error on %s: %s\n"), + attr->ofname, be.bstrerror()); + return false; + } + + return true; +} + /* * Called here for each record from read_records() */ static bool record_cb(DCR *dcr, DEV_RECORD *rec) { - int stat; + int stat, ret=true; JCR *jcr = dcr->jcr; + char ed1[50]; + + bool restoredatap = false; + POOLMEM *orgdata = NULL; + uint32_t orgdata_len = 0; if (rec->FileIndex < 0) { return true; /* we don't want labels */ } + /* In this mode, we do not create any file on disk, just read + * everything from the volume. + */ + if (skip_extract) { + switch (rec->maskedStream) { + case STREAM_UNIX_ATTRIBUTES: + case STREAM_UNIX_ATTRIBUTES_EX: + if (!unpack_attributes_record(jcr, rec->Stream, rec->data, rec->data_len, attr)) { + Emsg0(M_ERROR_TERM, 0, _("Cannot continue.\n")); + } + if (verbose) { + attr->data_stream = decode_stat(attr->attr, &attr->statp, sizeof(attr->statp), &attr->LinkFI); + build_attr_output_fnames(jcr, attr); + print_ls_output(jcr, attr); + } + pm_strcpy(curr_fname, attr->fname); + num_files++; + break; + } + num_records++; + + /* We display some progress information if verbose not set or set to 2 */ + if (verbose != 1 && (num_records % 200000) == 0L) { + fprintf(stderr, "\rfiles=%d records=%s\n", num_files, edit_uint64(num_records, ed1)); + } + ret = true; + goto bail_out; + } + /* File Attributes stream */ - switch (rec->Stream) { + switch (rec->maskedStream) { case STREAM_UNIX_ATTRIBUTES: case STREAM_UNIX_ATTRIBUTES_EX: @@ -282,32 +385,35 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec) extract = false; } - if (!unpack_attributes_record(jcr, rec->Stream, rec->data, attr)) { + if (!unpack_attributes_record(jcr, rec->Stream, rec->data, rec->data_len, attr)) { Emsg0(M_ERROR_TERM, 0, _("Cannot continue.\n")); } - if (attr->file_index != rec->FileIndex) { - Emsg2(M_ERROR_TERM, 0, _("Record header file index %ld not equal record index %ld\n"), - rec->FileIndex, attr->file_index); - } + /* Keep the name of the current file if we find a bad block */ + pm_strcpy(curr_fname, attr->fname); if (file_is_included(ff, attr->fname) && !file_is_excluded(ff, attr->fname)) { - - attr->data_stream = decode_stat(attr->attr, &attr->statp, &attr->LinkFI); - if (!is_stream_supported(attr->data_stream)) { + attr->data_stream = decode_stat(attr->attr, &attr->statp, sizeof(attr->statp), &attr->LinkFI); + if (!is_restore_stream_supported(attr->data_stream)) { if (!non_support_data++) { Jmsg(jcr, M_ERROR, 0, _("%s stream not supported on this Client.\n"), stream_to_ascii(attr->data_stream)); } extract = false; - return true; + goto bail_out; } - build_attr_output_fnames(jcr, attr); + if (attr->type == FT_DELETED) { /* TODO: choose the right fname/ofname */ + Jmsg(jcr, M_INFO, 0, _("%s was deleted.\n"), attr->fname); + extract = false; + goto bail_out; + } + extract = false; stat = create_file(jcr, attr, &bfd, REPLACE_ALWAYS); + switch (stat) { case CF_ERROR: case CF_SKIP: @@ -328,25 +434,29 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec) } break; + case STREAM_RESTORE_OBJECT: + /* nothing to do */ + break; + /* Data stream and extracting */ case STREAM_FILE_DATA: case STREAM_SPARSE_DATA: case STREAM_WIN32_DATA: if (extract) { - if (rec->Stream == STREAM_SPARSE_DATA) { + if (rec->maskedStream == STREAM_SPARSE_DATA) { ser_declare; uint64_t faddr; - wbuf = rec->data + SPARSE_FADDR_SIZE; - wsize = rec->data_len - SPARSE_FADDR_SIZE; - ser_begin(rec->data, SPARSE_FADDR_SIZE); + wbuf = rec->data + OFFSET_FADDR_SIZE; + wsize = rec->data_len - OFFSET_FADDR_SIZE; + ser_begin(rec->data, OFFSET_FADDR_SIZE); unser_uint64(faddr); if (fileAddr != faddr) { fileAddr = faddr; - if (blseek(&bfd, (off_t)fileAddr, SEEK_SET) < 0) { + if (blseek(&bfd, (boffset_t)fileAddr, SEEK_SET) < 0) { berrno be; Emsg2(M_ERROR_TERM, 0, _("Seek error on %s: %s\n"), - attr->ofname, be.strerror()); + attr->ofname, be.bstrerror()); } } } else { @@ -355,11 +465,7 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec) } total += wsize; Dmsg2(8, "Write %u bytes, total=%u\n", wsize, total); - if ((uint32_t)bwrite(&bfd, wbuf, wsize) != wsize) { - berrno be; - Emsg2(M_ERROR_TERM, 0, _("Write error on %s: %s\n"), - attr->ofname, be.strerror()); - } + store_data(&bfd, wbuf, wsize); fileAddr += wsize; } break; @@ -370,48 +476,47 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec) case STREAM_WIN32_GZIP_DATA: #ifdef HAVE_LIBZ if (extract) { - uLong compress_len; - int stat; + uLong compress_len = compress_buf_size; + int stat = Z_BUF_ERROR; - if (rec->Stream == STREAM_SPARSE_GZIP_DATA) { + if (rec->maskedStream == STREAM_SPARSE_GZIP_DATA) { ser_declare; uint64_t faddr; char ec1[50]; - wbuf = rec->data + SPARSE_FADDR_SIZE; - wsize = rec->data_len - SPARSE_FADDR_SIZE; - ser_begin(rec->data, SPARSE_FADDR_SIZE); + wbuf = rec->data + OFFSET_FADDR_SIZE; + wsize = rec->data_len - OFFSET_FADDR_SIZE; + ser_begin(rec->data, OFFSET_FADDR_SIZE); unser_uint64(faddr); if (fileAddr != faddr) { fileAddr = faddr; - if (blseek(&bfd, (off_t)fileAddr, SEEK_SET) < 0) { + if (blseek(&bfd, (boffset_t)fileAddr, SEEK_SET) < 0) { berrno be; Emsg3(M_ERROR, 0, _("Seek to %s error on %s: ERR=%s\n"), - edit_uint64(fileAddr, ec1), attr->ofname, be.strerror()); + edit_uint64(fileAddr, ec1), attr->ofname, be.bstrerror()); extract = false; - return true; + goto bail_out; } } } else { wbuf = rec->data; wsize = rec->data_len; } - compress_len = compress_buf_size; - if ((stat=uncompress((Bytef *)compress_buf, &compress_len, - (const Bytef *)wbuf, (uLong)wsize) != Z_OK)) { + + while (compress_len < 10000000 && (stat=uncompress((Byte *)compress_buf, &compress_len, + (const Byte *)wbuf, (uLong)wsize)) == Z_BUF_ERROR) { + /* The buffer size is too small, try with a bigger one */ + compress_len = 2 * compress_len; + compress_buf = check_pool_memory_size(compress_buf, + compress_len); + } + if (stat != Z_OK) { Emsg1(M_ERROR, 0, _("Uncompression error. ERR=%d\n"), stat); extract = false; - return true; + goto bail_out; } Dmsg2(100, "Write uncompressed %d bytes, total before write=%d\n", compress_len, total); - if ((uLongf)bwrite(&bfd, compress_buf, (size_t)compress_len) != compress_len) { - berrno be; - Pmsg0(0, "===Write error===\n"); - Emsg2(M_ERROR, 0, _("Write error on %s: %s\n"), - attr->ofname, be.strerror()); - extract = false; - return true; - } + store_data(&bfd, compress_buf, compress_len); total += compress_len; fileAddr += compress_len; Dmsg2(100, "Compress len=%d uncompressed=%d\n", rec->data_len, @@ -419,30 +524,136 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec) } #else if (extract) { - Emsg0(M_ERROR, 0, "GZIP data stream found, but GZIP not configured!\n"); + Emsg0(M_ERROR, 0, _("GZIP data stream found, but GZIP not configured!\n")); extract = false; - return true; + goto bail_out; } #endif break; - case STREAM_MD5_SIGNATURE: - case STREAM_SHA1_SIGNATURE: + /* Compressed data stream */ + case STREAM_COMPRESSED_DATA: + case STREAM_SPARSE_COMPRESSED_DATA: + case STREAM_WIN32_COMPRESSED_DATA: + if (extract) { + uint32_t comp_magic, comp_len; + uint16_t comp_level, comp_version; +#ifdef HAVE_LZO + lzo_uint compress_len; + const unsigned char *cbuf; + int r, real_compress_len; +#endif + + if (rec->maskedStream == STREAM_SPARSE_COMPRESSED_DATA) { + ser_declare; + uint64_t faddr; + char ec1[50]; + wbuf = rec->data + OFFSET_FADDR_SIZE; + wsize = rec->data_len - OFFSET_FADDR_SIZE; + ser_begin(rec->data, OFFSET_FADDR_SIZE); + unser_uint64(faddr); + if (fileAddr != faddr) { + fileAddr = faddr; + if (blseek(&bfd, (boffset_t)fileAddr, SEEK_SET) < 0) { + berrno be; + Emsg3(M_ERROR, 0, _("Seek to %s error on %s: ERR=%s\n"), + edit_uint64(fileAddr, ec1), attr->ofname, be.bstrerror()); + extract = false; + goto bail_out; + } + } + } else { + wbuf = rec->data; + wsize = rec->data_len; + } + + /* read compress header */ + unser_declare; + unser_begin(wbuf, sizeof(comp_stream_header)); + unser_uint32(comp_magic); + unser_uint32(comp_len); + unser_uint16(comp_level); + unser_uint16(comp_version); + Dmsg4(200, "Compressed data stream found: magic=0x%x, len=%d, level=%d, ver=0x%x\n", comp_magic, comp_len, + comp_level, comp_version); + + /* version check */ + if (comp_version != COMP_HEAD_VERSION) { + Emsg1(M_ERROR, 0, _("Compressed header version error. version=0x%x\n"), comp_version); + ret = false; + goto bail_out; + } + /* size check */ + if (comp_len + sizeof(comp_stream_header) != wsize) { + Emsg2(M_ERROR, 0, _("Compressed header size error. comp_len=%d, msglen=%d\n"), + comp_len, wsize); + ret = false; + goto bail_out; + } + + switch(comp_magic) { +#ifdef HAVE_LZO + case COMPRESS_LZO1X: + compress_len = compress_buf_size; + cbuf = (const unsigned char*) wbuf + sizeof(comp_stream_header); + real_compress_len = wsize - sizeof(comp_stream_header); + Dmsg2(200, "Comp_len=%d msglen=%d\n", compress_len, wsize); + while ((r=lzo1x_decompress_safe(cbuf, real_compress_len, + (unsigned char *)compress_buf, &compress_len, NULL)) == LZO_E_OUTPUT_OVERRUN) + { + + /* The buffer size is too small, try with a bigger one */ + compress_len = 2 * compress_len; + compress_buf = check_pool_memory_size(compress_buf, + compress_len); + } + if (r != LZO_E_OK) { + Emsg1(M_ERROR, 0, _("LZO uncompression error. ERR=%d\n"), r); + extract = false; + goto bail_out; + } + Dmsg2(100, "Write uncompressed %d bytes, total before write=%d\n", compress_len, total); + store_data(&bfd, compress_buf, compress_len); + total += compress_len; + fileAddr += compress_len; + Dmsg2(100, "Compress len=%d uncompressed=%d\n", rec->data_len, compress_len); + break; +#endif + default: + Emsg1(M_ERROR, 0, _("Compression algorithm 0x%x found, but not supported!\n"), comp_magic); + extract = false; + goto bail_out; + } + + } + break; + + case STREAM_MD5_DIGEST: + case STREAM_SHA1_DIGEST: + case STREAM_SHA256_DIGEST: + case STREAM_SHA512_DIGEST: + break; + + case STREAM_SIGNED_DIGEST: + case STREAM_ENCRYPTED_SESSION_DATA: + // TODO landonf: Investigate crypto support in the storage daemon break; case STREAM_PROGRAM_NAMES: case STREAM_PROGRAM_DATA: if (!prog_name_msg) { - Pmsg0(000, "Got Program Name or Data Stream. Ignored.\n"); + Pmsg0(000, _("Got Program Name or Data Stream. Ignored.\n")); prog_name_msg++; } break; - + case STREAM_PLUGIN_NAME: + /* Just ignore the plugin name */ + break; default: - /* If extracting, wierd stream (not 1 or 2), close output file anyway */ + /* If extracting, weird stream (not 1 or 2), close output file anyway */ if (extract) { if (!is_bopen(&bfd)) { - Emsg0(M_ERROR, 0, "Logic error output file should be open but is not.\n"); + Emsg0(M_ERROR, 0, _("Logic error output file should be open but is not.\n")); } set_attributes(jcr, attr, &bfd); extract = false; @@ -452,24 +663,38 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec) break; } /* end switch */ - return true; +bail_out: + if (restoredatap) { + rec->data = orgdata; + rec->data_len = orgdata_len; + } + return ret; } /* Dummies to replace askdir.c */ -bool dir_get_volume_info(DCR *dcr, enum get_vol_info_rw writing) { return 1;} bool dir_find_next_appendable_volume(DCR *dcr) { return 1;} -bool dir_update_volume_info(DCR *dcr, bool relabel) { return 1; } -bool dir_create_jobmedia_record(DCR *dcr) { return 1; } +bool dir_update_volume_info(DCR *dcr, bool relabel, bool update_LastWritten) { return 1; } +bool dir_create_jobmedia_record(DCR *dcr, bool zero) { return 1; } +bool flush_jobmedia_queue(JCR *jcr) { return true; } bool dir_ask_sysop_to_create_appendable_volume(DCR *dcr) { 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_ask_sysop_to_mount_volume(DCR *dcr) +bool dir_ask_sysop_to_mount_volume(DCR *dcr, bool /*writing*/) { DEVICE *dev = dcr->dev; - 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()); + dev->close(); getchar(); return true; } + +bool dir_get_volume_info(DCR *dcr, enum get_vol_info_rw writing) +{ + Dmsg0(100, "Fake dir_get_volume_info\n"); + dcr->setVolCatName(dcr->VolumeName); + Dmsg2(500, "Vol=%s VolType=%d\n", dcr->getVolCatName(), dcr->VolCatInfo.VolCatType); + return 1; +}