update version

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

diff --git a/bacula/src/stored/dvd.c b/bacula/src/stored/dvd.c
index 367e6a8a019cdb41dbd359b492d309ee4795ed76..8dd31472063da85f469e652ea70b47b98593ec50 100644 (file)
--- a/bacula/src/stored/dvd.c
+++ b/bacula/src/stored/dvd.c
@@ -1,16 +1,7 @@
-/*
- *
- *   dvd.c  -- Routines specific to DVD devices (and
- *             possibly other removable hard media). 
- *
- *    Nicolas Boichat, MMV
- *
- *   Version $Id$
- */
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2005-2006 Free Software Foundation Europe e.V.
+   Copyright (C) 2005-2010 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.
@@ -29,11 +20,19 @@
    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.
 */
+/*
+ *
+ *   dvd.c  -- Routines specific to DVD devices (and
+ *             possibly other removable hard media). 
+ *
+ *    Nicolas Boichat, MMV
+ *
+ */
 
 #include "bacula.h"
 #include "stored.h"
@@ -69,7 +68,7 @@ static void add_file_and_part_name(DEVICE *dev, POOL_MEM &archive_name)
       pm_strcat(archive_name, "/");
    }
 
-   pm_strcat(archive_name, dev->VolCatInfo.VolCatName);
+   pm_strcat(archive_name, dev->getVolCatName());
    /* if part > 1, append .# to the filename (where # is the part number) */
    if (dev->part > 1) {
       pm_strcat(archive_name, ".");
@@ -254,7 +253,7 @@ bool dvd_write_part(DCR *dcr)
    }
 
    Dmsg2(20, "Write part: cmd=%s timeout=%d\n", ocmd.c_str(), timeout);
-   status = run_program_full_output(ocmd.c_str(), timeout, results.c_str());
+   status = run_program_full_output(ocmd.c_str(), timeout, results.addr());
    Dmsg2(20, "Write part status=%d result=%s\n", status, results.c_str());
 
    dev->blank_dvd = false;
@@ -266,7 +265,7 @@ bool dvd_write_part(DCR *dcr)
       Dmsg1(100, "%s\n", dev->errmsg);
       dev->dev_errno = EIO;
       if (!dev->truncating) {
-         mark_volume_in_error(dcr);
+         dcr->mark_volume_in_error();
       }
       sm_check(__FILE__, __LINE__, false);
       return false;
@@ -308,7 +307,7 @@ int dvd_open_next_part(DCR *dcr)
 
    Dmsg6(29, "Enter: == open_next_part part=%d npart=%d dev=%s vol=%s mode=%d file_addr=%d\n", 
       dev->part, dev->num_dvd_parts, dev->print_name(),
-         dev->VolCatInfo.VolCatName, dev->openmode, dev->file_addr);
+         dev->getVolCatName(), dev->openmode, dev->file_addr);
    if (!dev->is_dvd()) {
       Dmsg1(100, "Device %s is not dvd!!!!\n", dev->print_name()); 
       return -1;
@@ -383,7 +382,7 @@ int dvd_open_next_part(DCR *dcr)
 #endif
    }
 
-   Dmsg2(400, "Call dev->open(vol=%s, mode=%d)\n", dcr->VolCatInfo.VolCatName, 
+   Dmsg2(400, "Call dev->open(vol=%s, mode=%d)\n", dcr->getVolCatName(), 
          dev->openmode);
 
    /* Open next part.  Note, this sets part_size for part opened. */
@@ -405,12 +404,12 @@ static bool dvd_open_first_part(DCR *dcr, int mode)
    DEVICE *dev = dcr->dev;
 
    Dmsg5(29, "Enter: ==== open_first_part dev=%s Vol=%s mode=%d num_dvd_parts=%d append=%d\n", dev->print_name(), 
-         dev->VolCatInfo.VolCatName, dev->openmode, dev->num_dvd_parts, dev->can_append());
+         dev->getVolCatName(), dev->openmode, dev->num_dvd_parts, dev->can_append());
 
 
    dev->close_part(dcr);
 
-   Dmsg2(400, "Call dev->open(vol=%s, mode=%d)\n", dcr->VolCatInfo.VolCatName, 
+   Dmsg2(400, "Call dev->open(vol=%s, mode=%d)\n", dcr->getVolCatName(), 
          mode);
    Dmsg0(100, "Set part=1\n");
    dev->part = 1;
@@ -486,7 +485,7 @@ boffset_t lseek_dvd(DCR *dcr, boffset_t offset, int whence)
       break;
    case SEEK_CUR:
       Dmsg1(400, "lseek_dvd SEEK_CUR to %s\n", edit_int64(offset, ed1));
-      if ((pos = lseek(dev->fd(), (off_t)0, SEEK_CUR)) < 0) {
+      if ((pos = lseek(dev->fd(), 0, SEEK_CUR)) < 0) {
          Dmsg0(400, "Seek error.\n");
          return pos;                  
       }
@@ -518,7 +517,7 @@ boffset_t lseek_dvd(DCR *dcr, boffset_t offset, int whence)
        *  right part number, simply seek
        */
       if (dev->is_part_spooled() && dev->part > dev->num_dvd_parts) {
-         if ((pos = lseek(dev->fd(), (off_t)0, SEEK_END)) < 0) {
+         if ((pos = lseek(dev->fd(), 0, SEEK_END)) < 0) {
             return pos;   
          } else {
             Dmsg1(400, "lseek_dvd SEEK_END returns %s\n", 
@@ -609,7 +608,7 @@ void dvd_remove_empty_part(DCR *dcr)
       status = stat(archive_name.c_str(), &statp);
       if (status == 0 && statp.st_size == 0) {
          Dmsg3(100, "Unlink empty part in close call make_dvd_filename. part=%d num=%d vol=%s\n", 
-                part_save, dev->num_dvd_parts, dev->VolCatInfo.VolCatName);
+                part_save, dev->num_dvd_parts, dev->getVolCatName());
          Dmsg1(100, "unlink(%s)\n", archive_name.c_str());
          unlink(archive_name.c_str());
          if (part_save == dev->part) {
@@ -686,7 +685,7 @@ bool truncate_dvd(DCR *dcr)
    dcr->VolCatInfo.VolCatBytes = 0;
 
    /* Update catalog */
-   if (!dir_update_volume_info(dcr, false)) {
+   if (!dir_update_volume_info(dcr, false, true)) {
       return false;
    }
    
@@ -733,7 +732,7 @@ bool check_can_write_on_non_blank_dvd(DCR *dcr)
          break;
       } else {
          Dmsg2(99, "check_can_write_on_non_blank_dvd: found %s (versus %s)\n", 
-               result->d_name, dev->VolCatInfo.VolCatName);
+               result->d_name, dev->getVolCatName());
          if (strcmp(result->d_name, ".") && strcmp(result->d_name, "..") &&
              strcmp(result->d_name, ".keep")) {
             /* Found a file, checking it is empty */
@@ -784,7 +783,7 @@ int find_num_dvd_parts(DCR *dcr)
       DIR* dp;
       struct dirent *entry, *result;
       int name_max;
-      int len = strlen(dcr->VolCatInfo.VolCatName);
+      int len = strlen(dcr->getVolCatName());
 
       /* Now count the number of parts */
       name_max = pathconf(".", _PC_NAME_MAX);
@@ -802,7 +801,7 @@ int find_num_dvd_parts(DCR *dcr)
       
       entry = (struct dirent *)malloc(sizeof(struct dirent) + name_max + 1000);
 
-      Dmsg1(100, "Looking for Vol=%s\n", dcr->VolCatInfo.VolCatName);
+      Dmsg1(100, "Looking for Vol=%s\n", dcr->getVolCatName());
       for ( ;; ) {
          int flen;
          bool ignore;
@@ -816,7 +815,7 @@ int find_num_dvd_parts(DCR *dcr)
          ignore = true;
          if (flen >= len) {
             result->d_name[len] = 0;
-            if (strcmp(dcr->VolCatInfo.VolCatName, result->d_name) == 0) {
+            if (strcmp(dcr->getVolCatName(), result->d_name) == 0) {
                num_parts++;
                Dmsg1(100, "find_num_dvd_parts: found part: %s\n", result->d_name);
                ignore = false;