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 ammended with additional clauses defined in the
+ version 2 as amended with additional clauses defined in the
file LICENSE in the main source directory.
This program is distributed in the hope that it will be useful,
#include "stored.h"
/* Forward referenced functions */
-static char *edit_device_codes_dev(DEVICE *dev, char *omsg, const char *imsg);
+static void edit_device_codes_dev(DEVICE *dev, POOL_MEM &omsg, const char *imsg);
static bool do_mount_dev(DEVICE* dev, int mount, int dotimeout);
-static int dvd_write_part(DEVICE *dev);
+static void add_file_and_part_name(DEVICE *dev, POOL_MEM &archive_name);
/*
* Write the current volume/part filename to archive_name.
*/
-void make_dvd_filename(DEVICE *dev, POOL_MEM &archive_name)
+void make_mounted_dvd_filename(DEVICE *dev, POOL_MEM &archive_name)
{
- char partnumber[20];
-
- /*
- * If we try to open the last part, just open it from disk,
- * otherwise, open it from the spooling directory.
- */
- Dmsg2(100, "DVD part=%d num_parts=%d\n", dev->part, dev->num_parts);
- if (dev->part < dev->num_parts) {
- Dmsg1(100, "Arch = mount point: %s\n", dev->device->mount_point);
- pm_strcpy(archive_name, dev->device->mount_point);
+ pm_strcpy(archive_name, dev->device->mount_point);
+ add_file_and_part_name(dev, archive_name);
+ dev->set_part_spooled(false);
+}
+
+void make_spooled_dvd_filename(DEVICE *dev, POOL_MEM &archive_name)
+{
+ /* Use the working directory if spool directory is not defined */
+ if (dev->device->spool_directory) {
+ pm_strcpy(archive_name, dev->device->spool_directory);
} else {
- /* Use the working directory if spool directory is not defined */
- if (dev->device->spool_directory) {
- pm_strcpy(archive_name, dev->device->spool_directory);
- } else {
- pm_strcpy(archive_name, working_directory);
- }
+ pm_strcpy(archive_name, working_directory);
}
-
+ add_file_and_part_name(dev, archive_name);
+ dev->set_part_spooled(true);
+}
+
+static void add_file_and_part_name(DEVICE *dev, POOL_MEM &archive_name)
+{
+ char partnumber[20];
if (archive_name.c_str()[strlen(archive_name.c_str())-1] != '/') {
pm_strcat(archive_name, "/");
}
pm_strcat(archive_name, dev->VolCatInfo.VolCatName);
- /* if part != 0, append .# to the filename (where # is the part number) */
- if (dev->part != 0) {
+ /* if part > 1, append .# to the filename (where # is the part number) */
+ if (dev->part > 1) {
pm_strcat(archive_name, ".");
bsnprintf(partnumber, sizeof(partnumber), "%d", dev->part);
pm_strcat(archive_name, partnumber);
static bool do_mount_dev(DEVICE* dev, int mount, int dotimeout)
{
POOL_MEM ocmd(PM_FNAME);
- POOLMEM* results;
- char* icmd;
+ POOLMEM *results;
+ char *icmd;
int status, timeout;
+ sm_check(__FILE__, __LINE__, false);
if (mount) {
if (dev->is_mounted()) {
- goto get_out;
+ Dmsg0(200, "======= DVD mount=1\n");
+ return true;
}
icmd = dev->device->mount_command;
} else {
if (!dev->is_mounted()) {
- goto get_out;
+ Dmsg0(200, "======= DVD mount=0\n");
+ return true;
}
icmd = dev->device->unmount_command;
}
- edit_device_codes_dev(dev, ocmd.c_str(), icmd);
+ edit_device_codes_dev(dev, ocmd, icmd);
Dmsg2(200, "do_mount_dev: cmd=%s mounted=%d\n", ocmd.c_str(), !!dev->is_mounted());
} else {
timeout = 0;
}
- results = get_pool_memory(PM_MESSAGE);
+ results = get_memory(2000);
+ results[0] = 0;
/* If busy retry each second */
while ((status = run_program_full_output(ocmd.c_str(),
dev->max_open_wait/2, results)) != 0) {
+ if (fnmatch("*is already mounted on", results, 0) == 0) {
+ break;
+ }
if (timeout-- > 0) {
- Dmsg2(400, "Device %s cannot be (un)mounted. Retrying... ERR=%s\n", dev->dev_name, results);
/* Sometimes the device cannot be mounted because it is already mounted.
* Try to unmount it, then remount it */
if (mount) {
- Dmsg1(400, "Trying to unmount the device %s...\n", dev->dev_name);
+ Dmsg1(400, "Trying to unmount the device %s...\n", dev->print_name());
do_mount_dev(dev, 0, 0);
}
bmicrosleep(1, 0);
Dmsg2(40, "Device %s cannot be mounted. ERR=%s\n", dev->print_name(), results);
Mmsg(dev->errmsg, "Device %s cannot be mounted. ERR=%s\n",
dev->print_name(), results);
- free_pool_memory(results);
- return false;
- }
-
- dev->set_mounted(mount); /* set/clear mounted flag */
- free_pool_memory(results);
-
-get_out:
- Dmsg1(29, "Exit do_mount_dev: mounted=%d\n", !!dev->is_mounted());
- return true;
-}
-
-/* Only for devices that require a mount -- currently DVDs only
- *
- * Try to find the Volume name of the loaded device.
- *
- * Returns true if read_dev_volume_label can now read the label,
- * NOTE!!! at this point the device may not be
- * opened.
- * Maybe it should open the first part. ***FIXME***
- *
- * false if an error occured, and read_dev_volume_label
- * must abort with an IO_ERROR.
- *
- * To find the Volume name, it lists all the files on the DVD,
- * and searches for a file which has a minimum size (500 bytes).
- * If this file has a numeric extension, like part files, try to
- * open the file which has no extension (e.g. the first part
- * file).
- *
- * So, if the DVD does not contains a Bacula volume, a random file is opened,
- * and no valid label could be read from this file.
- *
- * It is useful, so the operator can be told that a wrong volume is mounted, with
- * the label name of the current volume. We can also check that the currently
- * mounted disk is writable. (See also read_dev_volume_label_guess in label.c).
-
- If we are writing, then there is no need to guess. We should just
- check that the Volume does not already exist.
-
- If we are reading, I don't see the reason to guess since we
- know what Volume we want. The file either exists or does not
- exist.
-
- *
- */
-#ifdef xxx
-bool can_open_mounted_dev(DEVICE *dev)
-{
- Dmsg1(29, "Enter: dev=%s\n", dev->dev_name);
- POOL_MEM guessedname(PM_FNAME);
- DIR* dp;
- struct dirent *entry, *result;
- struct stat statp;
- int index;
- int name_max;
-
- if (!dev->is_dvd()) {
- Dmsg1(100, "device does not require mount, returning 0. dev=%s\n", dev->dev_name);
- return true;
- }
-
-#ifndef HAVE_DIRENT_H
- Dmsg0(29, "readdir not available, cannot guess volume name\n");
- return true;
-#endif
-
- update_free_space_dev(dev);
-
- if (mount_dev(dev, 1) < 0) {
- /* If the device cannot be mounted, check if it is writable */
- if (dev->have_media()) {
- Dmsg1(100, "device cannot be mounted, but it seems to be writable, returning 0. dev=%s\n", dev->dev_name);
- return true;
- } else {
- Dmsg1(100, "device cannot be mounted, and is not writable, returning -1. dev=%s\n", dev->dev_name);
- return false;
- }
- }
-
- name_max = pathconf(".", _PC_NAME_MAX);
- if (name_max < 1024) {
- name_max = 1024;
- }
-
- if (!(dp = opendir(dev->device->mount_point))) {
- berrno be;
- dev->dev_errno = errno;
- Dmsg3(29, "failed to open dir %s (dev=%s), ERR=%s\n", dev->device->mount_point, dev->dev_name, be.strerror());
- return false;
- }
-
- entry = (struct dirent *)malloc(sizeof(struct dirent) + name_max + 100);
- while (1) {
- if ((readdir_r(dp, entry, &result) != 0) || (result == NULL)) {
- dev->dev_errno = ENOENT;
- Dmsg2(29, "failed to find suitable file in dir %s (dev=%s)\n", dev->device->mount_point, dev->dev_name);
- closedir(dp);
- free(entry);
- return false;
- }
-
- ASSERT(name_max+1 > (int)sizeof(struct dirent) + (int)NAMELEN(entry));
-
- if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) {
- continue;
- }
+ /*
+ * Now, just to be sure it is not mounted, try to read the
+ * filesystem.
+ */
+ DIR* dp;
+ struct dirent *entry, *result;
+ int name_max;
+ int count = 0;
- pm_strcpy(guessedname, dev->device->mount_point);
- if (guessedname.c_str()[strlen(guessedname.c_str())-1] != '/') {
- pm_strcat(guessedname, "/");
+ name_max = pathconf(".", _PC_NAME_MAX);
+ if (name_max < 1024) {
+ name_max = 1024;
}
- pm_strcat(guessedname, entry->d_name);
-
- if (stat(guessedname.c_str(), &statp) < 0) {
+
+ if (!(dp = opendir(dev->device->mount_point))) {
berrno be;
- Dmsg3(29, "failed to stat %s (dev=%s), ERR=%s\n",
- guessedname.c_str(), dev->dev_name, be.strerror());
- continue;
- }
-
- if (!S_ISREG(statp.st_mode) || (statp.st_size < 500)) {
- Dmsg2(100, "%s is not a regular file, or less than 500 bytes (dev=%s)\n",
- guessedname.c_str(), dev->dev_name);
- continue;
+ dev->dev_errno = errno;
+ Dmsg3(29, "open_mounted_dev: failed to open dir %s (dev=%s), ERR=%s\n",
+ dev->device->mount_point, dev->print_name(), be.strerror());
+ goto get_out;
}
- /* Ok, we found a good file, remove the part extension if possible. */
- for (index = strlen(guessedname.c_str())-1; index >= 0; index--) {
- if ((guessedname.c_str()[index] == '/') ||
- (guessedname.c_str()[index] < '0') ||
- (guessedname.c_str()[index] > '9')) {
- break;
- }
- if (guessedname.c_str()[index] == '.') {
- guessedname.c_str()[index] = '\0';
+ entry = (struct dirent *)malloc(sizeof(struct dirent) + name_max + 1000);
+ while (1) {
+ if ((readdir_r(dp, entry, &result) != 0) || (result == NULL)) {
+ dev->dev_errno = ENOENT;
+ Dmsg2(29, "open_mounted_dev: failed to find suitable file in dir %s (dev=%s)\n",
+ dev->device->mount_point, dev->print_name());
break;
}
+ count++;
}
-
- if ((stat(guessedname.c_str(), &statp) < 0) || (statp.st_size < 500)) {
- /* The file with extension truncated does not exists or is too small, so use it with its extension. */
- berrno be;
- Dmsg3(100, "failed to stat %s (dev=%s), using the file with its extension, ERR=%s\n",
- guessedname.c_str(), dev->dev_name, be.strerror());
- pm_strcpy(guessedname, dev->device->mount_point);
- if (guessedname.c_str()[strlen(guessedname.c_str())-1] != '/') {
- pm_strcat(guessedname, "/");
- }
- pm_strcat(guessedname, entry->d_name);
- continue;
- }
- break;
- }
- closedir(dp);
- free(entry);
-
- if (dev->fd >= 0) {
- close(dev->fd);
- }
-
- Dmsg1(100, "open(%s) read-only\n", guessedname.c_str());
- if ((dev->fd = open(guessedname.c_str(), O_RDONLY | O_BINARY)) < 0) {
- berrno be;
- dev->dev_errno = errno;
- Dmsg3(29, "failed to open %s (dev=%s), ERR=%s\n",
- guessedname.c_str(), dev->dev_name, be.strerror());
- Dmsg0(100, "Call open_first_part\n");
- if (open_first_part(dev, OPEN_READ_ONLY) < 0) {
- berrno be;
- dev->dev_errno = errno;
- Mmsg1(&dev->errmsg, _("Could not open_first_part, ERR=%s\n"), be.strerror());
- Emsg0(M_FATAL, 0, dev->errmsg);
+ free(entry);
+ closedir(dp);
+ if (count > 2) {
+ mount = 1; /* If we got more than . and .. */
+ break; /* there must be something mounted */
}
+get_out:
+ dev->set_mounted(false);
+ sm_check(__FILE__, __LINE__, false);
+ free_pool_memory(results);
+ Dmsg0(200, "============ DVD mount=0\n");
return false;
}
- dev->part_start = 0;
- dev->part_size = statp.st_size;
- dev->part = 0;
- dev->set_opened();
- dev->use_count = 1;
- Dmsg2(29, "Exit: %s opened (dev=%s)\n", guessedname.c_str(), dev->dev_name);
+ dev->set_mounted(mount); /* set/clear mounted flag */
+ free_pool_memory(results);
+ update_free_space_dev(dev);
+ Dmsg1(200, "============ DVD mount=%d\n", mount);
return true;
}
-#endif
-
/* Update the free space on the device */
void update_free_space_dev(DEVICE* dev)
long long int free;
char ed1[50];
+ sm_check(__FILE__, __LINE__, false);
icmd = dev->device->free_space_command;
if (!icmd) {
return;
}
- edit_device_codes_dev(dev, ocmd.c_str(), icmd);
+ edit_device_codes_dev(dev, ocmd, icmd);
Dmsg1(29, "update_free_space_dev: cmd=%s\n", ocmd.c_str());
if (--timeout > 0) {
Dmsg4(40, "Cannot get free space on device %s. free_space=%s, "
- "free_space_errno=%d ERR=%s\n", dev->dev_name,
+ "free_space_errno=%d ERR=%s\n", dev->print_name(),
edit_uint64(dev->free_space, ed1), dev->free_space_errno,
dev->errmsg);
bmicrosleep(1, 0);
dev->dev_errno = -dev->free_space_errno;
Dmsg4(40, "Cannot get free space on device %s. free_space=%s, "
"free_space_errno=%d ERR=%s\n",
- dev->dev_name, edit_uint64(dev->free_space, ed1),
+ dev->print_name(), edit_uint64(dev->free_space, ed1),
dev->free_space_errno, dev->errmsg);
break;
}
free_pool_memory(results);
Dmsg3(29, "update_free_space_dev: free_space=%s, free_space_errno=%d have_media=%d\n",
edit_uint64(dev->free_space, ed1), dev->free_space_errno, dev->have_media());
+ sm_check(__FILE__, __LINE__, false);
return;
}
-static int dvd_write_part(DEVICE *dev)
+/*
+ * Write a part (Vol, Vol.1, ...) from the spool to the DVD
+ */
+static bool dvd_write_part(DCR *dcr)
{
- Dmsg1(29, "dvd_write_part: device is %s\n", dev->dev_name);
-
- if (unmount_dev(dev, 1) < 0) {
- Dmsg0(29, "dvd_write_part: unable to unmount the device\n");
- }
-
+ DEVICE *dev = dcr->dev;
POOL_MEM ocmd(PM_FNAME);
- POOLMEM *results;
- results = get_pool_memory(PM_MESSAGE);
char* icmd;
int status;
int timeout;
+ char ed1[50];
+ sm_check(__FILE__, __LINE__, false);
+ Dmsg1(29, "dvd_write_part: device is %s\n", dev->print_name());
icmd = dev->device->write_part_command;
- edit_device_codes_dev(dev, ocmd.c_str(), icmd);
+ edit_device_codes_dev(dev, ocmd, icmd);
- /* Wait at most the time a maximum size part is written in DVD 0.5x speed
+ /*
+ * Wait at most the time a maximum size part is written in DVD 0.5x speed
* FIXME: Minimum speed should be in device configuration
*/
timeout = dev->max_open_wait + (dev->max_part_size/(1350*1024/2));
Dmsg2(29, "dvd_write_part: cmd=%s timeout=%d\n", ocmd.c_str(), timeout);
- status = run_program_full_output(ocmd.c_str(), timeout, results);
+{
+ POOL_MEM results(PM_MESSAGE);
+ sm_check(__FILE__, __LINE__, false);
+ status = run_program_full_output(ocmd.c_str(), timeout, results.c_str());
+ sm_check(__FILE__, __LINE__, false);
if (status != 0) {
Mmsg1(dev->errmsg, "Error while writing current part to the DVD: %s",
- results);
+ results.c_str());
Dmsg1(000, "%s", dev->errmsg);
dev->dev_errno = EIO;
- free_pool_memory(results);
- return -1;
- } else {
- Dmsg1(10, "dvd_write_part: command output=%s\n", results);
- POOL_MEM archive_name(PM_FNAME);
- Dmsg1(100, "Call get_filename. Vol=%s\n", dev->VolCatInfo.VolCatName);
- make_dvd_filename(dev, archive_name);
- unlink(archive_name.c_str());
- free_pool_memory(results);
- return 0;
+ return false;
}
+ sm_check(__FILE__, __LINE__, false);
+}
+
+{
+ POOL_MEM archive_name(PM_FNAME);
+ /* Delete spool file */
+ make_spooled_dvd_filename(dev, archive_name);
+ unlink(archive_name.c_str());
+ Dmsg1(29, "unlink(%s)\n", archive_name.c_str());
+ sm_check(__FILE__, __LINE__, false);
+}
+ update_free_space_dev(dev);
+ Jmsg(dcr->jcr, M_INFO, 0, _("Remaining free space %s on %s\n"),
+ edit_uint64_with_commas(dev->free_space, ed1), dev->print_name());
+ sm_check(__FILE__, __LINE__, false);
+ return true;
}
/* Open the next part file.
int open_next_part(DCR *dcr)
{
DEVICE *dev = dcr->dev;
-
- Dmsg3(29, "Enter: open_next_part %s %s %d\n", dev->dev_name,
+
+ Dmsg5(29, "Enter: ==== open_next_part part=%d npart=%d dev=%s vol=%s mode=%d\n",
+ dev->part, dev->num_parts, dev->print_name(),
dev->VolCatInfo.VolCatName, dev->openmode);
+ if (!dev->is_dvd()) {
+ Dmsg1(000, "Device %s is not dvd!!!!\n", dev->print_name());
+ return -1;
+ }
+
/* When appending, do not open a new part if the current is empty */
- if (dev->can_append() && (dev->part == dev->num_parts) &&
+ if (dev->can_append() && (dev->part >= dev->num_parts) &&
(dev->part_size == 0)) {
Dmsg0(29, "open_next_part exited immediately (dev->part_size == 0).\n");
return dev->fd;
* If we have a part open for write, then write it to
* DVD before opening the next part.
*/
- if (dev->is_dvd() && (dev->part == dev->num_parts) && dev->can_append()) {
- if (dvd_write_part(dev) < 0) {
+ if (dev->is_dvd() && (dev->part >= dev->num_parts) && dev->can_append()) {
+ if (!dvd_write_part(dcr)) {
return -1;
}
}
+ if (dev->part > dev->num_parts) {
+ Dmsg2(000, "In open_next_part: part=%d nump=%d\n", dev->part, dev->num_parts);
+ ASSERT(dev->part <= dev->num_parts);
+ }
dev->part_start += dev->part_size;
dev->part++;
+ Dmsg2(29, "part=%d num_parts=%d\n", dev->part, dev->num_parts);
+ /* I think this dev->can_append() should not be there */
if ((dev->num_parts < dev->part) && dev->can_append()) {
POOL_MEM archive_name(PM_FNAME);
struct stat buf;
-
/*
* First check what is on DVD. If out part is there, we
* are in trouble, so bail out.
*/
- make_dvd_filename(dev, archive_name); /* makes dvd name */
+ make_mounted_dvd_filename(dev, archive_name); /* makes dvd name */
if (stat(archive_name.c_str(), &buf) == 0) {
- /* bad new bail out */
+ /* bad news bail out */
Mmsg1(&dev->errmsg, _("Next Volume part already exists on DVD. Cannot continue: %s\n"),
archive_name.c_str());
return -1;
}
+ Dmsg2(100, "Set npart=%d to part=%d\n", dev->num_parts, dev->part);
dev->num_parts = dev->part;
- make_dvd_filename(dev, archive_name); /* makes spool name */
+ dev->VolCatInfo.VolCatParts = dev->part;
+ make_spooled_dvd_filename(dev, archive_name); /* makes spool name */
/* Check if the next part exists in spool directory . */
if ((stat(archive_name.c_str(), &buf) == 0) || (errno != ENOENT)) {
}
}
}
-
- Dmsg2(50, "Call dev->open(vol=%s, mode=%d", dev->VolCatInfo.VolCatName,
+ if (dev->num_parts < dev->part) {
+ Dmsg2(100, "Set npart=%d to part=%d\n", dev->num_parts, dev->part);
+ dev->num_parts = dev->part;
+ dev->VolCatInfo.VolCatParts = dev->part;
+ }
+ Dmsg2(50, "Call dev->open(vol=%s, mode=%d\n", dev->VolCatInfo.VolCatName,
dev->openmode);
/* Open next part */
if (dev->open(dcr, dev->openmode) < 0) {
/* Open the first part file.
* - Close the fd
* - Reopen the device
+ *
+ * I don't see why this is necessary unless the current
+ * part is not zero.
*/
int open_first_part(DCR *dcr, int mode)
{
DEVICE *dev = dcr->dev;
- Dmsg3(29, "Enter: open_first_part dev=%s Vol=%s mode=%d\n", dev->dev_name,
+
+ Dmsg3(29, "Enter: ==== open_first_part dev=%s Vol=%s mode=%d\n", dev->print_name(),
dev->VolCatInfo.VolCatName, dev->openmode);
+
if (dev->fd >= 0) {
close(dev->fd);
}
dev->clear_opened();
dev->part_start = 0;
- dev->part = 0;
+ dev->part = 1;
Dmsg2(50, "Call dev->open(vol=%s, mode=%d)\n", dcr->VolCatInfo.VolCatName,
mode);
/* Protected version of lseek, which opens the right part if necessary */
off_t lseek_dev(DEVICE *dev, off_t offset, int whence)
{
- int pos, openmode;
DCR *dcr;
+ off_t pos;
- if (dev->num_parts == 0) { /* If there is only one part, simply call lseek. */
+ Dmsg3(100, "Enter lseek_dev fd=%d part=%d nparts=%d\n", dev->fd,
+ dev->part, dev->num_parts);
+ if (!dev->is_dvd()) {
+ Dmsg0(100, "Using sys lseek\n");
return lseek(dev->fd, offset, whence);
}
dcr = (DCR *)dev->attached_dcrs->first(); /* any dcr will do */
switch(whence) {
case SEEK_SET:
- Dmsg1(100, "lseek_dev SEEK_SET called %d\n", offset);
+ Dmsg1(100, "lseek_dev SEEK_SET to %d\n", (int)offset);
if ((uint64_t)offset >= dev->part_start) {
- if ((uint64_t)(offset - dev->part_start) < dev->part_size) {
+ offset -= dev->part_start; /* adjust for start of this part */
+ if (offset == 0 || (uint64_t)offset < dev->part_size) {
/* We are staying in the current part, just seek */
- if ((pos = lseek(dev->fd, (off_t)(offset-dev->part_start), SEEK_SET)) < 0) {
+ if ((pos = lseek(dev->fd, offset, SEEK_SET)) < 0) {
return pos;
} else {
return pos + dev->part_start;
return lseek_dev(dev, offset, SEEK_SET);
}
} else {
- /* pos < dev->part_start :
+ /*
+ * pos < dev->part_start :
* We need to access a previous part,
* so just load the first one, and seek again
- * until the right one is loaded */
+ * until the right one is loaded
+ */
if (open_first_part(dcr, dev->openmode) < 0) {
Dmsg0(100, "lseek_dev failed while trying to open the first part\n");
return -1;
}
break;
case SEEK_CUR:
- Dmsg1(100, "lseek_dev SEEK_CUR called %d\n", offset);
+ Dmsg1(100, "lseek_dev SEEK_CUR to %d\n", (int)offset);
if ((pos = lseek(dev->fd, (off_t)0, SEEK_CUR)) < 0) {
return pos;
}
pos += dev->part_start;
if (offset == 0) {
return pos;
- }
- else { /* Not used in Bacula, but should work */
+ } else { /* Not used in Bacula, but should work */
return lseek_dev(dev, pos, SEEK_SET);
}
break;
case SEEK_END:
- Dmsg1(100, "lseek_dev SEEK_END called %d\n", offset);
+ Dmsg1(100, "lseek_dev SEEK_END to %d\n", (int)offset);
+ /*
+ * Bacula does not use offsets for SEEK_END
+ * Also, Bacula uses seek_end only when it wants to
+ * append to the volume, so for a dvd that means
+ * that the volume must be spooled since the DVD
+ * itself is read-only (as currently implemented).
+ */
if (offset > 0) { /* Not used by bacula */
- Dmsg1(100, "lseek_dev SEEK_END called with an invalid offset %d\n", offset);
+ Dmsg1(100, "lseek_dev SEEK_END called with an invalid offset %d\n", (int)offset);
errno = EINVAL;
return -1;
}
-
- if (dev->part == dev->num_parts) { /* The right part is already loaded */
+ /* If we are already on a spooled part and have the
+ * right part number, simply seek
+ */
+ if (dev->is_part_spooled() && dev->part == dev->num_parts) {
if ((pos = lseek(dev->fd, (off_t)0, SEEK_END)) < 0) {
return pos;
} else {
return pos + dev->part_start;
}
} else {
- /* Load the first part, then load the next until we reach the last one.
- * This is the only way to be sure we compute the right file address. */
- /* Save previous openmode, and open all but last part read-only (useful for DVDs) */
- openmode = dev->openmode;
-
+ /*
+ * Load the first part, then load the next until we reach the last one.
+ * This is the only way to be sure we compute the right file address.
+ *
+ * Save previous openmode, and open all but last part read-only
+ * (useful for DVDs)
+ */
+ int modesave = dev->openmode;
/* Works because num_parts > 0. */
if (open_first_part(dcr, OPEN_READ_ONLY) < 0) {
Dmsg0(100, "lseek_dev failed while trying to open the first part\n");
return -1;
}
}
- dev->openmode = openmode;
+ dev->openmode = modesave;
if (open_next_part(dcr) < 0) {
Dmsg0(100, "lseek_dev failed while trying to open the next part\n");
return -1;
* that requires mount, it will be written to the device.
*/
if (dev->is_dvd() && jcr->write_part_after_job && (dev->part_size > 0)) {
- Dmsg0(100, "Writing last part because write_part_after_job is set.\n");
+ Dmsg1(100, "Writing last part=%d write_partafter_job is set.\n",
+ dev->part);
if (dev->part < dev->num_parts) {
Jmsg3(jcr, M_FATAL, 0, _("Error while writing, current part number is less than the total number of parts (%d/%d, device=%s)\n"),
dev->part, dev->num_parts, dev->print_name());
ok = false;
}
- if (ok && (open_next_part(dcr) < 0)) {
- Jmsg2(jcr, M_FATAL, 0, _("Unable to open device next part %s: ERR=%s\n"),
+ /* This should be !dvd_write_part(dcr) */
+// if (ok && open_next_part(dcr) < 0) {
+ if (ok && !dvd_write_part(dcr)) {
+ Jmsg2(jcr, M_FATAL, 0, _("Unable to write part %s: ERR=%s\n"),
dev->print_name(), strerror_dev(dev));
dev->dev_errno = EIO;
ok = false;
}
-
- dev->VolCatInfo.VolCatParts = dev->num_parts;
}
+ Dmsg1(200, "Set VolCatParts=%d\n", dev->num_parts);
+ dev->VolCatInfo.VolCatParts = dev->num_parts;
return ok;
}
* Edit codes into (Un)MountCommand, Write(First)PartCommand
* %% = %
* %a = archive device name
+ * %e = erase (set if cannot mount and first part)
* %m = mount point
* %v = last part name
*
* imsg = input string containing edit codes (%x)
*
*/
-static char *edit_device_codes_dev(DEVICE* dev, char *omsg, const char *imsg)
+static void edit_device_codes_dev(DEVICE* dev, POOL_MEM &omsg, const char *imsg)
{
const char *p;
const char *str;
POOL_MEM archive_name(PM_FNAME);
- *omsg = 0;
+ omsg.c_str()[0] = 0;
Dmsg1(800, "edit_device_codes: %s\n", imsg);
for (p=imsg; *p; p++) {
if (*p == '%') {
case '%':
str = "%";
break;
+ case 'a':
+ str = dev->dev_name;
+ break;
+ case 'e':
+ if (dev->part == 1 && !dev->is_mounted()) {
+ str = "1";
+ } else {
+ str = "0";
+ }
+ break;
case 'n':
bsnprintf(add, sizeof(add), "%d", dev->part);
str = add;
break;
- case 'a':
- str = dev->dev_name;
- break;
case 'm':
str = dev->device->mount_point;
break;
case 'v':
- make_dvd_filename(dev, archive_name);
+ make_spooled_dvd_filename(dev, archive_name);
str = archive_name.c_str();
break;
default:
add[1] = 0;
str = add;
}
- Dmsg1(900, "add_str %s\n", str);
- pm_strcat(&omsg, (char *)str);
- Dmsg1(800, "omsg=%s\n", omsg);
+ Dmsg1(1900, "add_str %s\n", str);
+ pm_strcat(omsg, (char *)str);
+ Dmsg1(1800, "omsg=%s\n", omsg.c_str());
}
- return omsg;
}
projects / bacula / bacula / blobdiff