X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fbsr.c;h=c1bb42c5135ef1fd7a3ee9923bd92329b230bdb9;hb=d6a6b4590d3acc30f82d7d254432e4fcf12ebf68;hp=1280b87ad272b581c1fe56a8569d5e7ce7528fc7;hpb=ae1d31a0fbf77b70888981e8c2d43cfb774dd9f2;p=bacula%2Fbacula

diff --git a/bacula/src/dird/bsr.c b/bacula/src/dird/bsr.c
index 1280b87ad2..c1bb42c513 100644
--- a/bacula/src/dird/bsr.c
+++ b/bacula/src/dird/bsr.c
@@ -2,45 +2,53 @@
  *
  *   Bacula Director -- Bootstrap Record routines.
  *
- *	BSR (bootstrap record) handling routines split from 
- *	  ua_restore.c July MMIII
+ *      BSR (bootstrap record) handling routines split from
+ *        ua_restore.c July MMIII
  *
  *     Kern Sibbald, July MMII
  *
  *   Version $Id$
  */
-
 /*
-   Copyright (C) 2002-2003 Kern Sibbald and John Walker
+   Bacula® - The Network Backup Solution
+
+   Copyright (C) 2002-2006 Free Software Foundation Europe e.V.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   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
+   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., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   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 "dird.h"
 
 /* Forward referenced functions */
-static void write_bsr(UAContext *ua, RBSR *bsr, FILE *fd);
+static uint32_t write_bsr(UAContext *ua, RESTORE_CTX &rx, FILE *fd);
+void print_bsr(UAContext *ua, RBSR *bsr);
 
 
 /*
- * Create new FileIndex entry for BSR 
+ * Create new FileIndex entry for BSR
  */
-RBSR_FINDEX *new_findex() 
+RBSR_FINDEX *new_findex()
 {
    RBSR_FINDEX *fi = (RBSR_FINDEX *)bmalloc(sizeof(RBSR_FINDEX));
    memset(fi, 0, sizeof(RBSR_FINDEX));
@@ -50,49 +58,80 @@ RBSR_FINDEX *new_findex()
 /* Free all BSR FileIndex entries */
 static void free_findex(RBSR_FINDEX *fi)
 {
-   if (fi) {
-      free_findex(fi->next);
+   RBSR_FINDEX *next;
+   for ( ; fi; fi=next) {
+      next = fi->next;
       free(fi);
    }
 }
 
+/* 
+ * Get storage device name from Storage resource
+ */
+static bool get_storage_device(char *device, char *storage)
+{
+   STORE *store;
+   if (storage[0] == 0) {
+      return false;
+   }
+   store = (STORE *)GetResWithName(R_STORAGE, storage);    
+   if (!store) {
+      return false;
+   }
+   DEVICE *dev = (DEVICE *)(store->device->first());
+   if (!dev) {
+      return false;
+   }
+   bstrncpy(device, dev->hdr.name, MAX_NAME_LENGTH);
+   return true;
+}
+
 /*
  * Our data structures were not designed completely
  *  correctly, so the file indexes cover the full
  *  range regardless of volume. The FirstIndex and LastIndex
- *  passed in here are for the current volume, so when 
+ *  passed in here are for the current volume, so when
  *  writing out the fi, constrain them to those values.
+ *
+ * We are called here once for each JobMedia record
+ *  for each Volume.
  */
-static void write_findex(UAContext *ua, RBSR_FINDEX *fi, 
-	      int32_t FirstIndex, int32_t LastIndex, FILE *fd) 
+static uint32_t write_findex(RBSR_FINDEX *fi,
+              int32_t FirstIndex, int32_t LastIndex, FILE *fd)
 {
-   if (fi) {
+   uint32_t count = 0;
+   for ( ; fi; fi=fi->next) {
       int32_t findex, findex2;
-      findex = fi->findex < FirstIndex ? FirstIndex : fi->findex;
-      findex2 = fi->findex2 > LastIndex ? LastIndex : fi->findex2;
-      if (findex == findex2) {
-         fprintf(fd, "FileIndex=%d\n", findex);
-      } else {
-         fprintf(fd, "FileIndex=%d-%d\n", findex, findex2);
+      if ((fi->findex >= FirstIndex && fi->findex <= LastIndex) ||
+          (fi->findex2 >= FirstIndex && fi->findex2 <= LastIndex) ||
+          (fi->findex < FirstIndex && fi->findex2 > LastIndex)) {
+         findex = fi->findex < FirstIndex ? FirstIndex : fi->findex;
+         findex2 = fi->findex2 > LastIndex ? LastIndex : fi->findex2;
+         if (findex == findex2) {
+            fprintf(fd, "FileIndex=%d\n", findex);
+            count++;
+         } else {
+            fprintf(fd, "FileIndex=%d-%d\n", findex, findex2);
+            count += findex2 - findex + 1;
+         }
       }
-      write_findex(ua, fi->next, FirstIndex, LastIndex, fd);
    }
+   return count;
 }
 
 /*
  * Find out if Volume defined with FirstIndex and LastIndex
  *   falls within the range of selected files in the bsr.
  */
-static bool is_volume_selected(RBSR_FINDEX *fi, 
-	      int32_t FirstIndex, int32_t LastIndex) 
+static bool is_volume_selected(RBSR_FINDEX *fi,
+              int32_t FirstIndex, int32_t LastIndex)
 {
-   if (fi) {
+   for ( ; fi; fi=fi->next) {
       if ((fi->findex >= FirstIndex && fi->findex <= LastIndex) ||
-	  (fi->findex2 >= FirstIndex && fi->findex2 <= LastIndex) ||
-	  (fi->findex < FirstIndex && fi->findex2 > LastIndex)) {
-	 return true;
+          (fi->findex2 >= FirstIndex && fi->findex2 <= LastIndex) ||
+          (fi->findex < FirstIndex && fi->findex2 > LastIndex)) {
+         return true;
       }
-      return is_volume_selected(fi->next, FirstIndex, LastIndex);
    }
    return false;
 }
@@ -101,13 +140,15 @@ static bool is_volume_selected(RBSR_FINDEX *fi,
 
 static void print_findex(UAContext *ua, RBSR_FINDEX *fi)
 {
-   if (fi) {
+   bsendmsg(ua, "fi=0x%lx\n", fi);
+   for ( ; fi; fi=fi->next) {
       if (fi->findex == fi->findex2) {
          bsendmsg(ua, "FileIndex=%d\n", fi->findex);
+         Dmsg1(1000, "FileIndex=%d\n", fi->findex);
       } else {
          bsendmsg(ua, "FileIndex=%d-%d\n", fi->findex, fi->findex2);
+         Dmsg2(1000, "FileIndex=%d-%d\n", fi->findex, fi->findex2);
       }
-      print_findex(ua, fi->next);
    }
 }
 
@@ -122,12 +163,13 @@ RBSR *new_bsr()
 /* Free the entire BSR */
 void free_bsr(RBSR *bsr)
 {
-   if (bsr) {
+   RBSR *next;
+   for ( ; bsr; bsr=next) {
       free_findex(bsr->fi);
-      free_bsr(bsr->next);
       if (bsr->VolParams) {
-	 free(bsr->VolParams);
+         free(bsr->VolParams);
       }
+      next = bsr->next;
       free(bsr);
    }
 }
@@ -136,121 +178,315 @@ void free_bsr(RBSR *bsr)
  * Complete the BSR by filling in the VolumeName and
  *  VolSessionId and VolSessionTime using the JobId
  */
-int complete_bsr(UAContext *ua, RBSR *bsr)
+bool complete_bsr(UAContext *ua, RBSR *bsr)
 {
-   if (bsr) {
+   for ( ; bsr; bsr=bsr->next) {
       JOB_DBR jr;
       memset(&jr, 0, sizeof(jr));
       jr.JobId = bsr->JobId;
       if (!db_get_job_record(ua->jcr, ua->db, &jr)) {
          bsendmsg(ua, _("Unable to get Job record. ERR=%s\n"), db_strerror(ua->db));
-	 return 0;
+         return false;
       }
       bsr->VolSessionId = jr.VolSessionId;
       bsr->VolSessionTime = jr.VolSessionTime;
-      if ((bsr->VolCount=db_get_job_volume_parameters(ua->jcr, ua->db, bsr->JobId, 
-	   &(bsr->VolParams))) == 0) {
+      if ((bsr->VolCount=db_get_job_volume_parameters(ua->jcr, ua->db, bsr->JobId,
+           &(bsr->VolParams))) == 0) {
          bsendmsg(ua, _("Unable to get Job Volume Parameters. ERR=%s\n"), db_strerror(ua->db));
-	 if (bsr->VolParams) {
-	    free(bsr->VolParams);
-	    bsr->VolParams = NULL;
-	 }
-	 return 0;
+         if (bsr->VolParams) {
+            free(bsr->VolParams);
+            bsr->VolParams = NULL;
+         }
+         return false;
       }
-      return complete_bsr(ua, bsr->next);
    }
-   return 1;
+   return true;
+}
+
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+static uint32_t uniq = 0;
+
+static void make_unique_restore_filename(UAContext *ua, POOL_MEM &fname)
+{
+   JCR *jcr = ua->jcr;
+   int i = find_arg_with_value(ua, "bootstrap");
+   if (i >= 0) {
+      Mmsg(fname, "%s", ua->argv[i]);              
+      jcr->unlink_bsr = false;
+   } else {
+      P(mutex);
+      uniq++;
+      V(mutex);
+      Mmsg(fname, "%s/%s.restore.%u.bsr", working_directory, my_name, uniq);
+      jcr->unlink_bsr = true;
+   }
+   if (jcr->RestoreBootstrap) {
+      free(jcr->RestoreBootstrap);
+   }
+   jcr->RestoreBootstrap = bstrdup(fname.c_str());
 }
 
 /*
- * Write the bootstrap record to file
+ * Write the bootstrap records to file
  */
-int write_bsr_file(UAContext *ua, RBSR *bsr)
+uint32_t write_bsr_file(UAContext *ua, RESTORE_CTX &rx)
 {
    FILE *fd;
-   POOLMEM *fname = get_pool_memory(PM_MESSAGE);
-   int stat;
+   POOL_MEM fname(PM_MESSAGE);
+   POOL_MEM volmsg(PM_MESSAGE);
+   uint32_t count = 0;;
+   bool err;
+   char *p;
+   JobId_t JobId;
+   char Device[MAX_NAME_LENGTH];
 
-   Mmsg(&fname, "%s/restore.bsr", working_directory);
-   fd = fopen(fname, "w+");
+   make_unique_restore_filename(ua, fname);
+   fd = fopen(fname.c_str(), "w+b");
    if (!fd) {
-      bsendmsg(ua, _("Unable to create bootstrap file %s. ERR=%s\n"), 
-	 fname, strerror(errno));
-      free_pool_memory(fname);
-      return 0;
+      berrno be;
+      bsendmsg(ua, _("Unable to create bootstrap file %s. ERR=%s\n"),
+         fname.c_str(), be.strerror());
+      goto bail_out;
    }
    /* Write them to file */
-   write_bsr(ua, bsr, fd);
-   stat = !ferror(fd);
+   count = write_bsr(ua, rx, fd);
+   err = ferror(fd);
    fclose(fd);
-   bsendmsg(ua, _("Bootstrap records written to %s\n"), fname);
+   if (count == 0) {
+      bsendmsg(ua, _("No files found to restore/migrate. No bootstrap file written.\n"));
+      goto bail_out;
+   }
+   if (err) {
+      bsendmsg(ua, _("Error writing bsr file.\n"));
+      count = 0;
+      goto bail_out;
+   }
+
+
+   bsendmsg(ua, _("Bootstrap records written to %s\n"), fname.c_str());
 
    /* Tell the user what he will need to mount */
    bsendmsg(ua, "\n");
-   bsendmsg(ua, _("The restore job will require the following Volumes:\n"));
+   bsendmsg(ua, _("The job will require the following\n"
+                  "   Volume(s)                 Storage(s)                SD Device(s)\n"
+                  "===========================================================================\n"));
    /* Create Unique list of Volumes using prompt list */
    start_prompt(ua, "");
-   for (RBSR *nbsr=bsr; nbsr; nbsr=nbsr->next) {
-      for (int i=0; i < nbsr->VolCount; i++) {
-	 if (nbsr->VolParams[i].VolumeName[0]) {
-	    add_prompt(ua, nbsr->VolParams[i].VolumeName);
-	 }
+   if (*rx.JobIds) {
+      /* 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());
+            }
+         }
       }
    }
    for (int i=0; i < ua->num_prompts; i++) {
       bsendmsg(ua, "   %s\n", ua->prompt[i]);
       free(ua->prompt[i]);
    }
+   if (ua->num_prompts == 0) {
+      bsendmsg(ua, _("No Volumes found to restore.\n"));
+      count = 0;
+   }
    ua->num_prompts = 0;
    bsendmsg(ua, "\n");
-   free_pool_memory(fname);
-   return stat;
+
+bail_out:
+   return count;
 }
 
-static void write_bsr(UAContext *ua, RBSR *bsr, FILE *fd)
+/*
+ * Here we actually write out the details of the bsr file.
+ *  Note, there is one bsr for each JobId, but the bsr may
+ *  have multiple volumes, which have been entered in the
+ *  order they were written.  
+ * The bsrs must be written out in the order the JobIds
+ *  are found in the jobid list.
+ */
+static uint32_t write_bsr(UAContext *ua, RESTORE_CTX &rx, FILE *fd)
 {
-   if (bsr) {
-      for (int i=0; i < bsr->VolCount; i++) {
-	 if (!is_volume_selected(bsr->fi, bsr->VolParams[i].FirstIndex,
-	      bsr->VolParams[i].LastIndex)) {
-	    bsr->VolParams[i].VolumeName[0] = 0;  /* zap VolumeName */
-	    continue;
-	 }
-         fprintf(fd, "Volume=\"%s\"\n", bsr->VolParams[i].VolumeName);
-         fprintf(fd, "VolSessionId=%u\n", bsr->VolSessionId);
-         fprintf(fd, "VolSessionTime=%u\n", bsr->VolSessionTime);
-         fprintf(fd, "VolFile=%u-%u\n", bsr->VolParams[i].StartFile, 
-		 bsr->VolParams[i].EndFile);
-         fprintf(fd, "VolBlock=%u-%u\n", bsr->VolParams[i].StartBlock,
-		 bsr->VolParams[i].EndBlock);
-
-//       Dmsg2(000, "bsr VolParam FI=%u LI=%u\n",
-//	    bsr->VolParams[i].FirstIndex, bsr->VolParams[i].LastIndex);
-	 write_findex(ua, bsr->fi, bsr->VolParams[i].FirstIndex,
-	    bsr->VolParams[i].LastIndex, fd);
+   uint32_t count = 0;
+   uint32_t total_count = 0;
+   uint32_t LastIndex = 0;
+   bool first = true;
+   char *p;
+   JobId_t JobId;
+   char device[MAX_NAME_LENGTH];
+   RBSR *bsr;
+   if (*rx.JobIds == 0) {
+      for (bsr=rx.bsr; bsr; bsr=bsr->next) {
+         /*
+          * For a given volume, loop over all the JobMedia records.
+          *   VolCount is the number of JobMedia records.
+          */
+         for (int i=0; i < bsr->VolCount; i++) {
+            if (!is_volume_selected(bsr->fi, bsr->VolParams[i].FirstIndex,
+                 bsr->VolParams[i].LastIndex)) {
+               bsr->VolParams[i].VolumeName[0] = 0;  /* zap VolumeName */
+               continue;
+            }
+            if (!rx.store) {
+               find_storage_resource(ua, rx, bsr->VolParams[i].Storage,
+                                             bsr->VolParams[i].MediaType);
+            }
+            fprintf(fd, "Volume=\"%s\"\n", bsr->VolParams[i].VolumeName);
+            fprintf(fd, "MediaType=\"%s\"\n", bsr->VolParams[i].MediaType);
+            if (get_storage_device(device, bsr->VolParams[i].Storage)) {
+               fprintf(fd, "Device=\"%s\"\n", device);
+            }
+            if (bsr->VolParams[i].Slot > 0) {
+               fprintf(fd, "Slot=%d\n", bsr->VolParams[i].Slot);
+            }
+            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);
+            }
+   //       Dmsg2(100, "bsr VolParam FI=%u LI=%u\n",
+   //          bsr->VolParams[i].FirstIndex, bsr->VolParams[i].LastIndex);
+
+            count = write_findex(bsr->fi, bsr->VolParams[i].FirstIndex,
+                                 bsr->VolParams[i].LastIndex, fd);
+            if (count) {
+               fprintf(fd, "Count=%u\n", count);
+            }
+            total_count += count;
+            /* If the same file is present on two tapes or in two files
+             *   on a tape, it is a continuation, and should not be treated
+             *   twice in the totals.
+             */
+            if (!first && LastIndex == bsr->VolParams[i].FirstIndex) {
+               total_count--;
+            }
+            first = false;
+            LastIndex = bsr->VolParams[i].LastIndex;
+         }
+      }
+      return total_count;
+   }
+   for (p=rx.JobIds; get_next_jobid_from_list(&p, &JobId) > 0; ) {
+      for (bsr=rx.bsr; bsr; bsr=bsr->next) {
+         if (JobId != bsr->JobId) {
+            continue;
+         }
+         /*
+          * For a given volume, loop over all the JobMedia records.
+          *   VolCount is the number of JobMedia records.
+          */
+         for (int i=0; i < bsr->VolCount; i++) {
+            if (!is_volume_selected(bsr->fi, bsr->VolParams[i].FirstIndex,
+                 bsr->VolParams[i].LastIndex)) {
+               bsr->VolParams[i].VolumeName[0] = 0;  /* zap VolumeName */
+               continue;
+            }
+            if (!rx.store) {
+               find_storage_resource(ua, rx, bsr->VolParams[i].Storage,
+                                             bsr->VolParams[i].MediaType);
+            }
+            fprintf(fd, "Volume=\"%s\"\n", bsr->VolParams[i].VolumeName);
+            fprintf(fd, "MediaType=\"%s\"\n", bsr->VolParams[i].MediaType);
+            if (get_storage_device(device, bsr->VolParams[i].Storage)) {
+               fprintf(fd, "Device=\"%s\"\n", device);
+            }
+            if (bsr->VolParams[i].Slot > 0) {
+               fprintf(fd, "Slot=%d\n", bsr->VolParams[i].Slot);
+            }
+            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);
+            }
+   //       Dmsg2(100, "bsr VolParam FI=%u LI=%u\n",
+   //          bsr->VolParams[i].FirstIndex, bsr->VolParams[i].LastIndex);
+
+            count = write_findex(bsr->fi, bsr->VolParams[i].FirstIndex,
+                                 bsr->VolParams[i].LastIndex, fd);
+            if (count) {
+               fprintf(fd, "Count=%u\n", count);
+            }
+            total_count += count;
+            /* If the same file is present on two tapes or in two files
+             *   on a tape, it is a continuation, and should not be treated
+             *   twice in the totals.
+             */
+            if (!first && LastIndex == bsr->VolParams[i].FirstIndex) {
+               total_count--;
+            }
+            first = false;
+            LastIndex = bsr->VolParams[i].LastIndex;
+         }
       }
-      write_bsr(ua, bsr->next, fd);
    }
+   return total_count;
 }
 
-static void print_bsr(UAContext *ua, RBSR *bsr)
+void print_bsr(UAContext *ua, RBSR *bsr)
 {
-   if (bsr) {
+   for ( ; bsr; bsr=bsr->next) {
       for (int i=0; i < bsr->VolCount; i++) {
          bsendmsg(ua, "Volume=\"%s\"\n", bsr->VolParams[i].VolumeName);
+         bsendmsg(ua, "MediaType\"%s\"\n", bsr->VolParams[i].MediaType);
          bsendmsg(ua, "VolSessionId=%u\n", bsr->VolSessionId);
          bsendmsg(ua, "VolSessionTime=%u\n", bsr->VolSessionTime);
-         bsendmsg(ua, "VolFile=%u-%u\n", bsr->VolParams[i].StartFile, 
-		  bsr->VolParams[i].EndFile);
+         bsendmsg(ua, "VolFile=%u-%u\n", bsr->VolParams[i].StartFile,
+                  bsr->VolParams[i].EndFile);
          bsendmsg(ua, "VolBlock=%u-%u\n", bsr->VolParams[i].StartBlock,
-		  bsr->VolParams[i].EndBlock);
-	 print_findex(ua, bsr->fi);
+                  bsr->VolParams[i].EndBlock);
+         print_findex(ua, bsr->fi);
       }
       print_bsr(ua, bsr->next);
    }
 }
 
 
+
+
 /*
  * Add a FileIndex to the list of BootStrap records.
  *  Here we are only dealing with JobId's and the FileIndexes
@@ -262,10 +498,10 @@ void add_findex(RBSR *bsr, uint32_t JobId, int32_t findex)
    RBSR_FINDEX *fi, *lfi;
 
    if (findex == 0) {
-      return;			      /* probably a dummy directory */
+      return;                         /* probably a dummy directory */
    }
-   
-   if (!bsr->fi) {		      /* if no FI add one */
+
+   if (bsr->fi == NULL) {             /* if no FI add one */
       /* This is the first FileIndex item in the chain */
       bsr->fi = new_findex();
       bsr->JobId = JobId;
@@ -276,37 +512,37 @@ void add_findex(RBSR *bsr, uint32_t JobId, int32_t findex)
    /* Walk down list of bsrs until we find the JobId */
    if (bsr->JobId != JobId) {
       for (nbsr=bsr->next; nbsr; nbsr=nbsr->next) {
-	 if (nbsr->JobId == JobId) {
-	    bsr = nbsr;
-	    break;
-	 }
+         if (nbsr->JobId == JobId) {
+            bsr = nbsr;
+            break;
+         }
       }
 
-      if (!nbsr) {		      /* Must add new JobId */
-	 /* Add new JobId at end of chain */
-	 for (nbsr=bsr; nbsr->next; nbsr=nbsr->next) 
-	    {  }
-	 nbsr->next = new_bsr();
-	 nbsr->next->JobId = JobId;
-	 nbsr->next->fi = new_findex();
-	 nbsr->next->fi->findex = findex;
-	 nbsr->next->fi->findex2 = findex;
-	 return;
+      if (!nbsr) {                    /* Must add new JobId */
+         /* Add new JobId at end of chain */
+         for (nbsr=bsr; nbsr->next; nbsr=nbsr->next)
+            {  }
+         nbsr->next = new_bsr();
+         nbsr->next->JobId = JobId;
+         nbsr->next->fi = new_findex();
+         nbsr->next->fi->findex = findex;
+         nbsr->next->fi->findex2 = findex;
+         return;
       }
    }
 
-   /* 
-    * At this point, bsr points to bsr containing JobId,
+   /*
+    * At this point, bsr points to bsr containing this JobId,
     *  and we are sure that there is at least one fi record.
     */
    lfi = fi = bsr->fi;
    /* Check if this findex is smaller than first item */
    if (findex < fi->findex) {
       if ((findex+1) == fi->findex) {
-	 fi->findex = findex;	      /* extend down */
-	 return;
+         fi->findex = findex;         /* extend down */
+         return;
       }
-      fi = new_findex();	      /* yes, insert before first item */
+      fi = new_findex();              /* yes, insert before first item */
       fi->findex = findex;
       fi->findex2 = findex;
       fi->next = lfi;
@@ -316,22 +552,26 @@ void add_findex(RBSR *bsr, uint32_t JobId, int32_t findex)
    /* Walk down fi chain and find where to insert insert new FileIndex */
    for ( ; fi; fi=fi->next) {
       if (findex == (fi->findex2 + 1)) {  /* extend up */
-	 RBSR_FINDEX *nfi;     
-	 fi->findex2 = findex;
-	 if (fi->next && ((findex+1) == fi->next->findex)) { 
-	    nfi = fi->next;
-	    fi->findex2 = nfi->findex2;
-	    fi->next = nfi->next;
-	    free(nfi);
-	 }
-	 return;
+         RBSR_FINDEX *nfi;
+         fi->findex2 = findex;
+         /*
+          * If the following record contains one higher, merge its
+          *   file index by extending it up.
+          */
+         if (fi->next && ((findex+1) == fi->next->findex)) {
+            nfi = fi->next;
+            fi->findex2 = nfi->findex2;
+            fi->next = nfi->next;
+            free(nfi);
+         }
+         return;
       }
       if (findex < fi->findex) {      /* add before */
-	 if ((findex+1) == fi->findex) {
-	    fi->findex = findex;
-	    return;
-	 }
-	 break;
+         if ((findex+1) == fi->findex) {
+            fi->findex = findex;
+            return;
+         }
+         break;
       }
       lfi = fi;
    }
@@ -343,3 +583,53 @@ void add_findex(RBSR *bsr, uint32_t JobId, int32_t findex)
    lfi->next = fi;
    return;
 }
+
+/*
+ * Add all possible  FileIndexes to the list of BootStrap records.
+ *  Here we are only dealing with JobId's and the FileIndexes
+ *  associated with those JobIds.
+ */
+void add_findex_all(RBSR *bsr, uint32_t JobId)
+{
+   RBSR *nbsr;
+   RBSR_FINDEX *fi;
+
+   if (bsr->fi == NULL) {             /* if no FI add one */
+      /* This is the first FileIndex item in the chain */
+      bsr->fi = new_findex();
+      bsr->JobId = JobId;
+      bsr->fi->findex = 1;
+      bsr->fi->findex2 = INT32_MAX;
+      return;
+   }
+   /* Walk down list of bsrs until we find the JobId */
+   if (bsr->JobId != JobId) {
+      for (nbsr=bsr->next; nbsr; nbsr=nbsr->next) {
+         if (nbsr->JobId == JobId) {
+            bsr = nbsr;
+            break;
+         }
+      }
+
+      if (!nbsr) {                    /* Must add new JobId */
+         /* Add new JobId at end of chain */
+         for (nbsr=bsr; nbsr->next; nbsr=nbsr->next)
+            {  }
+         nbsr->next = new_bsr();
+         nbsr->next->JobId = JobId;
+         nbsr->next->fi = new_findex();
+         nbsr->next->fi->findex = 1;
+         nbsr->next->fi->findex2 = INT32_MAX;
+         return;
+      }
+   }
+
+   /*
+    * At this point, bsr points to bsr containing this JobId,
+    *  and we are sure that there is at least one fi record.
+    */
+   fi = bsr->fi;
+   fi->findex = 1;
+   fi->findex2 = INT32_MAX;
+   return;
+}