X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fparse_bsr.c;h=af9c2f4fc92f8ce4b0bbdd8a2f6df48192fc1fbe;hb=bdcddd32cafd978761406b7ad3ca006597c8f1d7;hp=4aa77a03f1f8bf505322733ed1ce5d678e994019;hpb=11913ce5400511449d124bbe2d18fb30e61476b5;p=bacula%2Fbacula diff --git a/bacula/src/stored/parse_bsr.c b/bacula/src/stored/parse_bsr.c old mode 100755 new mode 100644 index 4aa77a03f1..af9c2f4fc9 --- a/bacula/src/stored/parse_bsr.c +++ b/bacula/src/stored/parse_bsr.c @@ -5,25 +5,33 @@ * * Version $Id$ */ - /* - Copyright (C) 2002-2005 Kern Sibbald + 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 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 + 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 - 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" @@ -33,6 +41,7 @@ typedef BSR * (ITEM_HANDLER)(LEX *lc, BSR *bsr); static BSR *store_vol(LEX *lc, BSR *bsr); static BSR *store_mediatype(LEX *lc, BSR *bsr); +static BSR *store_device(LEX *lc, BSR *bsr); static BSR *store_client(LEX *lc, BSR *bsr); static BSR *store_job(LEX *lc, BSR *bsr); static BSR *store_jobid(LEX *lc, BSR *bsr); @@ -75,8 +84,9 @@ struct kw_items items[] = { {"exclude", store_exclude}, {"volfile", store_volfile}, {"volblock", store_volblock}, - {"stream", store_stream}, - {"slot", store_slot}, + {"stream", store_stream}, + {"slot", store_slot}, + {"device", store_device}, {NULL, NULL} }; @@ -128,28 +138,28 @@ BSR *parse_bsr(JCR *jcr, char *fname) 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; @@ -157,7 +167,7 @@ BSR *parse_bsr(JCR *jcr, char *fname) } } 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; @@ -167,7 +177,7 @@ BSR *parse_bsr(JCR *jcr, char *fname) } } 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; @@ -272,6 +282,28 @@ static BSR *store_mediatype(LEX *lc, BSR *bsr) return bsr; } +/* Shove the Device name in each Volume in the current bsr */ +static BSR *store_device(LEX *lc, BSR *bsr) +{ + int token; + + token = lex_get_token(lc, T_STRING); + if (token == T_ERROR) { + return NULL; + } + if (!bsr->volume) { + Emsg1(M_ERROR,0, _("Device \"%s\" in bsr at inappropriate place.\n"), + lc->str); + return bsr; + } + BSR_VOLUME *bv; + for (bv=bsr->volume; bv; bv=bv->next) { + bstrncpy(bv->device, lc->str, sizeof(bv->device)); + } + return bsr; +} + + static BSR *store_client(LEX *lc, BSR *bsr) { @@ -417,7 +449,7 @@ static BSR *store_count(LEX *lc, BSR *bsr) static BSR *store_jobtype(LEX *lc, BSR *bsr) { /* *****FIXME****** */ - Dmsg0(-1, "JobType not yet implemented\n"); + Pmsg0(-1, _("JobType not yet implemented\n")); return bsr; } @@ -425,7 +457,7 @@ static BSR *store_jobtype(LEX *lc, BSR *bsr) static BSR *store_joblevel(LEX *lc, BSR *bsr) { /* *****FIXME****** */ - Dmsg0(-1, "JobLevel not yet implemented\n"); + Pmsg0(-1, _("JobLevel not yet implemented\n")); return bsr; } @@ -607,7 +639,12 @@ static BSR *store_slot(LEX *lc, BSR *bsr) if (token == T_ERROR) { return NULL; } - bsr->Slot = lc->pint32_val; + if (!bsr->volume) { + Emsg1(M_ERROR,0, _("Slot %d in bsr at inappropriate place.\n"), + lc->pint32_val); + return bsr; + } + bsr->volume->Slot = lc->pint32_val; scan_to_eol(lc); return bsr; } @@ -627,7 +664,7 @@ static BSR *store_exclude(LEX *lc, BSR *bsr) void dump_volfile(BSR_VOLFILE *volfile) { if (volfile) { - Dmsg2(-1, "VolFile : %u-%u\n", volfile->sfile, volfile->efile); + Pmsg2(-1, _("VolFile : %u-%u\n"), volfile->sfile, volfile->efile); dump_volfile(volfile->next); } } @@ -635,7 +672,7 @@ void dump_volfile(BSR_VOLFILE *volfile) void dump_volblock(BSR_VOLBLOCK *volblock) { if (volblock) { - Dmsg2(-1, "VolBlock : %u-%u\n", volblock->sblock, volblock->eblock); + Pmsg2(-1, _("VolBlock : %u-%u\n"), volblock->sblock, volblock->eblock); dump_volblock(volblock->next); } } @@ -645,9 +682,9 @@ void dump_findex(BSR_FINDEX *FileIndex) { if (FileIndex) { if (FileIndex->findex == FileIndex->findex2) { - Dmsg1(-1, "FileIndex : %u\n", FileIndex->findex); + Pmsg1(-1, _("FileIndex : %u\n"), FileIndex->findex); } else { - Dmsg2(-1, "FileIndex : %u-%u\n", FileIndex->findex, FileIndex->findex2); + Pmsg2(-1, _("FileIndex : %u-%u\n"), FileIndex->findex, FileIndex->findex2); } dump_findex(FileIndex->next); } @@ -657,9 +694,9 @@ void dump_jobid(BSR_JOBID *jobid) { if (jobid) { if (jobid->JobId == jobid->JobId2) { - Dmsg1(-1, "JobId : %u\n", jobid->JobId); + Pmsg1(-1, _("JobId : %u\n"), jobid->JobId); } else { - Dmsg2(-1, "JobId : %u-%u\n", jobid->JobId, jobid->JobId2); + Pmsg2(-1, _("JobId : %u-%u\n"), jobid->JobId, jobid->JobId2); } dump_jobid(jobid->next); } @@ -669,9 +706,9 @@ void dump_sessid(BSR_SESSID *sessid) { if (sessid) { if (sessid->sessid == sessid->sessid2) { - Dmsg1(-1, "SessId : %u\n", sessid->sessid); + Pmsg1(-1, _("SessId : %u\n"), sessid->sessid); } else { - Dmsg2(-1, "SessId : %u-%u\n", sessid->sessid, sessid->sessid2); + Pmsg2(-1, _("SessId : %u-%u\n"), sessid->sessid, sessid->sessid2); } dump_sessid(sessid->next); } @@ -680,7 +717,10 @@ void dump_sessid(BSR_SESSID *sessid) void dump_volume(BSR_VOLUME *volume) { if (volume) { - Dmsg1(-1, "VolumeName : %s\n", volume->VolumeName); + Pmsg1(-1, _("VolumeName : %s\n"), volume->VolumeName); + Pmsg1(-1, _(" MediaType : %s\n"), volume->MediaType); + Pmsg1(-1, _(" Device : %s\n"), volume->device); + Pmsg1(-1, _(" Slot : %d\n"), volume->Slot); dump_volume(volume->next); } } @@ -689,7 +729,7 @@ void dump_volume(BSR_VOLUME *volume) void dump_client(BSR_CLIENT *client) { if (client) { - Dmsg1(-1, "Client : %s\n", client->ClientName); + Pmsg1(-1, _("Client : %s\n"), client->ClientName); dump_client(client->next); } } @@ -697,7 +737,7 @@ void dump_client(BSR_CLIENT *client) void dump_job(BSR_JOB *job) { if (job) { - Dmsg1(-1, "Job : %s\n", job->Job); + Pmsg1(-1, _("Job : %s\n"), job->Job); dump_job(job->next); } } @@ -705,26 +745,23 @@ void dump_job(BSR_JOB *job) void dump_sesstime(BSR_SESSTIME *sesstime) { if (sesstime) { - Dmsg1(-1, "SessTime : %u\n", sesstime->sesstime); + Pmsg1(-1, _("SessTime : %u\n"), sesstime->sesstime); dump_sesstime(sesstime->next); } } - - - void dump_bsr(BSR *bsr, bool recurse) { int save_debug = debug_level; debug_level = 1; if (!bsr) { - Dmsg0(-1, "BSR is NULL\n"); + Pmsg0(-1, _("BSR is NULL\n")); debug_level = save_debug; return; } - Dmsg1(-1, "Next : 0x%x\n", bsr->next); - Dmsg1(-1, "Root bsr : 0x%x\n", bsr->root); + Pmsg1(-1, _("Next : 0x%x\n"), bsr->next); + Pmsg1(-1, _("Root bsr : 0x%x\n"), bsr->root); dump_volume(bsr->volume); dump_sessid(bsr->sessid); dump_sesstime(bsr->sesstime); @@ -734,19 +771,16 @@ void dump_bsr(BSR *bsr, bool recurse) dump_jobid(bsr->JobId); dump_job(bsr->job); dump_findex(bsr->FileIndex); - if (bsr->Slot) { - Dmsg1(-1, "Slot : %u\n", bsr->Slot); - } if (bsr->count) { - Dmsg1(-1, "count : %u\n", bsr->count); - Dmsg1(-1, "found : %u\n", bsr->found); + Pmsg1(-1, _("count : %u\n"), bsr->count); + Pmsg1(-1, _("found : %u\n"), bsr->found); } - Dmsg1(-1, "done : %s\n", bsr->done?"yes":"no"); - Dmsg1(-1, "positioning : %d\n", bsr->use_positioning); - Dmsg1(-1, "fast_reject : %d\n", bsr->use_fast_rejection); + Pmsg1(-1, _("done : %s\n"), bsr->done?_("yes"):_("no")); + Pmsg1(-1, _("positioning : %d\n"), bsr->use_positioning); + Pmsg1(-1, _("fast_reject : %d\n"), bsr->use_fast_rejection); if (recurse && bsr->next) { - Dmsg0(-1, "\n"); + Pmsg0(-1, "\n"); dump_bsr(bsr->next, true); } debug_level = save_debug; @@ -790,7 +824,7 @@ void free_bsr(BSR *bsr) /***************************************************************** * Routines for handling volumes */ -VOL_LIST *new_vol() +VOL_LIST *new_restore_volume() { VOL_LIST *vol; vol = (VOL_LIST *)malloc(sizeof(VOL_LIST)); @@ -805,7 +839,7 @@ VOL_LIST *new_vol() * returns: 1 if volume added * 0 if volume already in list */ -int add_vol(JCR *jcr, VOL_LIST *vol) +int add_restore_volume(JCR *jcr, VOL_LIST *vol) { VOL_LIST *next = jcr->VolList; @@ -831,7 +865,7 @@ int add_vol(JCR *jcr, VOL_LIST *vol) return 1; } -void free_vol_list(JCR *jcr) +void free_restore_volume_list(JCR *jcr) { VOL_LIST *next = jcr->VolList; VOL_LIST *tmp; @@ -848,7 +882,7 @@ void free_vol_list(JCR *jcr) * Create a list of Volumes (and Slots and Start positions) to be * used in the current restore job. */ -void create_vol_list(JCR *jcr) +void create_restore_volume_list(JCR *jcr) { char *p, *n; VOL_LIST *vol; @@ -856,8 +890,8 @@ void create_vol_list(JCR *jcr) /* * 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) { @@ -876,12 +910,14 @@ void create_vol_list(JCR *jcr) } /* Now add volumes for this bsr */ for (bsrvol = bsr->volume; bsrvol; bsrvol=bsrvol->next) { - vol = new_vol(); + vol = new_restore_volume(); bstrncpy(vol->VolumeName, bsrvol->VolumeName, sizeof(vol->VolumeName)); bstrncpy(vol->MediaType, bsrvol->MediaType, sizeof(vol->MediaType)); + bstrncpy(vol->device, bsrvol->device, sizeof(vol->device)); + vol->Slot = bsrvol->Slot; vol->start_file = sfile; - if (add_vol(jcr, vol)) { - jcr->NumVolumes++; + if (add_restore_volume(jcr, vol)) { + jcr->NumReadVolumes++; Dmsg2(400, "Added volume=%s mediatype=%s\n", vol->VolumeName, vol->MediaType); } else { @@ -898,11 +934,11 @@ void create_vol_list(JCR *jcr) if (n) { *n++ = 0; /* Terminate name */ } - vol = new_vol(); + vol = new_restore_volume(); bstrncpy(vol->VolumeName, p, sizeof(vol->VolumeName)); bstrncpy(vol->MediaType, jcr->dcr->media_type, sizeof(vol->MediaType)); - if (add_vol(jcr, vol)) { - jcr->NumVolumes++; + if (add_restore_volume(jcr, vol)) { + jcr->NumReadVolumes++; } else { free((char *)vol); }