X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fbextract.c;h=e64fe471362946cf814f15d7ff78286580fae83c;hb=0df1b05ab644fac295d2ea6f2e2f1c977fa19a87;hp=4df73cd10214c25eca77b484f59ae5d260ee03ae;hpb=700cc68f57aa8a1d177d0dd56840be6d42a4d324;p=bacula%2Fbacula diff --git a/bacula/src/stored/bextract.c b/bacula/src/stored/bextract.c index 4df73cd102..e64fe47136 100644 --- a/bacula/src/stored/bextract.c +++ b/bacula/src/stored/bextract.c @@ -2,28 +2,23 @@ * * Dumb program to extract files from a Bacula backup. * - * Kern E. Sibbald + * Kern E. Sibbald, MM * * Version $Id$ * */ /* - Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker + Copyright (C) 2000-2006 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. */ @@ -31,136 +26,151 @@ #include "stored.h" #include "findlib/find.h" -#ifdef HAVE_CYGWIN -int win32_client = 1; -#else -int win32_client = 0; -#endif - - static void do_extract(char *fname); -static void record_cb(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec); +static bool record_cb(DCR *dcr, DEV_RECORD *rec); static DEVICE *dev = NULL; -static int ofd = -1; +static DCR *dcr; +static BFILE bfd; static JCR *jcr; -static FF_PKT my_ff; -static FF_PKT *ff = &my_ff; +static FF_PKT *ff; static BSR *bsr = NULL; -static int extract = FALSE; -static long record_file_index; +static bool extract = false; +static int non_support_data = 0; static long total = 0; -static POOLMEM *fname; /* original file name */ -static POOLMEM *ofile; /* output name with prefix */ -static POOLMEM *lname; /* link name */ -static POOLMEM *attribsEx; /* extended attributes (Win32) */ +static ATTR *attr; static char *where; -static int wherelen; /* prefix length */ static uint32_t num_files = 0; -static struct stat statp; static uint32_t compress_buf_size = 70000; static POOLMEM *compress_buf; -static int type; -static int stream; static int prog_name_msg = 0; +static int win32_data_msg = 0; +static char *VolumeName = NULL; -static char *wbuf; /* write buffer address */ -static uint32_t wsize; /* write size */ -static uint64_t fileAddr = 0; /* file write address */ +static char *wbuf; /* write buffer address */ +static uint32_t wsize; /* write size */ +static uint64_t fileAddr = 0; /* file write address */ #define CONFIG_FILE "bacula-sd.conf" -char *configfile; - +char *configfile = NULL; +STORES *me = NULL; /* our Global resource */ +bool forge_on = false; +pthread_mutex_t device_release_mutex = PTHREAD_MUTEX_INITIALIZER; +pthread_cond_t wait_device_release = PTHREAD_COND_INITIALIZER; static void usage() { - fprintf(stderr, -"\nVersion: " VERSION " (" DATE ")\n\n" -"Usage: bextract [-d debug_level] \n" + fprintf(stderr, _( +"Copyright (C) 2000-%s Kern Sibbald.\n" +"\nVersion: %s (%s)\n\n" +"Usage: bextract \n" " -b specify a bootstrap file\n" " -c specify a configuration file\n" -" -dnn set debug level to nn\n" +" -d set debug level to nn\n" " -e exclude list\n" " -i include list\n" -" -? print this message\n\n"); +" -p proceed inspite of I/O errors\n" +" -v verbose\n" +" -V specify Volume names (separated by |)\n" +" -? print this message\n\n"), BYEAR, VERSION, BDATE); exit(1); } int main (int argc, char *argv[]) { - int ch; + int ch; FILE *fd; char line[1000]; - int got_inc = FALSE; + bool got_inc = false; + + setlocale(LC_ALL, ""); + bindtextdomain("bacula", LOCALEDIR); + textdomain("bacula"); working_directory = "/tmp"; my_name_is(argc, argv, "bextract"); - init_msg(NULL, NULL); /* setup message handler */ + init_msg(NULL, NULL); /* setup message handler */ + + OSDependentInit(); - memset(ff, 0, sizeof(FF_PKT)); - init_include_exclude_files(ff); + ff = init_find_files(); + binit(&bfd); - while ((ch = getopt(argc, argv, "b:c:d:e:i:?")) != -1) { + while ((ch = getopt(argc, argv, "b:c:d:e:i:pvV:?")) != -1) { switch (ch) { - case 'b': /* bootstrap file */ - bsr = parse_bsr(NULL, optarg); -// dump_bsr(bsr); - break; - - case 'c': /* specify config file */ - if (configfile != NULL) { - free(configfile); - } - configfile = bstrdup(optarg); - break; - - case 'd': /* debug level */ - debug_level = atoi(optarg); - if (debug_level <= 0) - debug_level = 1; - break; - - case 'e': /* exclude list */ - if ((fd = fopen(optarg, "r")) == NULL) { - Pmsg2(0, "Could not open exclude file: %s, ERR=%s\n", - optarg, strerror(errno)); - exit(1); - } - while (fgets(line, sizeof(line), fd) != NULL) { - strip_trailing_junk(line); - Dmsg1(900, "add_exclude %s\n", line); - add_fname_to_exclude_list(ff, line); - } - fclose(fd); - break; - - case 'i': /* include list */ - if ((fd = fopen(optarg, "r")) == NULL) { - Pmsg2(0, "Could not open include file: %s, ERR=%s\n", - optarg, strerror(errno)); - exit(1); - } - while (fgets(line, sizeof(line), fd) != NULL) { - strip_trailing_junk(line); - Dmsg1(900, "add_include %s\n", line); - add_fname_to_include_list(ff, 0, line); - } - fclose(fd); - got_inc = TRUE; - break; - - case '?': - default: - usage(); - - } - } + case 'b': /* bootstrap file */ + bsr = parse_bsr(NULL, optarg); +// dump_bsr(bsr, true); + break; + + case 'c': /* specify config file */ + if (configfile != NULL) { + free(configfile); + } + configfile = bstrdup(optarg); + break; + + case 'd': /* debug level */ + debug_level = atoi(optarg); + if (debug_level <= 0) + debug_level = 1; + break; + + case 'e': /* exclude list */ + if ((fd = fopen(optarg, "rb")) == NULL) { + berrno be; + Pmsg2(0, _("Could not open exclude file: %s, ERR=%s\n"), + optarg, be.strerror()); + exit(1); + } + while (fgets(line, sizeof(line), fd) != NULL) { + strip_trailing_junk(line); + Dmsg1(900, "add_exclude %s\n", line); + add_fname_to_exclude_list(ff, line); + } + fclose(fd); + break; + + case 'i': /* include list */ + if ((fd = fopen(optarg, "rb")) == NULL) { + berrno be; + Pmsg2(0, _("Could not open include file: %s, ERR=%s\n"), + optarg, be.strerror()); + exit(1); + } + while (fgets(line, sizeof(line), fd) != NULL) { + strip_trailing_junk(line); + Dmsg1(900, "add_include %s\n", line); + add_fname_to_include_list(ff, 0, line); + } + fclose(fd); + got_inc = true; + break; + + case 'p': + forge_on = true; + break; + + case 'v': + verbose++; + break; + + case 'V': /* Volume name */ + VolumeName = optarg; + break; + + case '?': + default: + usage(); + + } /* end switch */ + } /* end while */ argc -= optind; argv += optind; if (argc != 2) { - Pmsg0(0, "Wrong number of arguments: \n"); + Pmsg0(0, _("Wrong number of arguments: \n")); usage(); } @@ -170,7 +180,7 @@ int main (int argc, char *argv[]) parse_config(configfile); - if (!got_inc) { /* If no include file, */ + if (!got_inc) { /* If no include file, */ add_fname_to_include_list(ff, 0, "/"); /* include everything */ } @@ -180,306 +190,289 @@ int main (int argc, char *argv[]) if (bsr) { free_bsr(bsr); } + if (prog_name_msg) { + 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"), + win32_data_msg); + } + term_include_exclude_files(ff); + term_find_files(ff); return 0; } static void do_extract(char *devname) { - - jcr = setup_jcr("bextract", devname, bsr); - dev = setup_to_access_device(jcr, 1); /* acquire for read */ + struct stat statp; + jcr = setup_jcr("bextract", devname, bsr, VolumeName, 1); /* acquire for read */ + if (!jcr) { + exit(1); + } + dev = jcr->read_dcr->dev; if (!dev) { exit(1); } + dcr = jcr->read_dcr; /* Make sure where directory exists and that it is a directory */ if (stat(where, &statp) < 0) { - Emsg2(M_ERROR_TERM, 0, "Cannot stat %s. It must exist. ERR=%s\n", - where, strerror(errno)); + berrno be; + Emsg2(M_ERROR_TERM, 0, _("Cannot stat %s. It must exist. ERR=%s\n"), + where, be.strerror()); } 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); } - wherelen = strlen(where); - fname = get_pool_memory(PM_FNAME); - ofile = get_pool_memory(PM_FNAME); - lname = get_pool_memory(PM_FNAME); - attribsEx = get_pool_memory(PM_FNAME); + free(jcr->where); + jcr->where = bstrdup(where); + attr = new_attr(); compress_buf = get_memory(compress_buf_size); - read_records(jcr, dev, record_cb, mount_next_read_volume); + read_records(dcr, record_cb, mount_next_read_volume); /* If output file is still open, it was the last one in the - * archive since we just hit an end of file, so close the file. + * archive since we just hit an end of file, so close the file. */ - if (ofd >= 0) { - set_attributes(jcr, fname, ofile, lname, type, stream, &statp, - attribsEx, &ofd); + if (is_bopen(&bfd)) { + set_attributes(jcr, attr, &bfd); } - release_device(jcr, dev); - - free_pool_memory(fname); - free_pool_memory(ofile); - free_pool_memory(lname); - free_pool_memory(compress_buf); - term_dev(dev); + release_device(dcr); + free_attr(attr); free_jcr(jcr); - printf("%u files restored.\n", num_files); + dev->term(); + + printf(_("%u files restored.\n"), num_files); return; } /* * Called here for each record from read_records() */ -static void record_cb(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec) +static bool record_cb(DCR *dcr, DEV_RECORD *rec) { + int stat; + JCR *jcr = dcr->jcr; if (rec->FileIndex < 0) { - return; /* we don't want labels */ + return true; /* we don't want labels */ } /* File Attributes stream */ - if (rec->Stream == STREAM_UNIX_ATTRIBUTES || rec->Stream == STREAM_WIN32_ATTRIBUTES) { - char *ap, *lp, *fp, *apex; - stream = rec->Stream; + switch (rec->Stream) { + case STREAM_UNIX_ATTRIBUTES: + case STREAM_UNIX_ATTRIBUTES_EX: /* If extracting, it was from previous stream, so * close the output file. */ if (extract) { - if (ofd < 0) { - Emsg0(M_ERROR, 0, "Logic error output file should be open\n"); - } - extract = FALSE; - set_attributes(jcr, fname, ofile, lname, type, stream, &statp, - attribsEx, &ofd); + if (!is_bopen(&bfd)) { + Emsg0(M_ERROR, 0, _("Logic error output file should be open but is not.\n")); + } + set_attributes(jcr, attr, &bfd); + extract = false; } - if (sizeof_pool_memory(fname) < rec->data_len) { - fname = realloc_pool_memory(fname, rec->data_len + 1); - } - if (sizeof_pool_memory(ofile) < rec->data_len + wherelen + 1) { - ofile = realloc_pool_memory(ofile, rec->data_len + wherelen + 1); - } - if (sizeof_pool_memory(lname) < rec->data_len) { - lname = realloc_pool_memory(lname, rec->data_len + wherelen + 1); - } - *fname = 0; - *lname = 0; - - /* - * An Attributes record consists of: - * File_index - * Type (FT_types) - * Filename - * Attributes - * Link name (if file linked i.e. FT_LNK) - * Extended Attributes (Win32) - * - */ - sscanf(rec->data, "%ld %d", &record_file_index, &type); - if (record_file_index != rec->FileIndex) - Emsg2(M_ERROR_TERM, 0, "Record header file index %ld not equal record index %ld\n", - rec->FileIndex, record_file_index); - ap = rec->data; - while (*ap++ != ' ') /* skip record file index */ - ; - while (*ap++ != ' ') /* skip type */ - ; - /* Save filename and position to attributes */ - fp = fname; - while (*ap != 0) { - *fp++ = *ap++; - } - *fp = *ap++; /* terminate filename & point to attribs */ - - /* Skip to Link name */ - if (type == FT_LNK || type == FT_LNKSAVED) { - lp = ap; - while (*lp++ != 0) { - ; - } - } else { - lp = ""; + if (!unpack_attributes_record(jcr, rec->Stream, rec->data, attr)) { + Emsg0(M_ERROR_TERM, 0, _("Cannot continue.\n")); } - if (rec->Stream == STREAM_WIN32_ATTRIBUTES) { - apex = ap; /* start at attributes */ - while (*apex++ != 0) { /* skip attributes */ - ; - } - while (*apex++ != 0) { /* skip link name */ - ; - } - pm_strcpy(&attribsEx, apex); /* make a copy of Extended attributes */ - } else { - *attribsEx = 0; /* no extended attributes */ + 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); } - - if (file_is_included(ff, fname) && !file_is_excluded(ff, fname)) { - - decode_stat(ap, &statp); - /* - * Prepend the where directory so that the - * files are put where the user wants. - * - * We do a little jig here to handle Win32 files with - * a drive letter -- we simply strip the drive: from - * every filename if a prefix is supplied. - */ - if (where[0] == 0) { - strcpy(ofile, fname); - strcpy(lname, lp); - } else { - char *fn; - strcpy(ofile, where); - if (win32_client && fname[1] == ':') { - fn = fname+2; /* skip over drive: */ - } else { - fn = fname; /* take whole name */ - } - /* Ensure where is terminated with a slash */ - if (where[wherelen-1] != '/' && fn[0] != '/') { - strcat(ofile, "/"); - } - strcat(ofile, fn); /* copy rest of name */ - /* Fixup link name */ - if (type == FT_LNK || type == FT_LNKSAVED) { - if (lp[0] == '/') { /* if absolute path */ - strcpy(lname, where); - } - if (win32_client && lp[1] == ':') { - strcat(lname, lp+2); /* copy rest of name */ - } else { - strcat(lname, lp); /* On Unix systems we take everything */ - } - } - } - - /* Pmsg1(000, "Restoring: %s\n", ofile); */ - - extract = create_file(jcr, fname, ofile, lname, type, stream, - &statp, attribsEx, &ofd, REPLACE_ALWAYS); - num_files++; - - if (extract) { - print_ls_output(ofile, lname, type, &statp); - fileAddr = 0; - } + 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_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; + } + + + build_attr_output_fnames(jcr, attr); + + extract = false; + stat = create_file(jcr, attr, &bfd, REPLACE_ALWAYS); + switch (stat) { + case CF_ERROR: + case CF_SKIP: + break; + case CF_EXTRACT: + extract = true; + print_ls_output(jcr, attr); + num_files++; + fileAddr = 0; + break; + case CF_CREATED: + set_attributes(jcr, attr, &bfd); + print_ls_output(jcr, attr); + num_files++; + fileAddr = 0; + break; + } } + break; /* Data stream and extracting */ - } else if (rec->Stream == STREAM_FILE_DATA || rec->Stream == STREAM_SPARSE_DATA) { + case STREAM_FILE_DATA: + case STREAM_SPARSE_DATA: + case STREAM_WIN32_DATA: + if (extract) { - if (rec->Stream == 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); - unser_uint64(faddr); - if (fileAddr != faddr) { - fileAddr = faddr; - if (lseek(ofd, (off_t)fileAddr, SEEK_SET) < 0) { - Emsg2(M_ERROR_TERM, 0, _("Seek error on %s: %s\n"), ofile, strerror(errno)); - } - } - } else { - wbuf = rec->data; - wsize = rec->data_len; - } - total += wsize; + if (rec->Stream == 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); + unser_uint64(faddr); + if (fileAddr != faddr) { + fileAddr = faddr; + if (blseek(&bfd, (off_t)fileAddr, SEEK_SET) < 0) { + berrno be; + Emsg2(M_ERROR_TERM, 0, _("Seek error on %s: %s\n"), + attr->ofname, be.strerror()); + } + } + } else { + wbuf = rec->data; + wsize = rec->data_len; + } + total += wsize; Dmsg2(8, "Write %u bytes, total=%u\n", wsize, total); - if ((uint32_t)write(ofd, wbuf, wsize) != wsize) { - Emsg2(M_ERROR_TERM, 0, _("Write error on %s: %s\n"), ofile, strerror(errno)); - } - fileAddr += wsize; + 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()); + } + fileAddr += wsize; } + break; - } else if (rec->Stream == STREAM_GZIP_DATA || rec->Stream == STREAM_SPARSE_GZIP_DATA) { + /* GZIP data stream */ + case STREAM_GZIP_DATA: + case STREAM_SPARSE_GZIP_DATA: + case STREAM_WIN32_GZIP_DATA: #ifdef HAVE_LIBZ if (extract) { - uLongf compress_len; - int stat; - - if (rec->Stream == STREAM_SPARSE_GZIP_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); - unser_uint64(faddr); - if (fileAddr != faddr) { - fileAddr = faddr; - if (lseek(ofd, (off_t)fileAddr, SEEK_SET) < 0) { - Emsg2(M_ERROR, 0, _("Seek error on %s: %s\n"), ofile, strerror(errno)); - } - } - } 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)) { - Emsg1(M_ERROR_TERM, 0, _("Uncompression error. ERR=%d\n"), stat); - } + uLong compress_len; + int stat; + + if (rec->Stream == 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); + unser_uint64(faddr); + if (fileAddr != faddr) { + fileAddr = faddr; + if (blseek(&bfd, (off_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()); + extract = false; + return true; + } + } + } 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)) { + Emsg1(M_ERROR, 0, _("Uncompression error. ERR=%d\n"), stat); + extract = false; + return true; + } Dmsg2(100, "Write uncompressed %d bytes, total before write=%d\n", compress_len, total); - if ((uLongf)write(ofd, compress_buf, (size_t)compress_len) != compress_len) { - Pmsg0(0, "===Write error===\n"); - Emsg2(M_ERROR_TERM, 0, _("Write error on %s: %s\n"), ofile, strerror(errno)); - } - total += compress_len; - fileAddr += compress_len; + 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; + } + total += compress_len; + fileAddr += compress_len; Dmsg2(100, "Compress len=%d uncompressed=%d\n", rec->data_len, - compress_len); + compress_len); } #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; } #endif + break; + case STREAM_MD5_DIGEST: + case STREAM_SHA1_DIGEST: + case STREAM_SHA256_DIGEST: + case STREAM_SHA512_DIGEST: + break; - /* If extracting, wierd stream (not 1 or 2), close output file anyway */ - } else if (extract) { - if (ofd < 0) { - Emsg0(M_ERROR, 0, "Logic error output file should be open\n"); - } - extract = FALSE; - set_attributes(jcr, fname, ofile, lname, type, stream, &statp, - attribsEx, &ofd); - } else if (rec->Stream == STREAM_PROGRAM_NAMES || rec->Stream == STREAM_PROGRAM_DATA) { + 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"); - prog_name_msg = 1; + Pmsg0(000, _("Got Program Name or Data Stream. Ignored.\n")); + prog_name_msg++; } - } else if (rec->Stream != STREAM_MD5_SIGNATURE) { - Pmsg2(0, "None of above!!! stream=%d data=%s\n", rec->Stream, rec->data); - } -} - + break; + default: + /* If extracting, wierd 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")); + } + set_attributes(jcr, attr, &bfd); + extract = false; + } + Jmsg(jcr, M_ERROR, 0, _("Unknown stream=%d ignored. This shouldn't happen!\n"), + rec->Stream); + break; + } /* end switch */ + return true; +} /* Dummies to replace askdir.c */ -int dir_get_volume_info(JCR *jcr, int writing) { return 1;} -int dir_find_next_appendable_volume(JCR *jcr) { return 1;} -int dir_update_volume_info(JCR *jcr, VOLUME_CAT_INFO *vol, int relabel) { return 1; } -int dir_create_jobmedia_record(JCR *jcr) { return 1; } -int dir_ask_sysop_to_mount_next_volume(JCR *jcr, DEVICE *dev) { return 1; } -int dir_update_file_attributes(JCR *jcr, DEV_RECORD *rec) { return 1;} -int dir_send_job_status(JCR *jcr) {return 1;} +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_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;} -int dir_ask_sysop_to_mount_volume(JCR *jcr, DEVICE *dev) +bool dir_ask_sysop_to_mount_volume(DCR *dcr) { - fprintf(stderr, "Mount Volume %s on device %s and press return when ready: ", - jcr->VolumeName, dev_name(dev)); - getchar(); - return 1; + DEVICE *dev = dcr->dev; + fprintf(stderr, _("Mount Volume \"%s\" on device %s and press return when ready: "), + dcr->VolumeName, dev->print_name()); + dev->close(); + getchar(); + return true; }