Add V: to bextract and bscan

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

diff --git a/bacula/src/stored/bextract.c b/bacula/src/stored/bextract.c
index ba9f4443bc5395a89fe5ceeb04128f1580f230d6..45b1e73a215746b0f759fe19ba916c7ee7b29ca2 100644 (file)
--- a/bacula/src/stored/bextract.c
+++ b/bacula/src/stored/bextract.c
@@ -49,7 +49,6 @@ static FF_PKT *ff = &my_ff;
 static BSR *bsr = NULL;
 static int extract = FALSE;
 static int non_support_data = 0;
-static int non_support_attr = 0;
 static long total = 0;
 static ATTR *attr;
 static char *where;
@@ -99,7 +98,7 @@ int main (int argc, char *argv[])
    init_include_exclude_files(ff);
    binit(&bfd);
 
-   while ((ch = getopt(argc, argv, "b:c:d:e:i:?")) != -1) {
+   while ((ch = getopt(argc, argv, "b:c:d:e:i:V:?")) != -1) {
       switch (ch) {
       case 'b':                    /* bootstrap file */
         bsr = parse_bsr(NULL, optarg);
@@ -257,8 +256,8 @@ static void record_cb(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec)
         if (!is_bopen(&bfd)) {
             Emsg0(M_ERROR, 0, _("Logic error output file should be open but is not.\n"));
         }
-        extract = FALSE;
         set_attributes(jcr, attr, &bfd);
+        extract = FALSE;
       }
 
       if (!unpack_attributes_record(jcr, rec->Stream, rec->data, attr)) {
@@ -271,9 +270,17 @@ static void record_cb(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec)
       }
         
       if (file_is_included(ff, attr->fname) && !file_is_excluded(ff, attr->fname)) {
-        uint32_t LinkFI;
 
-        decode_stat(attr->attr, &attr->statp, &LinkFI);
+        attr->data_stream = decode_stat(attr->attr, &attr->statp, &attr->LinkFI);
+        if (!is_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;
+        }
+
 
         build_attr_output_fnames(jcr, attr);
 
@@ -297,25 +304,13 @@ static void record_cb(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec)
            break;
         }  
       }
-
-   /* Windows Backup data stream */
-   case STREAM_WIN32_DATA:  
-      if (!is_win32_backup()) {
-        if (!non_support_data) {
-            Jmsg(jcr, M_ERROR, 0, _("Win32 backup data not supported on this Client.\n"));
-        }
-        extract = FALSE;
-        non_support_data++;
-        return;
-      }
-      goto extract_data;
-   
+      break;
 
    /* Data stream and extracting */
    case STREAM_FILE_DATA:
    case STREAM_SPARSE_DATA:
+   case STREAM_WIN32_DATA:  
 
-extract_data:
       if (extract) {
         if (rec->Stream == STREAM_SPARSE_DATA) {
            ser_declare;
@@ -343,30 +338,21 @@ extract_data:
         }
         fileAddr += wsize;
       }
-
-   /* Windows Backup GZIP data stream */
-   case STREAM_WIN32_GZIP_DATA:  
-      if (!is_win32_backup()) {
-        if (!non_support_attr) {
-            Jmsg(jcr, M_ERROR, 0, _("Win32 GZIP backup data not supported on this Client.\n"));
-        }
-        extract = FALSE;
-        non_support_attr++;
-        return;
-      }
-      /* Fall through desired */
+      break;
 
    /* 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;
+        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);
@@ -374,8 +360,10 @@ extract_data:
            if (fileAddr != faddr) {
               fileAddr = faddr;
               if (blseek(&bfd, (off_t)fileAddr, SEEK_SET) < 0) {
-                  Emsg2(M_ERROR, 0, _("Seek error on %s: %s\n"), 
-                    attr->ofname, strerror(errno));
+                  Emsg3(M_ERROR, 0, _("Seek to %s error on %s: ERR=%s\n"), 
+                    edit_uint64(fileAddr, ec1), attr->ofname, berror(&bfd));
+                 extract = FALSE;
+                 return;
               }
            }
         } else {
@@ -385,14 +373,18 @@ extract_data:
         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);
+            Emsg1(M_ERROR, 0, _("Uncompression error. ERR=%d\n"), stat);
+           extract = FALSE;
+           return;
         }
 
          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) {
             Pmsg0(0, "===Write error===\n");
-            Emsg2(M_ERROR_TERM, 0, _("Write error on %s: %s\n"), 
+            Emsg2(M_ERROR, 0, _("Write error on %s: %s\n"), 
               attr->ofname, strerror(errno));
+           extract = FALSE;
+           return;
         }
         total += compress_len;
         fileAddr += compress_len;
@@ -406,6 +398,7 @@ extract_data:
         return;
       }
 #endif
+      break;
 
    case STREAM_MD5_SIGNATURE:
    case STREAM_SHA1_SIGNATURE:
@@ -425,8 +418,8 @@ extract_data:
         if (!is_bopen(&bfd)) {
             Emsg0(M_ERROR, 0, "Logic error output file should be open but is not.\n");
         }
-        extract = FALSE;
         set_attributes(jcr, attr, &bfd);
+        extract = FALSE;
       }
       Jmsg(jcr, M_ERROR, 0, _("Unknown stream=%d ignored. This shouldn't happen!\n"), 
         rec->Stream);
@@ -439,7 +432,7 @@ extract_data:
 
 
 /* Dummies to replace askdir.c */
-int    dir_get_volume_info(JCR *jcr, int writing) { return 1;}
+int    dir_get_volume_info(JCR *jcr, enum get_vol_info_rw  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; }