}
-
-static void print_findex(UAContext *ua, RBSR_FINDEX *fi)
-{
- ua->send_msg("fi=0x%lx\n", fi);
- for ( ; fi; fi=fi->next) {
- if (fi->findex == fi->findex2) {
- ua->send_msg("FileIndex=%d\n", fi->findex);
- Dmsg1(1000, "FileIndex=%d\n", fi->findex);
- } else {
- ua->send_msg("FileIndex=%d-%d\n", fi->findex, fi->findex2);
- Dmsg2(1000, "FileIndex=%d-%d\n", fi->findex, fi->findex2);
- }
- }
-}
-
/* Create a new bootstrap record */
RBSR *new_bsr()
{
if (bsr->VolParams) {
free(bsr->VolParams);
}
+ if (bsr->fileregex) {
+ free(bsr->fileregex);
+ }
next = bsr->next;
free(bsr);
}
ua->send_msg(_("Bootstrap records written to %s\n"), fname.c_str());
+ if (debug_level >= 10) {
+ print_bsr(ua, rx);
+ }
+
bail_out:
return count;
}
+static void display_vol_info(UAContext *ua, RESTORE_CTX &rx, JobId_t JobId)
+{
+ POOL_MEM volmsg(PM_MESSAGE);
+ char Device[MAX_NAME_LENGTH];
+ char online;
+ RBSR *bsr;
+
+ for (bsr=rx.bsr; bsr; bsr=bsr->next) {
+ if (JobId && JobId != bsr->JobId) {
+ continue;
+ }
+
+ for (int i=0; i < bsr->VolCount; i++) {
+ if (bsr->VolParams[i].VolumeName[0]) {
+ if (!get_storage_device(Device, bsr->VolParams[i].Storage)) {
+ Device[0] = 0;
+ }
+ if (bsr->VolParams[i].InChanger && bsr->VolParams[i].Slot) {
+ online = '*';
+ } else {
+ online = ' ';
+ }
+ Mmsg(volmsg, "%c%-25.25s %-25.25s %-25.25s",
+ online, bsr->VolParams[i].VolumeName,
+ bsr->VolParams[i].Storage,
+ Device);
+ add_prompt(ua, volmsg.c_str());
+ }
+ }
+ }
+}
+
void display_bsr_info(UAContext *ua, RESTORE_CTX &rx)
{
char *p;
- POOL_MEM volmsg(PM_MESSAGE);
JobId_t JobId;
- char Device[MAX_NAME_LENGTH];
/* Tell the user what he will need to mount */
ua->send_msg("\n");
"===========================================================================\n"));
/* Create Unique list of Volumes using prompt list */
start_prompt(ua, "");
- if (*rx.JobIds) {
+ if (*rx.JobIds == 0) {
+ /* Print Volumes in any order */
+ display_vol_info(ua, rx, 0);
+ } else {
/* Ensure that the volumes are printed in JobId order */
for (p=rx.JobIds; get_next_jobid_from_list(&p, &JobId) > 0; ) {
- for (RBSR *nbsr=rx.bsr; nbsr; nbsr=nbsr->next) {
- if (JobId != nbsr->JobId) {
- continue;
- }
- for (int i=0; i < nbsr->VolCount; i++) {
- if (nbsr->VolParams[i].VolumeName[0]) {
- if (!get_storage_device(Device, nbsr->VolParams[i].Storage)) {
- Device[0] = 0;
- }
- Mmsg(volmsg, "%-25.25s %-25.25s %-25.25s",
- nbsr->VolParams[i].VolumeName,
- nbsr->VolParams[i].Storage, Device);
- add_prompt(ua, volmsg.c_str());
- }
- }
- }
- }
- } else {
- /* Print Volumes in any order */
- for (RBSR *nbsr=rx.bsr; nbsr; nbsr=nbsr->next) {
- for (int i=0; i < nbsr->VolCount; i++) {
- if (nbsr->VolParams[i].VolumeName[0]) {
- if (!get_storage_device(Device, nbsr->VolParams[i].Storage)) {
- Device[0] = 0;
- }
- Mmsg(volmsg, "%-25.25s %-25.25s %-25.25s",
- nbsr->VolParams[i].VolumeName,
- nbsr->VolParams[i].Storage, Device);
- add_prompt(ua, volmsg.c_str());
- }
- }
+ display_vol_info(ua, rx, JobId);
}
}
for (int i=0; i < ua->num_prompts; i++) {
}
if (ua->num_prompts == 0) {
ua->send_msg(_("No Volumes found to restore.\n"));
+ } else {
+ ua->send_msg(_("\nVolumes marked with \"*\" are online.\n"));
}
ua->num_prompts = 0;
ua->send_msg("\n");
*/
static uint32_t write_bsr(UAContext *ua, RESTORE_CTX &rx, FILE *fd)
{
+ char ed1[50], ed2[50];
uint32_t count = 0;
uint32_t total_count = 0;
uint32_t LastIndex = 0;
}
fprintf(fd, "Volume=\"%s\"\n", bsr->VolParams[i].VolumeName);
fprintf(fd, "MediaType=\"%s\"\n", bsr->VolParams[i].MediaType);
+ if (bsr->fileregex) {
+ fprintf(fd, "FileRegex=%s\n", bsr->fileregex);
+ }
if (get_storage_device(device, bsr->VolParams[i].Storage)) {
fprintf(fd, "Device=\"%s\"\n", device);
}
}
fprintf(fd, "VolSessionId=%u\n", bsr->VolSessionId);
fprintf(fd, "VolSessionTime=%u\n", bsr->VolSessionTime);
- if (bsr->VolParams[i].StartFile == bsr->VolParams[i].EndFile) {
- fprintf(fd, "VolFile=%u\n", bsr->VolParams[i].StartFile);
- } else {
- fprintf(fd, "VolFile=%u-%u\n", bsr->VolParams[i].StartFile,
- bsr->VolParams[i].EndFile);
- }
- if (bsr->VolParams[i].StartBlock == bsr->VolParams[i].EndBlock) {
- fprintf(fd, "VolBlock=%u\n", bsr->VolParams[i].StartBlock);
- } else {
- fprintf(fd, "VolBlock=%u-%u\n", bsr->VolParams[i].StartBlock,
- bsr->VolParams[i].EndBlock);
- }
+ fprintf(fd, "VolAddr=%s-%s\n", edit_uint64(bsr->VolParams[i].StartAddr, ed1),
+ edit_uint64(bsr->VolParams[i].EndAddr, ed2));
// Dmsg2(100, "bsr VolParam FI=%u LI=%u\n",
// bsr->VolParams[i].FirstIndex, bsr->VolParams[i].LastIndex);
}
fprintf(fd, "Volume=\"%s\"\n", bsr->VolParams[i].VolumeName);
fprintf(fd, "MediaType=\"%s\"\n", bsr->VolParams[i].MediaType);
+ if (bsr->fileregex) {
+ fprintf(fd, "FileRegex=%s\n", bsr->fileregex);
+ }
if (get_storage_device(device, bsr->VolParams[i].Storage)) {
fprintf(fd, "Device=\"%s\"\n", device);
}
}
fprintf(fd, "VolSessionId=%u\n", bsr->VolSessionId);
fprintf(fd, "VolSessionTime=%u\n", bsr->VolSessionTime);
- if (bsr->VolParams[i].StartFile == bsr->VolParams[i].EndFile) {
- fprintf(fd, "VolFile=%u\n", bsr->VolParams[i].StartFile);
- } else {
- fprintf(fd, "VolFile=%u-%u\n", bsr->VolParams[i].StartFile,
- bsr->VolParams[i].EndFile);
- }
- if (bsr->VolParams[i].StartBlock == bsr->VolParams[i].EndBlock) {
- fprintf(fd, "VolBlock=%u\n", bsr->VolParams[i].StartBlock);
- } else {
- fprintf(fd, "VolBlock=%u-%u\n", bsr->VolParams[i].StartBlock,
- bsr->VolParams[i].EndBlock);
- }
+ fprintf(fd, "VolAddr=%s-%s\n", edit_uint64(bsr->VolParams[i].StartAddr, ed1),
+ edit_uint64(bsr->VolParams[i].EndAddr, ed2));
// Dmsg2(100, "bsr VolParam FI=%u LI=%u\n",
// bsr->VolParams[i].FirstIndex, bsr->VolParams[i].LastIndex);
return total_count;
}
-void print_bsr(UAContext *ua, RBSR *bsr)
+void print_bsr(UAContext *ua, RESTORE_CTX &rx)
{
- for ( ; bsr; bsr=bsr->next) {
- for (int i=0; i < bsr->VolCount; i++) {
- ua->send_msg("Volume=\"%s\"\n", bsr->VolParams[i].VolumeName);
- ua->send_msg("MediaType\"%s\"\n", bsr->VolParams[i].MediaType);
- ua->send_msg("VolSessionId=%u\n", bsr->VolSessionId);
- ua->send_msg("VolSessionTime=%u\n", bsr->VolSessionTime);
- ua->send_msg("VolFile=%u-%u\n", bsr->VolParams[i].StartFile,
- bsr->VolParams[i].EndFile);
- ua->send_msg("VolBlock=%u-%u\n", bsr->VolParams[i].StartBlock,
- bsr->VolParams[i].EndBlock);
- print_findex(ua, bsr->fi);
- }
- print_bsr(ua, bsr->next);
- }
+ write_bsr(ua, rx, stdout);
}
projects / bacula / bacula / blobdiff