]> git.sur5r.net Git - bacula/bacula/blobdiff - bacula/src/stored/bextract.c
Use rentrant mysql lib, eliminate race in sql_list, Win32 streams, misc see kes-1.31
[bacula/bacula] / bacula / src / stored / bextract.c
index 7df654bc1ec08478d13fb8b9b5b03bc69a11473b..ad2e7ad65ae759cb17229c07efd501763918071c 100644 (file)
@@ -38,30 +38,52 @@ int win32_client = 0;
 #endif
 
 
-static void do_extract(char *fname, char *prefix);
-static void get_session_record(DEVICE *dev, DEV_RECORD *rec, SESSION_LABEL *sessrec);
+static void do_extract(char *fname);
+static void record_cb(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec);
 
 static DEVICE *dev = NULL;
-static int ofd = -1;
-
+static BFILE bfd;
 static JCR *jcr;
 static FF_PKT my_ff;
 static FF_PKT *ff = &my_ff;
-
 static BSR *bsr = NULL;
+static int extract = FALSE;
+static long record_file_index;
+static long total = 0;
+static POOLMEM *fname;                   /* original file name */
+static POOLMEM *ofile;                   /* output name with prefix */
+static POOLMEM *lname;                   /* link name */
+static POOLMEM *attribsEx;               /* extended attributes (Win32) */
+static char *where;
+static int wherelen;                     /* prefix length */
+static uint32_t num_files = 0;
+static struct stat statp;
+static uint32_t compress_buf_size = 70000;
+static POOLMEM *compress_buf;
+static int type;
+static int stream;
+static int prog_name_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;
 
-static DEV_RECORD *rec;
-static DEV_BLOCK *block;
 
 static void usage()
 {
    fprintf(stderr,
-"\nVersion: " VERSION " (" DATE ")\n\n"
+"\nVersion: " VERSION " (" BDATE ")\n\n"
 "Usage: bextract [-d debug_level] <bacula-archive> <directory-to-store-files>\n"
 "       -b <file>       specify a bootstrap file\n"
+"       -c <file>       specify a configuration file\n"
 "       -dnn            set debug level to nn\n"
 "       -e <file>       exclude list\n"
 "       -i <file>       include list\n"
+"       -V              specify Volume names (separated by |)\n"
 "       -?              print this message\n\n");
    exit(1);
 }
@@ -74,19 +96,28 @@ int main (int argc, char *argv[])
    char line[1000];
    int got_inc = FALSE;
 
+   working_directory = "/tmp";
    my_name_is(argc, argv, "bextract");
    init_msg(NULL, NULL);             /* setup message handler */
 
    memset(ff, 0, sizeof(FF_PKT));
    init_include_exclude_files(ff);
+   binit(&bfd);
 
-   while ((ch = getopt(argc, argv, "b:d:e:i:?")) != -1) {
+   while ((ch = getopt(argc, argv, "b:c:d:e:i:?")) != -1) {
       switch (ch) {
          case 'b':                    /* bootstrap file */
            bsr = parse_bsr(NULL, optarg);
 //         dump_bsr(bsr);
            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)
@@ -122,6 +153,10 @@ int main (int argc, char *argv[])
            got_inc = TRUE;
            break;
 
+         case 'V':                    /* Volume name */
+           VolumeName = optarg;
+           break;
+
          case '?':
         default:
            usage();
@@ -135,12 +170,19 @@ int main (int argc, char *argv[])
       Pmsg0(0, "Wrong number of arguments: \n");
       usage();
    }
+
+   if (configfile == NULL) {
+      configfile = bstrdup(CONFIG_FILE);
+   }
+
+   parse_config(configfile);
+
    if (!got_inc) {                           /* If no include file, */
       add_fname_to_include_list(ff, 0, "/");  /*   include everything */
    }
 
-
-   do_extract(argv[0], argv[1]);
+   where = argv[1];
+   do_extract(argv[0]);
 
    if (bsr) {
       free_bsr(bsr);
@@ -148,47 +190,11 @@ int main (int argc, char *argv[])
    return 0;
 }
 
-/*
- * Device got an error, attempt to analyse it
- */
-static void display_error_status()
+static void do_extract(char *devname)
 {
-   uint32_t status;
-
-   Emsg0(M_ERROR, 0, dev->errmsg);
-   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
-      Emsg2(M_ERROR_TERM, 0, "Read error on Record Header %s: %s\n", dev_name(dev), strerror(errno));
-}
-  
 
-static void do_extract(char *devname, char *where)
-{
-   struct stat statp;
-   int extract = FALSE;
-   int type;
-   long record_file_index;
-   long total = 0;
-   POOLMEM *fname;                   /* original file name */
-   POOLMEM *ofile;                   /* output name with prefix */
-   POOLMEM *lname;                   /* link name */
-   int wherelen;                     /* prefix length */
-   SESSION_LABEL sessrec;
-   uint32_t num_files = 0;
-
-   jcr = setup_jcr("bextract", devname, bsr);
-   dev = setup_to_read_device(jcr);
+   jcr = setup_jcr("bextract", devname, bsr, VolumeName);
+   dev = setup_to_access_device(jcr, 1);    /* acquire for read */
    if (!dev) {
       exit(1);
    }
@@ -206,291 +212,287 @@ static void do_extract(char *devname, char *where)
    fname = get_pool_memory(PM_FNAME);
    ofile = get_pool_memory(PM_FNAME);
    lname = get_pool_memory(PM_FNAME);
+   attribsEx = get_pool_memory(PM_FNAME);
 
-   block = new_block(dev);
+   compress_buf = get_memory(compress_buf_size);
 
-   rec = new_record();
-   free_pool_memory(rec->data);
-   rec->data = get_memory(70000);     /* get a big block for reading */
+   read_records(jcr, dev, 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, fname, ofile, lname, type, stream, &statp,
+                    attribsEx, &bfd);
+   }
+   release_device(jcr, dev);
 
-   uint32_t compress_buf_size = 70000;
-   POOLMEM *compress_buf = get_memory(compress_buf_size);
+   free_pool_memory(fname);
+   free_pool_memory(ofile);
+   free_pool_memory(lname);
+   free_pool_memory(compress_buf);
+   term_dev(dev);
+   free_jcr(jcr);
+   printf("%u files restored.\n", num_files);
+   return;
+}
 
-   for ( ;; ) {
-      if (!read_block_from_device(dev, block)) {
-         Dmsg1(500, "Main read record failed. rem=%d\n", rec->remainder);
-        if (dev->state & ST_EOT) {
-           DEV_RECORD *record;
-           if (!mount_next_read_volume(jcr, dev, block)) {
-              break;
-           }
-           record = new_record();
-           read_block_from_device(dev, block);
-           read_record_from_block(block, record);
-           get_session_record(dev, record, &sessrec);
-           free_record(record);
-           goto next_record;
-        }
-        if (dev->state & ST_EOF) {
-           continue;                 /* try again */
-        }
-        if (dev->state & ST_SHORT) {
-           continue;
+/*
+ * Called here for each record from read_records()
+ */
+static void record_cb(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec)
+{
+   int stat;
+
+   if (rec->FileIndex < 0) {
+      return;                         /* we don't want labels */
+   }
+
+   /* File Attributes stream */
+   if (rec->Stream == STREAM_UNIX_ATTRIBUTES || rec->Stream == STREAM_WIN32_ATTRIBUTES) {
+      char *ap, *lp, *fp, *apex;
+
+      stream = rec->Stream;
+
+      /* 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");
         }
-        display_error_status();
+        extract = FALSE;
+        set_attributes(jcr, fname, ofile, lname, type, stream, &statp,
+                       attribsEx, &bfd);
       }
 
-next_record:
-      for (rec->state=0; !is_block_empty(rec); ) {
-        if (!read_record_from_block(block, rec)) {
-           break;
-        }
+      if (sizeof_pool_memory(fname) < rec->data_len) {
+        fname = realloc_pool_memory(fname, rec->data_len + 1);
+      }
+      if (sizeof_pool_memory(ofile) < rec->data_len + wherelen + 1) {
+        ofile = realloc_pool_memory(ofile, rec->data_len + wherelen + 1);
+      }
+      if (sizeof_pool_memory(lname) < rec->data_len) {
+        lname = realloc_pool_memory(lname, rec->data_len + wherelen + 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)
+       *    Extended Attributes (Win32) 
+       *
+       */
+      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 */
 
-        if (rec->FileIndex == EOM_LABEL) { /* end of tape? */
-            Dmsg0(40, "Get EOM LABEL\n");
-           rec->remainder = 0;
-           break;                         /* yes, get out */
+      /* Skip to Link name */
+      if (type == FT_LNK || type == FT_LNKSAVED) {
+        lp = ap;
+        while (*lp++ != 0) {
+           ;
         }
+      } else {
+         lp = "";
+      }
 
-        /* Some sort of label? */ 
-        if (rec->FileIndex < 0) {
-           get_session_record(dev, rec, &sessrec);
-           continue;
-        } /* end if label record */
-
-        /* Is this the file we want? */
-        if (bsr && !match_bsr(bsr, rec, &dev->VolHdr, &sessrec)) {
-           rec->remainder = 0;
-           continue;
+      if (rec->Stream == STREAM_WIN32_ATTRIBUTES) {
+        apex = ap;                   /* start at attributes */
+        while (*apex++ != 0) {       /* skip attributes */
+           ;
         }
-        if (is_partial_record(rec)) {
-           break;
+        while (*apex++ != 0) {      /* skip link name */
+           ;
         }
+        pm_strcpy(&attribsEx, apex);  /* make a copy of Extended attributes */
+      } else {
+        *attribsEx = 0;              /* no extended attributes */
+      }
 
-        /* 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) < rec->data_len + wherelen + 1) {
-              ofile = realloc_pool_memory(ofile, rec->data_len + wherelen + 1);
+        
+      if (file_is_included(ff, fname) && !file_is_excluded(ff, fname)) {
+        uint32_t LinkFI;
+
+        decode_stat(ap, &statp, &LinkFI);
+        /*
+         * 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 -- we simply strip the drive: from
+         *   every filename if a prefix is supplied.
+         */
+        if (where[0] == 0) {
+           strcpy(ofile, fname);
+           strcpy(lname, lp);
+        } else {
+           char *fn;
+           strcpy(ofile, where);
+            if (win32_client && fname[1] == ':') {
+              fn = fname+2;          /* skip over drive: */
+           } else {
+              fn = fname;            /* take whole name */
            }
-           if (sizeof_pool_memory(lname) < rec->data_len) {
-              lname = realloc_pool_memory(lname, rec->data_len + wherelen + 1);
+           /* Ensure where is terminated with a slash */
+            if (where[wherelen-1] != '/' && fn[0] != '/') {
+               strcat(ofile, "/");
            }
-           *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)
-            *
+           strcat(ofile, fn);        /* copy rest of name */
+           /* Fixup link name for hard links, but not for
+            * soft links 
             */
-            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 || type == FT_LNKSAVED) {
-              lp = ap;
-              while (*lp++ != 0) {
-                 ;
-              }
-           } else {
-               lp = "";
-           }
-
-              
-           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.
-               */
-              if (where[0] == 0 && win32_client) {
-                 strcpy(ofile, fname);
-                 strcpy(lname, lp);
+           if (type == FT_LNKSAVED) {
+               if (lp[0] == '/') {      /* if absolute path */
+                 strcpy(lname, where);
+              }       
+               if (win32_client && lp[1] == ':') {
+                 strcat(lname, lp+2); /* copy rest of name */
               } else {
-                 strcpy(ofile, where);
-                  if (fname[1] == ':') {
-                     fname[1] = '/';
-                    strcat(ofile, fname);
-                     fname[1] = ':';
-                 } else {
-                    strcat(ofile, fname);
-                 }
-                 /* Fixup link name */
-                 if (type == FT_LNK || type == FT_LNKSAVED) {
-                     if (lp[0] == '/') {      /* if absolute path */
-                       strcpy(lname, where);
-                    }       
-                     /* ***FIXME**** we shouldn't have links on Windoz */
-                     if (lp[1] == ':') {
-                        lp[1] = '/';
-                       strcat(lname, lp);
-                        lp[1] = ':';
-                    } else {
-                       strcat(lname, lp);
-                    }
-                 }
+                 strcat(lname, lp);   /* On Unix systems we take everything */
               }
+           }
+        }
 
-   /*          Pmsg1(000, "Restoring: %s\n", ofile); */
+         /*          Pmsg1(000, "Restoring: %s\n", ofile); */
 
-              extract = create_file(jcr, fname, ofile, lname, type, &statp, &ofd);
-              num_files++;
+        extract = FALSE;
+        stat = create_file(jcr, fname, ofile, lname, type, stream,
+                           &statp, attribsEx, &bfd, REPLACE_ALWAYS);   
+        switch (stat) {
+        case CF_ERROR:
+        case CF_SKIP:
+           break;
+        case CF_EXTRACT:
+           extract = TRUE;
+           print_ls_output(ofile, lname, type, &statp);   
+           num_files++;
+           fileAddr = 0;
+           break;
+        case CF_CREATED:
+           set_attributes(jcr, fname, ofile, lname, type, stream, &statp,
+                          attribsEx, &bfd);
+           print_ls_output(ofile, lname, type, &statp);   
+           num_files++;
+           fileAddr = 0;
+           break;
+        }  
+      }
 
-              if (extract) {
-                  print_ls_output(ofile, lname, type, &statp);   
+   /* Data stream and extracting */
+   } else if (rec->Stream == STREAM_FILE_DATA || rec->Stream == STREAM_SPARSE_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) {
+                  Emsg2(M_ERROR_TERM, 0, _("Seek error on %s: %s\n"), ofile, strerror(errno));
               }
            }
+        } 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) {
+            Emsg2(M_ERROR_TERM, 0, _("Write error on %s: %s\n"), ofile, strerror(errno));
+        }
+        fileAddr += wsize;
+      }
 
-        /* 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) {
+   } else if (rec->Stream == STREAM_GZIP_DATA || rec->Stream == STREAM_SPARSE_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));
+      if (extract) {
+        uLongf compress_len;
+        int stat;
+
+        if (rec->Stream == STREAM_SPARSE_GZIP_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) {
+                  Emsg2(M_ERROR, 0, _("Seek error on %s: %s\n"), ofile, strerror(errno));
               }
-              total += compress_len;
-               Dmsg2(100, "Compress len=%d uncompressed=%d\n", rec->data_len,
-                 compress_len);
            }
+        } 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_TERM, 0, _("Uncompression error. ERR=%d\n"), stat);
+        }
+
+         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"), ofile, strerror(errno));
+        }
+        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");
+      }
 #endif
 
 
-        /* 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 extracting, wierd stream (not 1 or 2), close output file anyway */
+   } else if (extract) {
+      if (!is_bopen(&bfd)) {
+         Emsg0(M_ERROR, 0, "Logic error output file should be open but is not.\n");
       }
+      extract = FALSE;
+      set_attributes(jcr, fname, ofile, lname, type, stream, &statp,
+                    attribsEx, &bfd);
+   } else if (rec->Stream == STREAM_PROGRAM_NAMES || rec->Stream == STREAM_PROGRAM_DATA) {
+      if (!prog_name_msg) {
+         Pmsg0(000, "Got Program Name or Data Stream. Ignored.\n");
+        prog_name_msg = 1;
+      }
+   } else if (!(rec->Stream == STREAM_MD5_SIGNATURE ||
+               rec->Stream == STREAM_SHA1_SIGNATURE)) {
+      Pmsg2(0, "None of above!!! stream=%d data=%s\n", rec->Stream, rec->data);
    }
+}
 
 
-   /* 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);
-   free_record(rec);
-   free_jcr(jcr);
-   printf("%u files restored.\n", num_files);
-   return;
-}
 
-static void get_session_record(DEVICE *dev, DEV_RECORD *rec, SESSION_LABEL *sessrec)
-{
-   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;
-   }
-   Dmsg5(10, "%s Record: VolSessionId=%d VolSessionTime=%d JobId=%d DataLen=%d\n",
-        rtype, rec->VolSessionId, rec->VolSessionTime, rec->Stream, rec->data_len);
-}
 
 /* Dummies to replace askdir.c */
-int    dir_get_volume_info(JCR *jcr) { return 1;}
+int    dir_get_volume_info(JCR *jcr, int 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; }