* Version $Id$
*/
/*
- Copyright (C) 2005-2006 Kern Sibbald
+ Bacula® - The Network Backup Solution
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- version 2 as amended with additional clauses defined in the
- file LICENSE in the main source directory.
+ Copyright (C) 2005-2006 Free Software Foundation Europe e.V.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- the file LICENSE for additional details.
+ 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.
- */
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+
+ Bacula® is a registered trademark of John Walker.
+ The licensor of Bacula is the Free Software Foundation Europe
+ (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+ Switzerland, email:ftf@fsfeurope.org.
+*/
#include "bacula.h"
#include "stored.h"
{
char partnumber[20];
- if (archive_name.c_str()[strlen(archive_name.c_str())-1] != '/') {
+ if (!IsPathSeparator(archive_name.c_str()[strlen(archive_name.c_str())-1])) {
pm_strcat(archive_name, "/");
}
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, "
if (dev->can_append() && (dev->part > dev->num_dvd_parts) &&
(dev->part_size == 0)) {
Dmsg0(29, "open_next_part exited immediately (dev->part_size == 0).\n");
- return dev->fd;
+ return dev->fd();
}
dev->close_part(dcr); /* close current part */
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;
}
}
}
dev->set_labeled(); /* all next parts are "labeled" */
- return dev->fd;
+ return dev->fd();
}
/*
/*
* Do an lseek on a DVD handling all the different parts
*/
-off_t lseek_dvd(DCR *dcr, off_t offset, int whence)
+boffset_t lseek_dvd(DCR *dcr, boffset_t offset, int whence)
{
DEVICE *dev = dcr->dev;
- off_t pos;
+ boffset_t pos;
char ed1[50], ed2[50];
- Dmsg5(400, "Enter lseek_dvd fd=%d off=%s w=%d part=%d nparts=%d\n", dev->fd,
+ Dmsg5(400, "Enter lseek_dvd fd=%d off=%s w=%d part=%d nparts=%d\n", dev->fd(),
edit_int64(offset, ed1), whence, dev->part, dev->num_dvd_parts);
switch(whence) {
if ((uint64_t)offset == dev->part_start ||
(uint64_t)offset < dev->part_start+dev->part_size) {
/* We are staying in the current part, just seek */
- if ((pos = lseek(dev->fd, offset-dev->part_start, SEEK_SET)) < 0) {
+#if defined(HAVE_WIN32)
+ pos = _lseeki64(dev->fd(), offset-dev->part_start, SEEK_SET);
+#else
+ pos = lseek(dev->fd(), offset-dev->part_start, SEEK_SET);
+#endif
+ if (pos < 0) {
return pos;
} else {
return pos + dev->part_start;
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(), (off_t)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(), (off_t)0, SEEK_END)) < 0) {
return pos;
} else {
Dmsg1(400, "lseek_dvd SEEK_END returns %s\n",
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;
}
/* Found a file, checking it is empty */
POOL_MEM filename(PM_FNAME);
pm_strcpy(filename, dev->device->mount_point);
- if (filename.c_str()[strlen(filename.c_str())-1] != '/') {
+ if (!IsPathSeparator(filename.c_str()[strlen(filename.c_str())-1])) {
pm_strcat(filename, "/");
}
pm_strcat(filename, result->d_name);
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;
}
projects / bacula / bacula / blobdiff