X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fbextract.c;h=e64fe471362946cf814f15d7ff78286580fae83c;hb=0df1b05ab644fac295d2ea6f2e2f1c977fa19a87;hp=99a9438bd7807a993d01d09b0e7618bbf40f496c;hpb=27c6094b93454811a6e966558ec187f8ad5a229c;p=bacula%2Fbacula diff --git a/bacula/src/stored/bextract.c b/bacula/src/stored/bextract.c index 99a9438bd7..e64fe47136 100644 --- a/bacula/src/stored/bextract.c +++ b/bacula/src/stored/bextract.c @@ -8,22 +8,17 @@ * */ /* - Copyright (C) 2000-2005 Kern Sibbald + 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,12 +26,6 @@ #include "stored.h" #include "findlib/find.h" -#if defined(HAVE_CYGWIN) || defined(HAVE_WIN32) -int win32_client = 1; -#else -int win32_client = 0; -#endif - static void do_extract(char *fname); static bool record_cb(DCR *dcr, DEV_RECORD *rec); @@ -63,7 +52,7 @@ 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; @@ -71,9 +60,9 @@ 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, _( +"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" @@ -83,7 +72,7 @@ static void usage() " -p proceed inspite of I/O errors\n" " -v verbose\n" " -V specify Volume names (separated by |)\n" -" -? print this message\n\n"); +" -? print this message\n\n"), BYEAR, VERSION, BDATE); exit(1); } @@ -95,10 +84,16 @@ int main (int argc, char *argv[]) char line[1000]; 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 */ + OSDependentInit(); + ff = init_find_files(); binit(&bfd); @@ -123,9 +118,9 @@ int main (int argc, char *argv[]) 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", + Pmsg2(0, _("Could not open exclude file: %s, ERR=%s\n"), optarg, be.strerror()); exit(1); } @@ -138,9 +133,9 @@ 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", + Pmsg2(0, _("Could not open include file: %s, ERR=%s\n"), optarg, be.strerror()); exit(1); } @@ -175,7 +170,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(); } @@ -196,11 +191,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); @@ -215,20 +210,20 @@ static void do_extract(char *devname) 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", + 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); } free(jcr->where); @@ -247,9 +242,9 @@ static void do_extract(char *devname) release_device(dcr); free_attr(attr); free_jcr(jcr); - term_dev(dev); + dev->term(); - printf("%u files restored.\n", num_files); + printf(_("%u files restored.\n"), num_files); return; } @@ -294,7 +289,7 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec) 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)) { + 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)); @@ -406,7 +401,7 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec) 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"); + Pmsg0(0, _("===Write error===\n")); Emsg2(M_ERROR, 0, _("Write error on %s: %s\n"), attr->ofname, be.strerror()); extract = false; @@ -419,21 +414,28 @@ 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; } #endif break; - case STREAM_MD5_SIGNATURE: - case STREAM_SHA1_SIGNATURE: + 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; @@ -442,7 +444,7 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec) /* 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"); + Emsg0(M_ERROR, 0, _("Logic error output file should be open but is not.\n")); } set_attributes(jcr, attr, &bfd); extract = false; @@ -468,8 +470,9 @@ bool dir_send_job_status(JCR *jcr) {return 1;} bool dir_ask_sysop_to_mount_volume(DCR *dcr) { 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; }