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.
+ License as published by the Free Software Foundation and included
+ 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
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- Bacula® is a registered trademark of John Walker.
+ 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.
static BSR *store_exclude(LEX *lc, BSR *bsr);
static BSR *store_stream(LEX *lc, BSR *bsr);
static BSR *store_slot(LEX *lc, BSR *bsr);
+static BSR *store_fileregex(LEX *lc, BSR *bsr);
static bool is_fast_rejection_ok(BSR *bsr);
static bool is_positioning_ok(BSR *bsr);
{"stream", store_stream},
{"slot", store_slot},
{"device", store_device},
+ {"fileregex", store_fileregex},
{NULL, NULL}
-
};
/*
BSR *root_bsr = new_bsr();
BSR *bsr = root_bsr;
- Dmsg1(200, "Enter parse_bsf %s\n", fname);
+ Dmsg1(300, "Enter parse_bsf %s\n", fname);
if ((lc = lex_open_file(lc, fname, s_err)) == NULL) {
berrno be;
Emsg2(M_ERROR_TERM, 0, _("Cannot open bootstrap file %s: %s\n"),
- fname, be.strerror());
+ fname, be.bstrerror());
}
lc->caller_ctx = (void *)jcr;
while ((token=lex_get_token(lc, T_ALL)) != T_EOF) {
- Dmsg1(200, "parse got token=%s\n", lex_tok_to_str(token));
+ Dmsg1(300, "parse got token=%s\n", lex_tok_to_str(token));
if (token == T_EOL) {
continue;
}
for (i=0; items[i].name; i++) {
if (strcasecmp(items[i].name, lc->str) == 0) {
token = lex_get_token(lc, T_ALL);
- Dmsg1 (200, "in T_IDENT got token=%s\n", lex_tok_to_str(token));
+ Dmsg1 (300, "in T_IDENT got token=%s\n", lex_tok_to_str(token));
if (token != T_EQUALS) {
scan_err1(lc, "expected an equals, got: %s", lc->str);
bsr = NULL;
break;
}
- Dmsg1(200, "calling handler for %s\n", items[i].name);
+ Dmsg1(300, "calling handler for %s\n", items[i].name);
/* Call item handler */
bsr = items[i].handler(lc, bsr);
i = -1;
}
}
if (i >= 0) {
- Dmsg1(200, "Keyword = %s\n", lc->str);
+ Dmsg1(300, "Keyword = %s\n", lc->str);
scan_err1(lc, "Keyword %s not found", lc->str);
bsr = NULL;
break;
}
}
lc = lex_close_file(lc);
- Dmsg0(200, "Leave parse_bsf()\n");
+ Dmsg0(300, "Leave parse_bsf()\n");
if (!bsr) {
free_bsr(root_bsr);
root_bsr = NULL;
return bsr;
}
+static BSR *store_fileregex(LEX *lc, BSR *bsr)
+{
+ int token;
+ int rc;
+
+ token = lex_get_token(lc, T_STRING);
+ if (token == T_ERROR) {
+ return NULL;
+ }
+
+ if (bsr->fileregex) free(bsr->fileregex);
+ bsr->fileregex = bstrdup(lc->str);
+
+ if (bsr->fileregex_re == NULL)
+ bsr->fileregex_re = (regex_t *)bmalloc(sizeof(regex_t));
+
+ rc = regcomp(bsr->fileregex_re, bsr->fileregex, REG_EXTENDED|REG_NOSUB);
+ if (rc != 0) {
+ char prbuf[500];
+ regerror(rc, bsr->fileregex_re, prbuf, sizeof(prbuf));
+ Emsg2(M_ERROR, 0, _("REGEX '%s' compile error. ERR=%s\n"),
+ bsr->fileregex, prbuf);
+ return NULL;
+ }
+ return bsr;
+}
static BSR *store_jobtype(LEX *lc, BSR *bsr)
{
}
-
-
-
void dump_bsr(BSR *bsr, bool recurse)
{
int save_debug = debug_level;
free_bsr_item((BSR *)bsr->FileIndex);
free_bsr_item((BSR *)bsr->JobType);
free_bsr_item((BSR *)bsr->JobLevel);
+ if (bsr->fileregex) bfree(bsr->fileregex);
+ if (bsr->fileregex_re) {
+ regfree(bsr->fileregex_re);
+ free(bsr->fileregex_re);
+ }
+ if (bsr->attr) free_attr(bsr->attr);
+
free_bsr(bsr->next);
free(bsr);
}
/*****************************************************************
* Routines for handling volumes
*/
-VOL_LIST *new_restore_volume()
+static VOL_LIST *new_restore_volume()
{
VOL_LIST *vol;
vol = (VOL_LIST *)malloc(sizeof(VOL_LIST));
* returns: 1 if volume added
* 0 if volume already in list
*/
-int add_restore_volume(JCR *jcr, VOL_LIST *vol)
+static bool add_restore_volume(JCR *jcr, VOL_LIST *vol)
{
VOL_LIST *next = jcr->VolList;
+ /* Add volume to volume manager's read list */
+ add_read_volume(jcr, vol->VolumeName);
+
if (!next) { /* list empty ? */
jcr->VolList = vol; /* yes, add volume */
} else {
+ /* Loop through all but last */
for ( ; next->next; next=next->next) {
if (strcmp(vol->VolumeName, next->VolumeName) == 0) {
+ /* Save smallest start file */
if (vol->start_file < next->start_file) {
next->start_file = vol->start_file;
}
- return 0; /* already in list */
+ return false; /* already in list */
}
}
+ /* Check last volume in list */
if (strcmp(vol->VolumeName, next->VolumeName) == 0) {
if (vol->start_file < next->start_file) {
next->start_file = vol->start_file;
}
- return 0; /* already in list */
+ return false; /* already in list */
}
next->next = vol; /* add volume */
}
- return 1;
+ return true;
}
void free_restore_volume_list(JCR *jcr)
{
- VOL_LIST *next = jcr->VolList;
+ VOL_LIST *vol = jcr->VolList;
VOL_LIST *tmp;
- for ( ; next; ) {
- tmp = next->next;
- free(next);
- next = tmp;
+ for ( ; vol; ) {
+ tmp = vol->next;
+ remove_read_volume(jcr, vol->VolumeName);
+ free(vol);
+ vol = tmp;
}
jcr->VolList = NULL;
}
/*
* Build a list of volumes to be processed
*/
- jcr->NumVolumes = 0;
- jcr->CurVolume = 0;
+ jcr->NumReadVolumes = 0;
+ jcr->CurReadVolume = 0;
if (jcr->bsr) {
BSR *bsr = jcr->bsr;
if (!bsr->volume || !bsr->volume->VolumeName) {
vol->Slot = bsrvol->Slot;
vol->start_file = sfile;
if (add_restore_volume(jcr, vol)) {
- jcr->NumVolumes++;
+ jcr->NumReadVolumes++;
Dmsg2(400, "Added volume=%s mediatype=%s\n", vol->VolumeName,
vol->MediaType);
} else {
bstrncpy(vol->VolumeName, p, sizeof(vol->VolumeName));
bstrncpy(vol->MediaType, jcr->dcr->media_type, sizeof(vol->MediaType));
if (add_restore_volume(jcr, vol)) {
- jcr->NumVolumes++;
+ jcr->NumReadVolumes++;
} else {
free((char *)vol);
}