X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fbextract.c;h=e64fe471362946cf814f15d7ff78286580fae83c;hb=0df1b05ab644fac295d2ea6f2e2f1c977fa19a87;hp=d6a4e5d907f62ab1175009c353dfef9c35343be9;hpb=f3b33c863e725b60b4e3fe1930408833e6ccd64e;p=bacula%2Fbacula diff --git a/bacula/src/stored/bextract.c b/bacula/src/stored/bextract.c index d6a4e5d907..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,533 +26,453 @@ #include "stored.h" #include "findlib/find.h" - -static void do_extract(char *fname, char *prefix); -static void print_ls_output(char *fname, char *link, int type, struct stat *statp); - +static void do_extract(char *fname); +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 bool extract = false; +static int non_support_data = 0; +static long total = 0; +static ATTR *attr; +static char *where; +static uint32_t num_files = 0; +static uint32_t compress_buf_size = 70000; +static POOLMEM *compress_buf; +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 */ + +#define CONFIG_FILE "bacula-sd.conf" +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, -"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" -" -dnn set debug level to nn\n" +" -c specify a configuration file\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); } -static void my_free_jcr(JCR *jcr) -{ - return; -} - 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: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(optarg); - dump_bsr(bsr); - 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(); } - if (!got_inc) { /* If no include file, */ - add_fname_to_include_list(ff, 0, "/"); /* include everything */ + + if (configfile == NULL) { + configfile = bstrdup(CONFIG_FILE); } - jcr = new_jcr(sizeof(JCR), my_free_jcr); - jcr->VolSessionId = 1; - jcr->VolSessionTime = (uint32_t)time(NULL); - jcr->bsr = bsr; - strcpy(jcr->Job, "bextract"); - jcr->dev_name = get_pool_memory(PM_FNAME); - strcpy(jcr->dev_name, argv[0]); + parse_config(configfile); - do_extract(argv[0], argv[1]); + if (!got_inc) { /* If no include file, */ + add_fname_to_include_list(ff, 0, "/"); /* include everything */ + } + + where = argv[1]; + do_extract(argv[0]); - free_jcr(jcr); 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, char *where) +static void do_extract(char *devname) { - int n; - char VolName[100]; - char *p; struct stat statp; - int extract = FALSE; - int type; - long record_file_index; - long total = 0; - DEV_RECORD rec; - DEV_BLOCK *block; - POOLMEM *fname; /* original file name */ - POOLMEM *ofile; /* output name with prefix */ - POOLMEM *lname; /* link name */ - int wherelen; /* prefix length */ - SESSION_LABEL sessrec; - - if (strncmp(devname, "/dev/", 5) != 0) { - /* Try stripping file part */ - p = devname + strlen(devname); - while (p >= devname && *p != '/') { - p--; - } - if (*p == '/') { - strcpy(VolName, p+1); - *p = 0; - } + jcr = setup_jcr("bextract", devname, bsr, VolumeName, 1); /* acquire for read */ + if (!jcr) { + exit(1); } - strcpy(jcr->VolumeName, VolName); - - dev = init_dev(NULL, devname); - if (!dev || !open_device(dev)) { - Emsg1(M_ERROR_TERM, 0, "Cannot open %s\n", devname); + dev = jcr->read_dcr->dev; + if (!dev) { + exit(1); } - Dmsg0(90, "Device opened for read.\n"); + 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); + free(jcr->where); + jcr->where = bstrdup(where); + attr = new_attr(); + + compress_buf = get_memory(compress_buf_size); - block = new_block(dev); + 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. + */ + if (is_bopen(&bfd)) { + set_attributes(jcr, attr, &bfd); + } + release_device(dcr); + free_attr(attr); + free_jcr(jcr); + dev->term(); - create_vol_list(jcr); + printf(_("%u files restored.\n"), num_files); + return; +} - Dmsg1(20, "Found %d volumes names to restore.\n", jcr->NumVolumes); +/* + * Called here for each record from read_records() + */ +static bool record_cb(DCR *dcr, DEV_RECORD *rec) +{ + int stat; + JCR *jcr = dcr->jcr; - /* - * Ready device for reading, and read records - */ - if (!acquire_device_for_read(jcr, dev, block)) { - free_block(block); - free_vol_list(jcr); - return; + if (rec->FileIndex < 0) { + return true; /* we don't want labels */ } - memset(&rec, 0, sizeof(rec)); - rec.data = get_memory(70000); - - uint32_t compress_buf_size = 70000; - POOLMEM *compress_buf = get_memory(compress_buf_size); - - for ( ;; ) { - int ok; - DEV_RECORD *record; /* for reading label of multi-volumes */ - - if (!read_record(dev, block, &rec)) { - uint32_t status; - Dmsg1(500, "Main read record failed. rem=%d\n", rec.remainder); - if (dev->state & ST_EOT) { - if (rec.remainder) { - Dmsg0(500, "Not end of record.\n"); - } - Dmsg2(90, "NumVolumes=%d CurVolume=%d\n", jcr->NumVolumes, jcr->CurVolume); - /* - * End Of Tape -- mount next Volume (if another specified) - */ - if (jcr->NumVolumes > 1 && jcr->CurVolume < jcr->NumVolumes) { - VOL_LIST *vol = jcr->VolList; - /* Find next Volume */ - jcr->CurVolume++; - for (int i=1; iCurVolume; i++) { - vol = vol->next; - } - strcpy(jcr->VolumeName, vol->VolumeName); - Dmsg1(400, "There is another volume %s.\n", jcr->VolumeName); - - close_dev(dev); - dev->state &= ~ST_READ; - if (!acquire_device_for_read(jcr, dev, block)) { - Emsg2(M_FATAL, 0, "Cannot open Dev=%s, Vol=%s\n", dev_name(dev), - jcr->VolumeName); - ok = FALSE; - break; - } - record = new_record(); - Dmsg1(500, "read record after new tape. rem=%d\n", record->remainder); - read_record(dev, block, record); /* read vol label */ - dump_label_record(dev, record, 0); - free_record(record); - continue; - } - Dmsg0(90, "End of Device reached.\n"); - break; /* End of Tape */ - } - if (dev->state & ST_EOF) { - continue; /* try again */ - } - Pmsg0(0, "Read Record got a bad record\n"); - status_dev(dev, &status); - Dmsg1(20, "Device status: %x\n", status); - if (status & MT_EOD) - Emsg0(M_ERROR_TERM, 0, "Unexpected End of Data\n"); - else if (status & MT_EOT) - Emsg0(M_ERROR_TERM, 0, "Unexpected End of Tape\n"); - else if (status & MT_EOF) - Emsg0(M_ERROR_TERM, 0, "Unexpected End of File\n"); - else if (status & MT_DR_OPEN) - Emsg0(M_ERROR_TERM, 0, "Tape Door is Open\n"); - else if (!(status & MT_ONLINE)) - Emsg0(M_ERROR_TERM, 0, "Unexpected Tape is Off-line\n"); - else - Emsg3(M_ERROR_TERM, 0, "Read error %d on Record Header %s: %s\n", n, dev_name(dev), strerror(errno)); + /* File Attributes 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 (!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 (!unpack_attributes_record(jcr, rec->Stream, rec->data, attr)) { + Emsg0(M_ERROR_TERM, 0, _("Cannot continue.\n")); + } - /* This is no longer used */ - if (rec.VolSessionId == 0 && rec.VolSessionTime == 0) { - Emsg0(M_ERROR, 0, "Zero header record. This shouldn't happen.\n"); - break; /* END OF FILE */ + 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); } - /* - * Check for Start or End of Session Record - * - */ - if (rec.FileIndex < 0) { - char *rtype; - memset(&sessrec, 0, sizeof(sessrec)); - switch (rec.FileIndex) { - case PRE_LABEL: - rtype = "Fresh Volume Label"; - break; - case VOL_LABEL: - rtype = "Volume Label"; - unser_volume_label(dev, &rec); - break; - case SOS_LABEL: - rtype = "Begin Session"; - unser_session_label(&sessrec, &rec); - break; - case EOS_LABEL: - rtype = "End Session"; - break; - case EOM_LABEL: - rtype = "End of Media"; - break; - default: - rtype = "Unknown"; - break; - } - if (debug_level > 0) { - printf("%s Record: VolSessionId=%d VolSessionTime=%d JobId=%d DataLen=%d\n", - rtype, rec.VolSessionId, rec.VolSessionTime, rec.Stream, rec.data_len); - } - - Dmsg1(40, "Got label = %d\n", rec.FileIndex); - if (rec.FileIndex == EOM_LABEL) { /* end of tape? */ - Dmsg0(40, "Get EOM LABEL\n"); - break; /* yes, get out */ - } - continue; /* ignore other labels */ - } /* end if label record */ - - /* Is this the file we want? */ - if (bsr && !match_bsr(bsr, &rec, &dev->VolHdr, &sessrec)) { - continue; + 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 */ + 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 (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)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; - /* File Attributes stream */ - if (rec.Stream == STREAM_UNIX_ATTRIBUTES) { - char *ap, *lp, *fp; - - /* If extracting, it was from previous stream, so - * close the output file. - */ - if (extract) { - if (ofd < 0) { - Emsg0(M_ERROR_TERM, 0, "Logic error output file should be open\n"); - } - close(ofd); - ofd = -1; - extract = FALSE; - set_statp(jcr, fname, ofile, lname, type, &statp); - } - - if (sizeof_pool_memory(fname) < rec.data_len) { - fname = realloc_pool_memory(fname, rec.data_len + 1); - } - if (sizeof_pool_memory(ofile) < sizeof_pool_memory(fname) + wherelen + 1) { - ofile = realloc_pool_memory(ofile, sizeof_pool_memory(fname) + wherelen + 1); - } - if (sizeof_pool_memory(lname) < rec.data_len) { - ofile = realloc_pool_memory(ofile, rec.data_len + 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) - * - */ - 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) { - lp = ap; - while (*lp++ != 0) { - ; - } - strcat(lname, lp); /* "save" link name */ - } else { - *lname = 0; - } - - - 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. - * If where is null and we are running on a win32 client, - * change nothing. - * Otherwise, if the second character of the filename is a - * colon (:), change it into a slash (/) -- this creates - * a reasonable pathname on most systems. - */ - strcpy(ofile, where); - if (fname[1] == ':') { - fname[1] = '/'; - strcat(ofile, fname); - fname[1] = ':'; - } else { - strcat(ofile, fname); - } -/* Pmsg1(000, "Restoring: %s\n", ofile); */ - - extract = create_file(jcr, fname, ofile, lname, type, &statp, &ofd); - - if (extract) { - print_ls_output(ofile, lname, type, &statp); - } - } - - /* Data stream and extracting */ - } else if (rec.Stream == STREAM_FILE_DATA) { - if (extract) { - total += rec.data_len; - Dmsg2(8, "Write %ld bytes, total=%ld\n", rec.data_len, total); - if ((uint32_t)write(ofd, rec.data, rec.data_len) != rec.data_len) { - Emsg1(M_ERROR_TERM, 0, "Write error: %s\n", strerror(errno)); - } - } - - } else if (rec.Stream == STREAM_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; - - compress_len = compress_buf_size; - if (uncompress((Bytef *)compress_buf, &compress_len, - (const Bytef *)rec.data, (uLong)rec.data_len) != Z_OK) { - Emsg0(M_ERROR_TERM, 0, _("Uncompression error.\n")); - } - - 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; - Dmsg2(100, "Compress len=%d uncompressed=%d\n", rec.data_len, - compress_len); - } + if (extract) { + 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)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); + } #else - if (extract) { - Emsg0(M_ERROR_TERM, 0, "GZIP data stream found, but GZIP not configured!\n"); - } + if (extract) { + 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; + + 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++; + } + break; - + default: /* If extracting, wierd stream (not 1 or 2), close output file anyway */ - } else if (extract) { - if (ofd < 0) { - Emsg0(M_ERROR_TERM, 0, "Logic error output file should be open\n"); - } - close(ofd); - ofd = -1; - extract = FALSE; - set_statp(jcr, fname, ofile, lname, type, &statp); - } else if (rec.Stream != STREAM_MD5_SIGNATURE) { - Pmsg2(0, "None of above!!! stream=%d data=%s\n", rec.Stream, rec.data); + 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; - /* 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. - */ - if (ofd >= 0) { - close(ofd); - set_statp(jcr, fname, ofile, lname, type, &statp); - } - release_device(jcr, dev, block); - - free_pool_memory(fname); - free_pool_memory(ofile); - free_pool_memory(lname); - free_pool_memory(compress_buf); - term_dev(dev); - free_block(block); - return; -} - -extern char *getuser(uid_t uid); -extern char *getgroup(gid_t gid); - -static void print_ls_output(char *fname, char *link, int type, struct stat *statp) -{ - char buf[1000]; - char ec1[30]; - char *p, *f; - int n; - - p = encode_mode(statp->st_mode, buf); - n = sprintf(p, " %2d ", (uint32_t)statp->st_nlink); - p += n; - n = sprintf(p, "%-8.8s %-8.8s", getuser(statp->st_uid), getgroup(statp->st_gid)); - p += n; - n = sprintf(p, "%8.8s ", edit_uint64(statp->st_size, ec1)); - p += n; - p = encode_time(statp->st_ctime, p); - *p++ = ' '; - *p++ = ' '; - /* Copy file name */ - for (f=fname; *f && (p-buf) < (int)sizeof(buf); ) - *p++ = *f++; - if (type == FT_LNK) { - *p++ = ' '; - *p++ = '-'; - *p++ = '>'; - *p++ = ' '; - /* Copy link name */ - for (f=link; *f && (p-buf) < (int)sizeof(buf); ) - *p++ = *f++; - } - *p++ = '\n'; - *p = 0; - fputs(buf, stdout); + } /* end switch */ + return true; } /* Dummies to replace askdir.c */ -int dir_get_volume_info(JCR *jcr) { 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_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; }