-/*
- *
- * 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-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.
This program is Free Software; you can redistribute it and/or
modify it under the terms of version two of the GNU General Public
- License as published by the Free Software Foundation plus additions
- that are listed in the file LICENSE.
+ License as published by the Free Software Foundation and included
+ in the file LICENSE.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
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
+ *
+ * Version $Id$
+ */
#include "bacula.h"
#include "stored.h"
free_space_errno = EPIPE;
clear_freespace_ok(); /* no valid freespace */
Mmsg2(errmsg, _("Cannot run free space command. Results=%s ERR=%s\n"),
- results, be.strerror(status));
+ results, be.bstrerror(status));
if (--timeout > 0) {
Dmsg4(40, "Cannot get free space on device %s. free_space=%s, "
}
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;
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;
dev->set_part_spooled(false);
dev->dev_errno = errno;
Mmsg2(dev->errmsg, _("open_next_part can't unlink existing part %s, ERR=%s\n"),
- archive_name.c_str(), be.strerror());
+ archive_name.c_str(), be.bstrerror());
return -1;
}
}
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;
}
* 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",
dcr->VolCatInfo.VolCatBytes = 0;
/* Update catalog */
- if (!dir_update_volume_info(dcr, false)) {
+ if (!dir_update_volume_info(dcr, false, true)) {
return false;
}
berrno be;
dev->dev_errno = errno;
Dmsg3(29, "check_can_write_on_non_blank_dvd: failed to open dir %s (dev=%s), ERR=%s\n",
- dev->device->mount_point, dev->print_name(), be.strerror());
+ dev->device->mount_point, dev->print_name(), be.bstrerror());
return false;
}
berrno be;
dev->dev_errno = errno;
Dmsg2(29, "check_can_write_on_non_blank_dvd: cannot stat file (file=%s), ERR=%s\n",
- filename.c_str(), be.strerror());
+ filename.c_str(), be.bstrerror());
ok = false;
break;
}
berrno be;
dev->dev_errno = errno;
Dmsg3(29, "find_num_dvd_parts: failed to open dir %s (dev=%s), ERR=%s\n",
- dev->device->mount_point, dev->print_name(), be.strerror());
+ dev->device->mount_point, dev->print_name(), be.bstrerror());
goto get_out;
}