Second cut of drive switching during backup

[bacula/bacula] / bacula / src / stored / bextract.c

diff --git a/bacula/src/stored/bextract.c b/bacula/src/stored/bextract.c
index 6d6cba94f95c31ae6fd024310764112c8d02006c..7679da70af7b7756ed05e64a99d896500751c07f 100644 (file)
--- a/bacula/src/stored/bextract.c
+++ b/bacula/src/stored/bextract.c
@@ -1,16 +1,7 @@
-/*
- *
- *  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.
@@ -34,6 +25,15 @@
    (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"
@@ -79,7 +79,8 @@ PROG_COPYRIGHT
 "Usage: bextract <options> <bacula-archive-device-name> <directory-to-store-files>\n"
 "       -b <file>       specify a bootstrap file\n"
 "       -c <file>       specify a configuration file\n"
-"       -d <nn>         set debug level to nn\n"
+"       -d <nn>         set debug level to <nn>\n"
+"       -dt             print timestamp in debug output\n"
 "       -e <file>       exclude list\n"
 "       -i <file>       include list\n"
 "       -p              proceed inspite of I/O errors\n"
@@ -126,9 +127,14 @@ 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 */
@@ -245,7 +251,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 +271,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 +341,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) {
@@ -367,11 +398,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.bstrerror());
-         }
+         store_data(&bfd, wbuf, wsize);
          fileAddr += wsize;
       }
       break;
@@ -416,14 +443,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"));
-            Emsg2(M_ERROR, 0, _("Write error on %s: %s\n"),
-               attr->ofname, be.bstrerror());
-            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,
@@ -476,14 +496,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_update_volume_info(DCR *dcr, bool relabel, bool update_LastWritten) { 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;}
 
 
-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: "),
@@ -501,3 +521,4 @@ bool dir_get_volume_info(DCR *dcr, enum get_vol_info_rw  writing)
    Dmsg2(500, "Vol=%s num_parts=%d\n", dcr->VolCatInfo.VolCatName, dcr->VolCatInfo.VolCatParts);
    return 1;
 }
+