+/*
+ Bacula® - The Network Backup Solution
+
+ Copyright (C) 2003-2007 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.
+
+ 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.
+*/
/*
*
* Bacula Director -- Tape labeling commands
*
* Version $Id$
*/
-/*
- Copyright (C) 2003-2006 Kern Sibbald
-
- 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.
-
- 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.
-
- */
#include "bacula.h"
#include "dird.h"
*/
void update_slots(UAContext *ua)
{
- STORE *store;
+ USTORE store;
vol_list_t *vl, *vol_list = NULL;
MEDIA_DBR mr;
char *slot_list;
bool scan;
int max_slots;
int drive;
+ int Enabled = 1;
+ bool have_enabled;
+ int i;
- if (!open_db(ua)) {
+ if (!open_client_db(ua)) {
return;
}
- store = get_storage_resource(ua, true/*arg is storage*/);
- if (!store) {
+ store.store = get_storage_resource(ua, true/*arg is storage*/);
+ if (!store.store) {
return;
}
- set_storage(ua->jcr, store);
- drive = get_storage_drive(ua, store);
+ pm_strcpy(store.store_source, _("command line"));
+ set_wstorage(ua->jcr, &store);
+ drive = get_storage_drive(ua, store.store);
scan = find_arg(ua, NT_("scan")) >= 0;
+ if ((i=find_arg_with_value(ua, NT_("Enabled"))) >= 0) {
+ Enabled = get_enabled(ua, ua->argv[i]);
+ if (Enabled < 0) {
+ return;
+ }
+ have_enabled = true;
+ } else {
+ have_enabled = false;
+ }
max_slots = get_num_slots_from_SD(ua);
Dmsg1(100, "max_slots=%d\n", max_slots);
if (max_slots <= 0) {
- bsendmsg(ua, _("No slots in changer to scan.\n"));
+ ua->warning_msg(_("No slots in changer to scan.\n"));
return;
}
slot_list = (char *)malloc(max_slots+1);
vol_list = get_vol_list_from_SD(ua, scan);
if (!vol_list) {
- bsendmsg(ua, _("No Volumes found to label, or no barcodes.\n"));
+ ua->warning_msg(_("No Volumes found to label, or no barcodes.\n"));
goto bail_out;
}
/* Walk through the list updating the media records */
for (vl=vol_list; vl; vl=vl->next) {
if (vl->Slot > max_slots) {
- bsendmsg(ua, _("Slot %d greater than max %d ignored.\n"),
+ ua->warning_msg(_("Slot %d greater than max %d ignored.\n"),
vl->Slot, max_slots);
continue;
}
memset(&mr, 0, sizeof(mr));
mr.Slot = vl->Slot;
mr.InChanger = 1;
- mr.StorageId = store->StorageId;
+ mr.StorageId = store.store->StorageId;
/* Set InChanger to zero for this Slot */
db_lock(ua->db);
db_make_inchanger_unique(ua->jcr, ua->db, &mr);
db_unlock(ua->db);
if (!vl->VolName) {
- Dmsg1(000, "No VolName for Slot=%d setting InChanger to zero.\n", vl->Slot);
- bsendmsg(ua, _("No VolName for Slot=%d InChanger set to zero.\n"), vl->Slot);
+ Dmsg1(100, "No VolName for Slot=%d setting InChanger to zero.\n", vl->Slot);
+ ua->info_msg(_("No VolName for Slot=%d InChanger set to zero.\n"), vl->Slot);
continue;
}
memset(&mr, 0, sizeof(mr));
bstrncpy(mr.VolumeName, vl->VolName, sizeof(mr.VolumeName));
db_lock(ua->db);
if (db_get_media_record(ua->jcr, ua->db, &mr)) {
- if (mr.Slot != vl->Slot || !mr.InChanger || mr.StorageId != store->StorageId) {
+ if (mr.Slot != vl->Slot || !mr.InChanger || mr.StorageId != store.store->StorageId) {
mr.Slot = vl->Slot;
mr.InChanger = 1;
- mr.StorageId = store->StorageId;
+ mr.StorageId = store.store->StorageId;
+ if (have_enabled) {
+ mr.Enabled = Enabled;
+ }
if (!db_update_media_record(ua->jcr, ua->db, &mr)) {
- bsendmsg(ua, "%s", db_strerror(ua->db));
+ ua->error_msg("%s", db_strerror(ua->db));
} else {
- bsendmsg(ua, _(
+ ua->info_msg(_(
"Catalog record for Volume \"%s\" updated to reference slot %d.\n"),
mr.VolumeName, mr.Slot);
}
} else {
- bsendmsg(ua, _("Catalog record for Volume \"%s\" is up to date.\n"),
+ ua->info_msg(_("Catalog record for Volume \"%s\" is up to date.\n"),
mr.VolumeName);
}
db_unlock(ua->db);
continue;
} else {
- bsendmsg(ua, _("Volume \"%s\" not found in catalog. Slot=%d InChanger set to zero.\n"),
+ ua->warning_msg(_("Volume \"%s\" not found in catalog. Slot=%d InChanger set to zero.\n"),
mr.VolumeName, vl->Slot);
}
db_unlock(ua->db);
}
memset(&mr, 0, sizeof(mr));
mr.InChanger = 1;
- mr.StorageId = store->StorageId;
+ mr.StorageId = store.store->StorageId;
db_lock(ua->db);
for (int i=1; i <= max_slots; i++) {
if (slot_list[i]) {
*/
static int do_label(UAContext *ua, const char *cmd, int relabel)
{
- STORE *store;
+ USTORE store;
BSOCK *sd;
char dev_name[MAX_NAME_LENGTH];
MEDIA_DBR mr, omr;
memset(&pr, 0, sizeof(pr));
- if (!open_db(ua)) {
+ if (!open_client_db(ua)) {
return 1;
}
label_barcodes = true;
}
- store = get_storage_resource(ua, true/*use default*/);
- if (!store) {
+ store.store = get_storage_resource(ua, true/*use default*/);
+ if (!store.store) {
return 1;
}
- set_storage(ua->jcr, store);
- drive = get_storage_drive(ua, store);
+ pm_strcpy(store.store_source, _("command line"));
+ set_wstorage(ua->jcr, &store);
+ drive = get_storage_drive(ua, store.store);
if (label_barcodes) {
label_from_barcodes(ua, drive);
if (db_get_media_record(ua->jcr, ua->db, &omr)) {
goto checkVol;
}
- bsendmsg(ua, "%s", db_strerror(ua->db));
+ ua->error_msg("%s", db_strerror(ua->db));
}
/* No keyword or Vol not found, ask user to select */
if (!select_media_dbr(ua, &omr)) {
/* Require Volume to be Purged or Recycled */
checkVol:
if (strcmp(omr.VolStatus, "Purged") != 0 && strcmp(omr.VolStatus, "Recycle") != 0) {
- bsendmsg(ua, _("Volume \"%s\" has VolStatus %s. It must be Purged or Recycled before relabeling.\n"),
+ ua->error_msg(_("Volume \"%s\" has VolStatus %s. It must be Purged or Recycled before relabeling.\n"),
omr.VolumeName, omr.VolStatus);
return 1;
}
/* If VolBytes are zero the Volume is not labeled */
if (db_get_media_record(ua->jcr, ua->db, &mr)) {
if (mr.VolBytes != 0) {
- bsendmsg(ua, _("Media record for new Volume \"%s\" already exists.\n"),
+ ua->error_msg(_("Media record for new Volume \"%s\" already exists.\n"),
mr.VolumeName);
continue;
}
i = find_arg_with_value(ua, "slot");
if (i >= 0) {
mr.Slot = atoi(ua->argv[i]);
- mr.InChanger = 1; /* assumed if we are labeling it */
- } else if (store->autochanger) {
+ if (mr.Slot < 0) {
+ mr.Slot = 0;
+ }
+ mr.InChanger = mr.Slot > 0; /* if slot give assume in changer */
+ } else if (store.store->autochanger) {
if (!get_pint(ua, _("Enter slot (0 or Enter for none): "))) {
return 1;
}
mr.Slot = ua->pint32_val;
- mr.InChanger = 1; /* assumed if we are labeling it */
+ if (mr.Slot < 0) {
+ mr.Slot = 0;
+ }
+ mr.InChanger = mr.Slot > 0; /* if slot give assume in changer */
}
- mr.StorageId = store->StorageId;
+ mr.StorageId = store.store->StorageId;
- bstrncpy(mr.MediaType, store->media_type, sizeof(mr.MediaType));
+ bstrncpy(mr.MediaType, store.store->media_type, sizeof(mr.MediaType));
/* Must select Pool if not already done */
if (pr.PoolId == 0) {
if (relabel) {
/* Delete the old media record */
if (!db_delete_media_record(ua->jcr, ua->db, &omr)) {
- bsendmsg(ua, _("Delete of Volume \"%s\" failed. ERR=%s"),
+ ua->error_msg(_("Delete of Volume \"%s\" failed. ERR=%s"),
omr.VolumeName, db_strerror(ua->db));
} else {
- bsendmsg(ua, _("Old volume \"%s\" deleted from catalog.\n"),
+ ua->info_msg(_("Old volume \"%s\" deleted from catalog.\n"),
omr.VolumeName);
/* Update the number of Volumes in the pool */
pr.NumVols--;
if (!db_update_pool_record(ua->jcr, ua->db, &pr)) {
- bsendmsg(ua, "%s", db_strerror(ua->db));
+ ua->error_msg("%s", db_strerror(ua->db));
}
}
}
if (ua->automount) {
- bstrncpy(dev_name, store->dev_name(), sizeof(dev_name));
- bsendmsg(ua, _("Requesting to mount %s ...\n"), dev_name);
+ bstrncpy(dev_name, store.store->dev_name(), sizeof(dev_name));
+ ua->info_msg(_("Requesting to mount %s ...\n"), dev_name);
bash_spaces(dev_name);
bnet_fsend(sd, "mount %s drive=%d", dev_name, drive);
unbash_spaces(dev_name);
while (bnet_recv(sd) >= 0) {
- bsendmsg(ua, "%s", sd->msg);
+ ua->send_msg("%s", sd->msg);
/* Here we can get
* 3001 OK mount. Device=xxx or
* 3001 Mounted Volume vvvv
}
}
if (print_reminder) {
- bsendmsg(ua, _("Do not forget to mount the drive!!!\n"));
+ ua->info_msg(_("Do not forget to mount the drive!!!\n"));
}
close_sd_bsock(ua);
*/
static void label_from_barcodes(UAContext *ua, int drive)
{
- STORE *store = ua->jcr->store;
+ STORE *store = ua->jcr->wstore;
POOL_DBR pr;
MEDIA_DBR mr, omr;
vol_list_t *vl, *vol_list = NULL;
max_slots = get_num_slots_from_SD(ua);
if (max_slots <= 0) {
- bsendmsg(ua, _("No slots in changer to scan.\n"));
+ ua->warning_msg(_("No slots in changer to scan.\n"));
return;
}
slot_list = (char *)malloc(max_slots+1);
vol_list = get_vol_list_from_SD(ua, false /*no scan*/);
if (!vol_list) {
- bsendmsg(ua, _("No Volumes found to label, or no barcodes.\n"));
+ ua->warning_msg(_("No Volumes found to label, or no barcodes.\n"));
goto bail_out;
}
/* Display list of Volumes and ask if he really wants to proceed */
- bsendmsg(ua, _("The following Volumes will be labeled:\n"
+ ua->send_msg(_("The following Volumes will be labeled:\n"
"Slot Volume\n"
"==============\n"));
for (vl=vol_list; vl; vl=vl->next) {
if (!vl->VolName || !slot_list[vl->Slot]) {
continue;
}
- bsendmsg(ua, "%4d %s\n", vl->Slot, vl->VolName);
+ ua->send_msg("%4d %s\n", vl->Slot, vl->VolName);
}
- if (!get_yesno(ua, _("Do you want to continue? (yes/no): ")) ||
+ if (!get_yesno(ua, _("Do you want to continue? (yes|no): ")) ||
(ua->pint32_val == 0)) {
goto bail_out;
}
media_record_exists = false;
if (db_get_media_record(ua->jcr, ua->db, &mr)) {
if (mr.VolBytes != 0) {
- bsendmsg(ua, _("Media record for Slot %d Volume \"%s\" already exists.\n"),
+ ua->warning_msg(_("Media record for Slot %d Volume \"%s\" already exists.\n"),
vl->Slot, mr.VolumeName);
mr.Slot = vl->Slot;
- mr.InChanger = 1;
+ mr.InChanger = mr.Slot > 0; /* if slot give assume in changer */
mr.StorageId = store->StorageId;
if (!db_update_media_record(ua->jcr, ua->db, &mr)) {
- bsendmsg(ua, _("Error setting InChanger: ERR=%s"), db_strerror(ua->db));
+ ua->error_msg(_("Error setting InChanger: ERR=%s"), db_strerror(ua->db));
}
continue;
}
media_record_exists = true;
}
- mr.InChanger = 1;
+ mr.InChanger = mr.Slot > 0; /* if slot give assume in changer */
mr.StorageId = store->StorageId;
/*
* Deal with creating cleaning tape here. Normal tapes created in
*/
if (is_cleaning_tape(ua, &mr, &pr)) {
if (media_record_exists) { /* we update it */
- mr.VolBytes = 1;
+ mr.VolBytes = 1; /* any bytes to indicate it exists */
bstrncpy(mr.VolStatus, "Cleaning", sizeof(mr.VolStatus));
mr.MediaType[0] = 0;
mr.StorageId = store->StorageId;
if (!db_update_media_record(ua->jcr, ua->db, &mr)) {
- bsendmsg(ua, "%s", db_strerror(ua->db));
+ ua->error_msg("%s", db_strerror(ua->db));
}
} else { /* create the media record */
if (pr.MaxVols > 0 && pr.NumVols >= pr.MaxVols) {
- bsendmsg(ua, _("Maximum pool Volumes=%d reached.\n"), pr.MaxVols);
+ ua->error_msg(_("Maximum pool Volumes=%d reached.\n"), pr.MaxVols);
goto bail_out;
}
set_pool_dbr_defaults_in_media_dbr(&mr, &pr);
bstrncpy(mr.VolStatus, "Cleaning", sizeof(mr.VolStatus));
mr.MediaType[0] = 0;
if (db_create_media_record(ua->jcr, ua->db, &mr)) {
- bsendmsg(ua, _("Catalog record for cleaning tape \"%s\" successfully created.\n"),
+ ua->send_msg(_("Catalog record for cleaning tape \"%s\" successfully created.\n"),
mr.VolumeName);
pr.NumVols++; /* this is a bit suspect */
if (!db_update_pool_record(ua->jcr, ua->db, &pr)) {
- bsendmsg(ua, "%s", db_strerror(ua->db));
+ ua->error_msg("%s", db_strerror(ua->db));
}
} else {
- bsendmsg(ua, _("Catalog error on cleaning tape: %s"), db_strerror(ua->db));
+ ua->error_msg(_("Catalog error on cleaning tape: %s"), db_strerror(ua->db));
}
}
continue; /* done, go handle next volume */
continue;
}
if (ua) {
- bsendmsg(ua, _("Illegal character \"%c\" in a volume name.\n"), *p);
+ ua->error_msg(_("Illegal character \"%c\" in a volume name.\n"), *p);
}
return 0;
}
len = strlen(name);
if (len >= MAX_NAME_LENGTH) {
if (ua) {
- bsendmsg(ua, _("Volume name too long.\n"));
+ ua->error_msg(_("Volume name too long.\n"));
}
return 0;
}
if (len == 0) {
if (ua) {
- bsendmsg(ua, _("Volume name must be at least one character long.\n"));
+ ua->error_msg(_("Volume name must be at least one character long.\n"));
}
return 0;
}
BSOCK *sd;
char dev_name[MAX_NAME_LENGTH];
bool ok = false;
+ bool is_dvd = false;
+ uint64_t VolBytes = 0;
if (!(sd=open_sd_bsock(ua))) {
return false;
}
- bstrncpy(dev_name, ua->jcr->store->dev_name(), sizeof(dev_name));
+ bstrncpy(dev_name, ua->jcr->wstore->dev_name(), sizeof(dev_name));
bash_spaces(dev_name);
bash_spaces(mr->VolumeName);
bash_spaces(mr->MediaType);
"MediaType=%s Slot=%d drive=%d",
dev_name, omr->VolumeName, mr->VolumeName, pr->Name,
mr->MediaType, mr->Slot, drive);
- bsendmsg(ua, _("Sending relabel command from \"%s\" to \"%s\" ...\n"),
+ ua->send_msg(_("Sending relabel command from \"%s\" to \"%s\" ...\n"),
omr->VolumeName, mr->VolumeName);
} else {
bnet_fsend(sd, "label %s VolumeName=%s PoolName=%s MediaType=%s "
"Slot=%d drive=%d",
dev_name, mr->VolumeName, pr->Name, mr->MediaType,
mr->Slot, drive);
- bsendmsg(ua, _("Sending label command for Volume \"%s\" Slot %d ...\n"),
+ ua->send_msg(_("Sending label command for Volume \"%s\" Slot %d ...\n"),
mr->VolumeName, mr->Slot);
Dmsg6(100, "label %s VolumeName=%s PoolName=%s MediaType=%s Slot=%d drive=%d\n",
dev_name, mr->VolumeName, pr->Name, mr->MediaType, mr->Slot, drive);
}
while (bnet_recv(sd) >= 0) {
- bsendmsg(ua, "%s", sd->msg);
- if (strncmp(sd->msg, "3000 OK label.", 14) == 0) {
+ int dvd;
+ ua->send_msg("%s", sd->msg);
+ if (sscanf(sd->msg, "3000 OK label. VolBytes=%llu DVD=%d ", &VolBytes,
+ &dvd) == 2) {
+ is_dvd = dvd;
ok = true;
}
}
unbash_spaces(pr->Name);
mr->LabelDate = time(NULL);
mr->set_label_date = true;
+ if (is_dvd) {
+ /* We know that a freshly labelled DVD has 1 VolParts */
+ /* This does not apply to auto-labelled DVDs. */
+ mr->VolParts = 1;
+ }
if (ok) {
if (media_record_exists) { /* we update it */
- mr->VolBytes = 1;
- mr->InChanger = 1;
- mr->StorageId = ua->jcr->store->StorageId;
+ mr->VolBytes = VolBytes;
+ mr->InChanger = mr->Slot > 0; /* if slot give assume in changer */
+ mr->StorageId = ua->jcr->wstore->StorageId;
if (!db_update_media_record(ua->jcr, ua->db, mr)) {
- bsendmsg(ua, "%s", db_strerror(ua->db));
+ ua->error_msg("%s", db_strerror(ua->db));
ok = false;
}
} else { /* create the media record */
set_pool_dbr_defaults_in_media_dbr(mr, pr);
- mr->VolBytes = 1; /* flag indicating Volume labeled */
- mr->InChanger = 1;
- mr->StorageId = ua->jcr->store->StorageId;
+ mr->VolBytes = VolBytes;
+ mr->InChanger = mr->Slot > 0; /* if slot give assume in changer */
+ mr->StorageId = ua->jcr->wstore->StorageId;
+ mr->Enabled = 1;
if (db_create_media_record(ua->jcr, ua->db, mr)) {
- bsendmsg(ua, _("Catalog record for Volume \"%s\", Slot %d successfully created.\n"),
+ ua->info_msg(_("Catalog record for Volume \"%s\", Slot %d successfully created.\n"),
mr->VolumeName, mr->Slot);
/* Update number of volumes in pool */
pr->NumVols++;
if (!db_update_pool_record(ua->jcr, ua->db, pr)) {
- bsendmsg(ua, "%s", db_strerror(ua->db));
+ ua->error_msg("%s", db_strerror(ua->db));
}
} else {
- bsendmsg(ua, "%s", db_strerror(ua->db));
+ ua->error_msg("%s", db_strerror(ua->db));
ok = false;
}
}
} else {
- bsendmsg(ua, _("Label command failed for Volume %s.\n"), mr->VolumeName);
+ ua->error_msg(_("Label command failed for Volume %s.\n"), mr->VolumeName);
}
return ok;
}
static BSOCK *open_sd_bsock(UAContext *ua)
{
- STORE *store = ua->jcr->store;
+ STORE *store = ua->jcr->wstore;
if (!ua->jcr->store_bsock) {
- bsendmsg(ua, _("Connecting to Storage daemon %s at %s:%d ...\n"),
- store->hdr.name, store->address, store->SDport);
+ ua->send_msg(_("Connecting to Storage daemon %s at %s:%d ...\n"),
+ store->name(), store->address, store->SDport);
if (!connect_to_storage_daemon(ua->jcr, 10, SDConnectTimeout, 1)) {
- bsendmsg(ua, _("Failed to connect to Storage daemon.\n"));
+ ua->error_msg(_("Failed to connect to Storage daemon.\n"));
return NULL;
}
}
static char *get_volume_name_from_SD(UAContext *ua, int Slot, int drive)
{
- STORE *store = ua->jcr->store;
+ STORE *store = ua->jcr->wstore;
BSOCK *sd;
char dev_name[MAX_NAME_LENGTH];
char *VolName = NULL;
int rtn_slot;
if (!(sd=open_sd_bsock(ua))) {
- bsendmsg(ua, _("Could not open SD socket.\n"));
+ ua->error_msg(_("Could not open SD socket.\n"));
return NULL;
}
bstrncpy(dev_name, store->dev_name(), sizeof(dev_name));
/* Get Volume name in this Slot */
while (bnet_recv(sd) >= 0) {
- bsendmsg(ua, "%s", sd->msg);
+ ua->send_msg("%s", sd->msg);
Dmsg1(100, "Got: %s", sd->msg);
if (strncmp(sd->msg, NT_("3001 Volume="), 12) == 0) {
VolName = (char *)malloc(sd->msglen);
*/
static vol_list_t *get_vol_list_from_SD(UAContext *ua, bool scan)
{
- STORE *store = ua->jcr->store;
+ STORE *store = ua->jcr->wstore;
char dev_name[MAX_NAME_LENGTH];
BSOCK *sd;
vol_list_t *vl;
if (sd->msg[0] == '3' && B_ISDIGIT(sd->msg[1]) &&
B_ISDIGIT(sd->msg[2]) && B_ISDIGIT(sd->msg[3]) &&
sd->msg[4] == ' ') {
- bsendmsg(ua, "%s\n", sd->msg); /* pass them on to user */
+ ua->send_msg("%s\n", sd->msg); /* pass them on to user */
continue;
}
if (Slot <= 0) {
p--;
*p = ':';
- bsendmsg(ua, _("Invalid Slot number: %s\n"), sd->msg);
+ ua->error_msg(_("Invalid Slot number: %s\n"), sd->msg);
continue;
}
} else {
if (!is_an_integer(sd->msg) || (Slot=atoi(sd->msg)) <= 0) {
p--;
*p = ':';
- bsendmsg(ua, _("Invalid Slot number: %s\n"), sd->msg);
+ ua->error_msg(_("Invalid Slot number: %s\n"), sd->msg);
continue;
}
} else {
if (!is_volume_name_legal(ua, p)) {
p--;
*p = ':';
- bsendmsg(ua, _("Invalid Volume name: %s\n"), sd->msg);
+ ua->error_msg(_("Invalid Volume name: %s\n"), sd->msg);
continue;
}
}
*/
static int get_num_slots_from_SD(UAContext *ua)
{
- STORE *store = ua->jcr->store;
+ STORE *store = ua->jcr->wstore;
char dev_name[MAX_NAME_LENGTH];
BSOCK *sd;
int slots = 0;
if (sscanf(sd->msg, "slots=%d\n", &slots) == 1) {
break;
} else {
- bsendmsg(ua, "%s", sd->msg);
+ ua->send_msg("%s", sd->msg);
}
}
close_sd_bsock(ua);
- bsendmsg(ua, _("Device \"%s\" has %d slots.\n"), store->dev_name(), slots);
+ ua->send_msg(_("Device \"%s\" has %d slots.\n"), store->dev_name(), slots);
return slots;
}
*/
int get_num_drives_from_SD(UAContext *ua)
{
- STORE *store = ua->jcr->store;
+ STORE *store = ua->jcr->wstore;
char dev_name[MAX_NAME_LENGTH];
BSOCK *sd;
int drives = 0;
if (sscanf(sd->msg, NT_("drives=%d\n"), &drives) == 1) {
break;
} else {
- bsendmsg(ua, "%s", sd->msg);
+ ua->send_msg("%s", sd->msg);
}
}
close_sd_bsock(ua);
/* Find Pool resource */
ua->jcr->pool = (POOL *)GetResWithName(R_POOL, pr->Name);
if (!ua->jcr->pool) {
- bsendmsg(ua, _("Pool \"%s\" resource not found!\n"), pr->Name);
- return true;
+ ua->error_msg(_("Pool \"%s\" resource not found for volume \"%s\"!\n"),
+ pr->Name, mr->VolumeName);
+ return false;
}
if (ua->jcr->pool->cleaning_prefix == NULL) {
return false;