X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fbextract.c;h=b96f7dfd663117bfdc22f0b864edb87427105293;hb=6f6e49e251582d4d68b6e89fe3c5d5c479d8fe91;hp=051be3d1ab3badad5f03e243a7a725bc78dda92f;hpb=b0ef2273c97bc22d704e7fccff0ff8a1d9ab0d65;p=bacula%2Fbacula diff --git a/bacula/src/stored/bextract.c b/bacula/src/stored/bextract.c index 051be3d1ab..b96f7dfd66 100644 --- a/bacula/src/stored/bextract.c +++ b/bacula/src/stored/bextract.c @@ -1,23 +1,14 @@ -/* - * - * Dumb program to extract files from a Bacula backup. - * - * Kern E. Sibbald, MM - * - * Version $Id$ - * - */ /* Bacula® - The Network Backup Solution - Copyright (C) 2000-2006 Free Software Foundation Europe e.V. + Copyright (C) 2000-2008 Free Software Foundation Europe e.V. The main author of Bacula is Kern Sibbald, with contributions from many others, a complete list can be found in the file AUTHORS. This program is Free Software; you can redistribute it and/or modify it under the terms of version two of the GNU General Public - License as published by the Free Software Foundation plus additions - that are listed in the file LICENSE. + License as published by the Free Software Foundation and included + in the file LICENSE. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -29,16 +20,27 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Bacula® is a registered trademark of John Walker. + Bacula® is a registered trademark of Kern Sibbald. The licensor of Bacula is the Free Software Foundation Europe (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, Switzerland, email:ftf@fsfeurope.org. */ +/* + * + * Dumb program to extract files from a Bacula backup. + * + * Kern E. Sibbald, MM + * + * Version $Id$ + * + */ #include "bacula.h" #include "stored.h" #include "findlib/find.h" +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); @@ -64,6 +66,7 @@ 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 = NULL; STORES *me = NULL; /* our Global resource */ @@ -78,8 +81,9 @@ PROG_COPYRIGHT "\nVersion: %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" " -e exclude list\n" " -i include list\n" " -p proceed inspite of I/O errors\n" @@ -126,16 +130,21 @@ 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, "rb")) == NULL) { berrno be; Pmsg2(0, _("Could not open exclude file: %s, ERR=%s\n"), - optarg, be.strerror()); + optarg, be.bstrerror()); exit(1); } while (fgets(line, sizeof(line), fd) != NULL) { @@ -150,7 +159,7 @@ int main (int argc, char *argv[]) if ((fd = fopen(optarg, "rb")) == NULL) { berrno be; Pmsg2(0, _("Could not open include file: %s, ERR=%s\n"), - optarg, be.strerror()); + optarg, be.bstrerror()); exit(1); } while (fgets(line, sizeof(line), fd) != NULL) { @@ -192,7 +201,8 @@ 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); if (!got_inc) { /* If no include file, */ add_fname_to_include_list(ff, 0, "/"); /* include everything */ @@ -237,7 +247,7 @@ static void do_extract(char *devname) if (stat(where, &statp) < 0) { berrno be; Emsg2(M_ERROR_TERM, 0, _("Cannot stat %s. It must exist. ERR=%s\n"), - where, be.strerror()); + where, be.bstrerror()); } if (!S_ISDIR(statp.st_mode)) { Emsg1(M_ERROR_TERM, 0, _("%s must be a directory.\n"), where); @@ -245,7 +255,7 @@ static void do_extract(char *devname) free(jcr->where); jcr->where = bstrdup(where); - attr = new_attr(); + attr = new_attr(jcr); compress_buf = get_memory(compress_buf_size); @@ -265,6 +275,26 @@ static void do_extract(char *devname) 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() */ @@ -315,9 +345,14 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec) return true; } - 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; + return true; + } + extract = false; stat = create_file(jcr, attr, &bfd, REPLACE_ALWAYS); switch (stat) { @@ -358,7 +393,7 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec) 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 { @@ -367,11 +402,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; @@ -398,7 +429,7 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec) 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; } @@ -407,23 +438,23 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec) 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 ((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 = compress_len + (compress_len >> 1); + 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; } 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, @@ -458,7 +489,7 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec) 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")); @@ -476,14 +507,14 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec) /* Dummies to replace askdir.c */ 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 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, int /*mode*/) { DEVICE *dev = dcr->dev; fprintf(stderr, _("Mount Volume \"%s\" on device %s and press return when ready: "),