regress: add new many-reload-test to standard scripts

[bacula/bacula] / bacula / src / dird / bsr.h

diff --git a/bacula/src/dird/bsr.h b/bacula/src/dird/bsr.h
index c4cf12f4379d274659ae7cfda93fd8d988e55b26..0e4ae358a8c820b8c50876d58d3012f3aeedf381 100644 (file)
--- a/bacula/src/dird/bsr.h
+++ b/bacula/src/dird/bsr.h
@@ -1,47 +1,35 @@
 /*
-   Bacula® - The Network Backup Solution
+   Bacula(R) - The Network Backup Solution
 
-   Copyright (C) 2002-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2017 Kern Sibbald
 
-   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 and included
-   in the file LICENSE.
+   The original author of Bacula is Kern Sibbald, with contributions
+   from many others, a complete list can be found in the file AUTHORS.
 
-   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 may use this file and others of this release according to the
+   license defined in the LICENSE file, which includes the Affero General
+   Public License, v3.0 ("AGPLv3") and some additional permissions and
+   terms pursuant to its AGPLv3 Section 7.
 
-   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.
+   This notice must be preserved when any source code is 
+   conveyed and/or propagated.
 
-   Bacula® is a registered trademark of Kern Sibbald.
-   The licensor of Bacula is the Free Software Foundation Europe
-   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
-   Switzerland, email:ftf@fsfeurope.org.
+   Bacula(R) is a registered trademark of Kern Sibbald.
 */
 /*
- *
  *   Bootstrap Record header file
  *
  *      BSR (bootstrap record) handling routines split from
  *        ua_restore.c July MMIII
  *
  *     Kern Sibbald, July MMII
- *
- *   Version $Id$
  */
 
 
 
 /* FileIndex entry in restore bootstrap record */
 struct RBSR_FINDEX {
-   RBSR_FINDEX *next;
+   rblink  link;
    int32_t findex;
    int32_t findex2;
 };
@@ -55,12 +43,15 @@ struct RBSR_FINDEX {
  *    on which the Job is stored to the BSR.
  */
 struct RBSR {
-   RBSR *next;                        /* next JobId */
+   rblink link;
    JobId_t JobId;                     /* JobId this bsr */
    uint32_t VolSessionId;
    uint32_t VolSessionTime;
    int      VolCount;                 /* Volume parameter count */
    VOL_PARAMS *VolParams;             /* Volume, start/end file/blocks */
-   RBSR_FINDEX *fi;                   /* File indexes this JobId */
-};
+   rblist *fi_list;                   /* File indexes this JobId */
+   char   *fileregex;                 /* Only restore files matching regex */
 
+   /* If we extend an existing fi, keep the memory for the next insert */
+   RBSR_FINDEX *m_fi;
+};