static int do_label(UAContext *ua, const char *cmd, int relabel);
static void label_from_barcodes(UAContext *ua, int drive);
static bool send_label_request(UAContext *ua, MEDIA_DBR *mr, MEDIA_DBR *omr,
- POOL_DBR *pr, int relabel, bool media_record_exits, int drive);
+ POOL_DBR *pr, int relabel, bool media_record_exits, int drive);
static vol_list_t *get_vol_list_from_SD(UAContext *ua, bool scan);
static void free_vol_list(vol_list_t *vol_list);
static bool is_cleaning_tape(UAContext *ua, MEDIA_DBR *mr, POOL_DBR *pr);
strip_trailing_junk(ua->argv[i]);
for (p=ua->argv[i]; p && *p; p=e) {
- /* Check for list */
+ /* Check for list */
e = strchr(p, ',');
- if (e) {
- *e++ = 0;
- }
- /* Check for range */
+ if (e) {
+ *e++ = 0;
+ }
+ /* Check for range */
h = strchr(p, '-'); /* range? */
- if (h == p) {
+ if (h == p) {
msg = _("Negative numbers not permitted\n");
- goto bail_out;
- }
- if (h) {
- *h++ = 0;
- if (!is_an_integer(h)) {
+ goto bail_out;
+ }
+ if (h) {
+ *h++ = 0;
+ if (!is_an_integer(h)) {
msg = _("Range end is not integer.\n");
- goto bail_out;
- }
- skip_spaces(&p);
- if (!is_an_integer(p)) {
+ goto bail_out;
+ }
+ skip_spaces(&p);
+ if (!is_an_integer(p)) {
msg = _("Range start is not an integer.\n");
- goto bail_out;
- }
- beg = atoi(p);
- end = atoi(h);
- if (end < beg) {
+ goto bail_out;
+ }
+ beg = atoi(p);
+ end = atoi(h);
+ if (end < beg) {
msg = _("Range end not bigger than start.\n");
- goto bail_out;
- }
- } else {
- skip_spaces(&p);
- if (!is_an_integer(p)) {
+ goto bail_out;
+ }
+ } else {
+ skip_spaces(&p);
+ if (!is_an_integer(p)) {
msg = _("Input value is not an integer.\n");
- goto bail_out;
- }
- beg = end = atoi(p);
- }
- if (beg <= 0 || end <= 0) {
+ goto bail_out;
+ }
+ beg = end = atoi(p);
+ }
+ if (beg <= 0 || end <= 0) {
msg = _("Values must be be greater than zero.\n");
- goto bail_out;
- }
- if (end >= num_slots) {
+ goto bail_out;
+ }
+ if (end >= num_slots) {
msg = _("Slot too large.\n");
- goto bail_out;
- }
- for (i=beg; i<=end; i++) {
- slot_list[i] = 1; /* Turn on specified range */
- }
+ goto bail_out;
+ }
+ for (i=beg; i<=end; i++) {
+ slot_list[i] = 1; /* Turn on specified range */
+ }
}
} else {
/* Turn everything on */
for (i=0; i <= num_slots; i++) {
- slot_list[i] = 1;
+ slot_list[i] = 1;
}
}
-#ifdef xxx_debug
- printf("Slots turned on:\n");
+ Dmsg0(100, "Slots turned on:\n");
for (i=1; i <= num_slots; i++) {
if (slot_list[i]) {
- printf("%d\n", i);
+ Dmsg1(100, "%d\n", i);
}
}
-#endif
return true;
bail_out:
for (vl=vol_list; vl; vl=vl->next) {
if (vl->Slot > max_slots) {
bsendmsg(ua, _("Slot %d larger than max %d ignored.\n"),
- vl->Slot, max_slots);
- continue;
+ vl->Slot, max_slots);
+ continue;
}
/* Check if user wants us to look at this slot */
if (!slot_list[vl->Slot]) {
Dmsg1(100, "Skipping slot=%d\n", vl->Slot);
- continue;
+ continue;
}
/* If scanning, we read the label rather than the barcode */
if (scan) {
- if (vl->VolName) {
- free(vl->VolName);
- vl->VolName = NULL;
- }
- vl->VolName = get_volume_name_from_SD(ua, vl->Slot, drive);
+ if (vl->VolName) {
+ free(vl->VolName);
+ vl->VolName = NULL;
+ }
+ vl->VolName = get_volume_name_from_SD(ua, vl->Slot, drive);
Dmsg2(100, "Got Vol=%s from SD for Slot=%d\n", vl->VolName, vl->Slot);
}
- slot_list[vl->Slot] = 0; /* clear Slot */
+ slot_list[vl->Slot] = 0; /* clear Slot */
if (!vl->VolName) {
Dmsg1(100, "No VolName for Slot=%d setting InChanger to zero.\n", vl->Slot);
- memset(&mr, 0, sizeof(mr));
- mr.Slot = vl->Slot;
- mr.InChanger = 1;
- mr.StorageId = 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);
+ memset(&mr, 0, sizeof(mr));
+ mr.Slot = vl->Slot;
+ mr.InChanger = 1;
+ mr.StorageId = 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);
bsendmsg(ua, _("No VolName for Slot=%d set InChanger to zero.\n"), vl->Slot);
- continue;
+ 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) {
- mr.Slot = vl->Slot;
- mr.InChanger = 1;
- mr.StorageId = store->StorageId;
- if (!db_update_media_record(ua->jcr, ua->db, &mr)) {
+ if (mr.Slot != vl->Slot || !mr.InChanger || mr.StorageId != store->StorageId) {
+ mr.Slot = vl->Slot;
+ mr.InChanger = 1;
+ mr.StorageId = store->StorageId;
+ if (!db_update_media_record(ua->jcr, ua->db, &mr)) {
bsendmsg(ua, "%s", db_strerror(ua->db));
- } else {
- bsendmsg(ua, _(
+ } else {
+ bsendmsg(ua, _(
"Catalog record for Volume \"%s\" updated to reference slot %d.\n"),
- mr.VolumeName, mr.Slot);
- }
- } else {
+ mr.VolumeName, mr.Slot);
+ }
+ } else {
bsendmsg(ua, _("Catalog record for Volume \"%s\" is up to date.\n"),
- mr.VolumeName);
- }
- db_unlock(ua->db);
- continue;
+ mr.VolumeName);
+ }
+ db_unlock(ua->db);
+ continue;
} else {
bsendmsg(ua, _("Record for Volume \"%s\" not found in catalog.\n"),
- mr.VolumeName);
+ mr.VolumeName);
}
db_unlock(ua->db);
}
db_lock(ua->db);
for (int i=1; i <= max_slots; i++) {
if (slot_list[i]) {
- mr.Slot = i;
- /* Set InChanger to zero for this Slot */
- db_make_inchanger_unique(ua->jcr, ua->db, &mr);
+ mr.Slot = i;
+ /* Set InChanger to zero for this Slot */
+ db_make_inchanger_unique(ua->jcr, ua->db, &mr);
}
}
db_unlock(ua->db);
/* Check for oldvolume=name */
i = find_arg_with_value(ua, "oldvolume");
if (i >= 0) {
- memset(&omr, 0, sizeof(omr));
- bstrncpy(omr.VolumeName, ua->argv[i], sizeof(omr.VolumeName));
- if (db_get_media_record(ua->jcr, ua->db, &omr)) {
- goto checkVol;
- }
+ memset(&omr, 0, sizeof(omr));
+ bstrncpy(omr.VolumeName, ua->argv[i], sizeof(omr.VolumeName));
+ if (db_get_media_record(ua->jcr, ua->db, &omr)) {
+ goto checkVol;
+ }
bsendmsg(ua, "%s", db_strerror(ua->db));
}
/* No keyword or Vol not found, ask user to select */
if (!select_media_dbr(ua, &omr)) {
- return 1;
+ return 1;
}
/* 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"),
- omr.VolumeName, omr.VolStatus);
- return 1;
+ omr.VolumeName, omr.VolStatus);
+ return 1;
}
}
for ( ;; ) {
media_record_exists = false;
if (!get_cmd(ua, _("Enter new Volume name: "))) {
- return 1;
+ return 1;
}
checkName:
if (!is_volume_name_legal(ua, ua->cmd)) {
- continue;
+ continue;
}
memset(&mr, 0, sizeof(mr));
bstrncpy(mr.VolumeName, ua->cmd, sizeof(mr.VolumeName));
/* If VolBytes are zero the Volume is not labeled */
if (db_get_media_record(ua->jcr, ua->db, &mr)) {
- if (mr.VolBytes != 0) {
+ if (mr.VolBytes != 0) {
bsendmsg(ua, _("Media record for new Volume \"%s\" already exists.\n"),
- mr.VolumeName);
- continue;
- }
- media_record_exists = true;
+ mr.VolumeName);
+ continue;
+ }
+ media_record_exists = true;
}
- break; /* Got it */
+ break; /* Got it */
}
/* If autochanger, request slot */
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 */
+ mr.InChanger = 1; /* assumed if we are labeling it */
} else if (store->autochanger) {
if (!get_pint(ua, _("Enter slot (0 or Enter for none): "))) {
- return 1;
+ return 1;
}
mr.Slot = ua->pint32_val;
- mr.InChanger = 1; /* assumed if we are labeling it */
+ mr.InChanger = 1; /* assumed if we are labeling it */
}
mr.StorageId = store->StorageId;
if (pr.PoolId == 0) {
memset(&pr, 0, sizeof(pr));
if (!select_pool_dbr(ua, &pr)) {
- return 1;
+ return 1;
}
}
if (ok) {
sd = ua->jcr->store_bsock;
if (relabel) {
- /* Delete the old media record */
- if (!db_delete_media_record(ua->jcr, ua->db, &omr)) {
+ /* Delete the old media record */
+ if (!db_delete_media_record(ua->jcr, ua->db, &omr)) {
bsendmsg(ua, _("Delete of Volume \"%s\" failed. ERR=%s"),
- omr.VolumeName, db_strerror(ua->db));
- } else {
+ omr.VolumeName, db_strerror(ua->db));
+ } else {
bsendmsg(ua, _("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)) {
+ 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));
- }
- }
+ }
+ }
}
if (ua->automount) {
- bstrncpy(dev_name, store->dev_name(), sizeof(dev_name));
+ bstrncpy(dev_name, store->dev_name(), sizeof(dev_name));
bsendmsg(ua, _("Requesting to mount %s ...\n"), dev_name);
- bash_spaces(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) {
+ unbash_spaces(dev_name);
+ while (bnet_recv(sd) >= 0) {
bsendmsg(ua, "%s", sd->msg);
- /* Here we can get
- * 3001 OK mount. Device=xxx or
- * 3001 Mounted Volume vvvv
+ /* Here we can get
+ * 3001 OK mount. Device=xxx or
+ * 3001 Mounted Volume vvvv
* 3002 Device "DVD-Writer" (/dev/hdc) is mounted.
- * 3906 is cannot mount non-tape
- * So for those, no need to print a reminder
- */
+ * 3906 is cannot mount non-tape
+ * So for those, no need to print a reminder
+ */
if (strncmp(sd->msg, "3001 ", 5) == 0 ||
strncmp(sd->msg, "3002 ", 5) == 0 ||
strncmp(sd->msg, "3906 ", 5) == 0) {
- print_reminder = false;
- }
- }
+ print_reminder = false;
+ }
+ }
}
}
if (print_reminder) {
"==============\n"));
for (vl=vol_list; vl; vl=vl->next) {
if (!vl->VolName || !slot_list[vl->Slot]) {
- continue;
+ continue;
}
bsendmsg(ua, "%4d %s\n", vl->Slot, vl->VolName);
}
/* Fire off the label requests */
for (vl=vol_list; vl; vl=vl->next) {
if (!vl->VolName || !slot_list[vl->Slot]) {
- continue;
+ continue;
}
memset(&mr, 0, sizeof(mr));
bstrncpy(mr.VolumeName, vl->VolName, sizeof(mr.VolumeName));
media_record_exists = false;
if (db_get_media_record(ua->jcr, ua->db, &mr)) {
- if (mr.VolBytes != 0) {
+ if (mr.VolBytes != 0) {
bsendmsg(ua, _("Media record for Slot %d Volume \"%s\" already exists.\n"),
- vl->Slot, mr.VolumeName);
- mr.Slot = vl->Slot;
- mr.InChanger = 1;
- mr.StorageId = store->StorageId;
- if (!db_update_media_record(ua->jcr, ua->db, &mr)) {
+ vl->Slot, mr.VolumeName);
+ mr.Slot = vl->Slot;
+ mr.InChanger = 1;
+ 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));
- }
- continue;
- }
- media_record_exists = true;
+ }
+ continue;
+ }
+ media_record_exists = true;
}
mr.InChanger = 1;
mr.StorageId = store->StorageId;
* send_label_request() below
*/
if (is_cleaning_tape(ua, &mr, &pr)) {
- if (media_record_exists) { /* we update it */
- mr.VolBytes = 1;
+ if (media_record_exists) { /* we update it */
+ mr.VolBytes = 1;
bstrncpy(mr.VolStatus, "Cleaning", sizeof(mr.VolStatus));
- mr.MediaType[0] = 0;
- if (!db_update_media_record(ua->jcr, ua->db, &mr)) {
+ mr.MediaType[0] = 0;
+ if (!db_update_media_record(ua->jcr, ua->db, &mr)) {
bsendmsg(ua, "%s", db_strerror(ua->db));
- }
- } else { /* create the media record */
- set_pool_dbr_defaults_in_media_dbr(&mr, &pr);
+ }
+ } else { /* create the media record */
+ 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)) {
+ 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"),
- mr.VolumeName);
- pr.NumVols++; /* this is a bit suspect */
- if (!db_update_pool_record(ua->jcr, ua->db, &pr)) {
+ 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));
- }
- } else {
+ }
+ } else {
bsendmsg(ua, _("Catalog error on cleaning tape: %s"), db_strerror(ua->db));
- }
- }
- continue; /* done, go handle next volume */
+ }
+ }
+ continue; /* done, go handle next volume */
}
bstrncpy(mr.MediaType, store->media_type, sizeof(mr.MediaType));
/* Restrict the characters permitted in the Volume name */
for (p=name; *p; p++) {
if (B_ISALPHA(*p) || B_ISDIGIT(*p) || strchr(accept, (int)(*p))) {
- continue;
+ continue;
}
if (ua) {
bsendmsg(ua, _("Illegal character \"%c\" in a volume name.\n"), *p);
* NOTE! This routine opens the SD socket but leaves it open
*/
static bool send_label_request(UAContext *ua, MEDIA_DBR *mr, MEDIA_DBR *omr,
- POOL_DBR *pr, int relabel, bool media_record_exists,
- int drive)
+ POOL_DBR *pr, int relabel, bool media_record_exists,
+ int drive)
{
BSOCK *sd;
char dev_name[MAX_NAME_LENGTH];
bash_spaces(omr->VolumeName);
bnet_fsend(sd, "relabel %s OldName=%s NewName=%s PoolName=%s "
"MediaType=%s Slot=%d drive=%d",
- dev_name, omr->VolumeName, mr->VolumeName, pr->Name,
- mr->MediaType, mr->Slot, drive);
+ dev_name, omr->VolumeName, mr->VolumeName, pr->Name,
+ mr->MediaType, mr->Slot, drive);
bsendmsg(ua, _("Sending relabel command from \"%s\" to \"%s\" ...\n"),
- omr->VolumeName, mr->VolumeName);
+ 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);
+ dev_name, mr->VolumeName, pr->Name, mr->MediaType,
+ mr->Slot, drive);
bsendmsg(ua, _("Sending label command for Volume \"%s\" Slot %d ...\n"),
- mr->VolumeName, mr->Slot);
+ 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);
+ 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) {
- ok = true;
+ ok = true;
}
}
unbash_spaces(mr->VolumeName);
mr->set_label_date = true;
if (ok) {
if (media_record_exists) { /* we update it */
- mr->VolBytes = 1;
- mr->InChanger = 1;
- if (!db_update_media_record(ua->jcr, ua->db, mr)) {
+ mr->VolBytes = 1;
+ mr->InChanger = 1;
+ if (!db_update_media_record(ua->jcr, ua->db, mr)) {
bsendmsg(ua, "%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;
- if (db_create_media_record(ua->jcr, ua->db, mr)) {
+ 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;
+ if (db_create_media_record(ua->jcr, ua->db, mr)) {
bsendmsg(ua, _("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)) {
+ 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));
- }
- } else {
+ }
+ } else {
bsendmsg(ua, "%s", db_strerror(ua->db));
- ok = false;
- }
+ ok = false;
+ }
}
} else {
bsendmsg(ua, _("Label command failed for Volume %s.\n"), mr->VolumeName);
if (!ua->jcr->store_bsock) {
bsendmsg(ua, _("Connecting to Storage daemon %s at %s:%d ...\n"),
- store->hdr.name, store->address, store->SDport);
+ store->hdr.name, store->address, store->SDport);
if (!connect_to_storage_daemon(ua->jcr, 10, SDConnectTimeout, 1)) {
bsendmsg(ua, _("Failed to connect to Storage daemon.\n"));
- return NULL;
+ return NULL;
}
}
return ua->jcr->store_bsock;
bsendmsg(ua, "%s", sd->msg);
Dmsg1(100, "Got: %s", sd->msg);
if (strncmp(sd->msg, "3001 Volume=", 12) == 0) {
- VolName = (char *)malloc(sd->msglen);
+ VolName = (char *)malloc(sd->msglen);
if (sscanf(sd->msg, "3001 Volume=%s Slot=%d", VolName, &rtn_slot) == 2) {
- break;
- }
- free(VolName);
- VolName = NULL;
+ break;
+ }
+ free(VolName);
+ VolName = NULL;
}
}
close_sd_bsock(ua);
/* Check for returned SD messages */
if (sd->msg[0] == '3' && B_ISDIGIT(sd->msg[1]) &&
- B_ISDIGIT(sd->msg[2]) && B_ISDIGIT(sd->msg[3]) &&
+ B_ISDIGIT(sd->msg[2]) && B_ISDIGIT(sd->msg[3]) &&
sd->msg[4] == ' ') {
bsendmsg(ua, "%s\n", sd->msg); /* pass them on to user */
- continue;
+ continue;
}
- /* Validate Slot: if scanning, otherwise Slot:Barcode */
+ /* Validate Slot: if scanning, otherwise Slot:Barcode */
p = strchr(sd->msg, ':');
if (scan && p) {
- /* Scanning -- require only valid slot */
- Slot = atoi(sd->msg);
- if (Slot <= 0) {
- p--;
+ /* Scanning -- require only valid slot */
+ Slot = atoi(sd->msg);
+ if (Slot <= 0) {
+ p--;
*p = ':';
bsendmsg(ua, _("Invalid Slot number: %s\n"), sd->msg);
- continue;
- }
+ continue;
+ }
} else {
- /* Not scanning */
- if (p && strlen(p) > 1) {
- *p++ = 0;
- if (!is_an_integer(sd->msg) || (Slot=atoi(sd->msg)) <= 0) {
- p--;
+ /* Not scanning */
+ if (p && strlen(p) > 1) {
+ *p++ = 0;
+ if (!is_an_integer(sd->msg) || (Slot=atoi(sd->msg)) <= 0) {
+ p--;
*p = ':';
bsendmsg(ua, _("Invalid Slot number: %s\n"), sd->msg);
- continue;
- }
- } else {
- continue;
- }
- if (!is_volume_name_legal(ua, p)) {
- p--;
+ continue;
+ }
+ } else {
+ continue;
+ }
+ if (!is_volume_name_legal(ua, p)) {
+ p--;
*p = ':';
bsendmsg(ua, _("Invalid Volume name: %s\n"), sd->msg);
- continue;
- }
+ continue;
+ }
}
/* Add Slot and VolumeName to list */
vl->Slot = Slot;
if (p) {
if (*p == ':') {
- p++; /* skip separator */
- }
- vl->VolName = bstrdup(p);
+ p++; /* skip separator */
+ }
+ vl->VolName = bstrdup(p);
} else {
- vl->VolName = NULL;
+ vl->VolName = NULL;
}
Dmsg2(100, "Add slot=%d Vol=%s to SD list.\n", vl->Slot, NPRT(vl->VolName));
if (!vol_list) {
- vl->next = vol_list;
- vol_list = vl;
+ vl->next = vol_list;
+ vol_list = vl;
} else {
- /* Add new entry to end of list */
- for (vol_list_t *tvl=vol_list; tvl; tvl=tvl->next) {
- if (!tvl->next) {
- tvl->next = vl;
- vl->next = NULL;
- break;
- }
- }
+ /* Add new entry to end of list */
+ for (vol_list_t *tvl=vol_list; tvl; tvl=tvl->next) {
+ if (!tvl->next) {
+ tvl->next = vl;
+ vl->next = NULL;
+ break;
+ }
+ }
}
}
close_sd_bsock(ua);
for (vl=vol_list; vl; ) {
vol_list_t *ovl;
if (vl->VolName) {
- free(vl->VolName);
+ free(vl->VolName);
}
ovl = vl;
vl = vl->next;
while (bnet_recv(sd) >= 0) {
if (sscanf(sd->msg, "slots=%d\n", &slots) == 1) {
- break;
+ break;
} else {
bsendmsg(ua, "%s", sd->msg);
}
ua->jcr->pool->cleaning_prefix, mr->VolumeName,
strlen(ua->jcr->pool->cleaning_prefix),
strncmp(mr->VolumeName, ua->jcr->pool->cleaning_prefix,
- strlen(ua->jcr->pool->cleaning_prefix)));
+ strlen(ua->jcr->pool->cleaning_prefix)));
return strncmp(mr->VolumeName, ua->jcr->pool->cleaning_prefix,
- strlen(ua->jcr->pool->cleaning_prefix)) == 0;
+ strlen(ua->jcr->pool->cleaning_prefix)) == 0;
}
projects / bacula / bacula / commitdiff