X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Fbutil.c;h=ed91e0497fcdfe44e1e699ea9989eb4b9c639580;hb=bdcddd32cafd978761406b7ad3ca006597c8f1d7;hp=2fae0494d3cae600f6d184821c7472c2e473d9f5;hpb=f4fadeaf83a912e0a19c19eacd0c7113b21f0a67;p=bacula%2Fbacula diff --git a/bacula/src/stored/butil.c b/bacula/src/stored/butil.c index 2fae0494d3..ed91e0497f 100644 --- a/bacula/src/stored/butil.c +++ b/bacula/src/stored/butil.c @@ -1,3 +1,30 @@ +/* + Bacula® - The Network Backup Solution + + Copyright (C) 2000-2007 Free Software Foundation Europe e.V. + + 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 + 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., 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. +*/ /* * * Utility routines for "tool" programs such as bscan, bls, @@ -11,25 +38,6 @@ * * Version $Id$ */ -/* - Copyright (C) 2000-2004 Kern Sibbald and John Walker - - 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. - - 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. - - */ #include "bacula.h" #include "stored.h" @@ -48,19 +56,19 @@ char *rec_state_to_str(DEV_RECORD *rec) static char buf[200]; buf[0] = 0; if (rec->state & REC_NO_HEADER) { - strcat(buf, "Nohdr,"); + strcat(buf, _("Nohdr,")); } if (is_partial_record(rec)) { - strcat(buf, "partial,"); + strcat(buf, _("partial,")); } if (rec->state & REC_BLOCK_EMPTY) { - strcat(buf, "empty,"); + strcat(buf, _("empty,")); } if (rec->state & REC_NO_MATCH) { - strcat(buf, "Nomatch,"); + strcat(buf, _("Nomatch,")); } if (rec->state & REC_CONTINUATION) { - strcat(buf, "cont,"); + strcat(buf, _("cont,")); } if (buf[0]) { buf[strlen(buf)-1] = 0; @@ -74,14 +82,15 @@ char *rec_state_to_str(DEV_RECORD *rec) * tools (e.g. bls, bextract, bscan, ...) */ JCR *setup_jcr(const char *name, char *dev_name, BSR *bsr, - const char *VolumeName, int mode) + const char *VolumeName, int mode) { DCR *dcr; JCR *jcr = new_jcr(sizeof(JCR), my_free_jcr); jcr->bsr = bsr; jcr->VolSessionId = 1; jcr->VolSessionTime = (uint32_t)time(NULL); - jcr->NumVolumes = 0; + jcr->NumReadVolumes = 0; + jcr->NumWriteVolumes = 0; jcr->JobId = 0; jcr->JobType = JT_CONSOLE; jcr->JobLevel = L_FULL; @@ -97,6 +106,9 @@ JCR *setup_jcr(const char *name, char *dev_name, BSR *bsr, jcr->fileset_md5 = get_pool_memory(PM_FNAME); pm_strcpy(jcr->fileset_md5, "Dummy.fileset.md5"); + init_autochangers(); + create_volume_list(); + dcr = setup_to_access_device(jcr, dev_name, VolumeName, mode); if (!dcr) { return NULL; @@ -104,8 +116,8 @@ JCR *setup_jcr(const char *name, char *dev_name, BSR *bsr, if (!bsr && VolumeName) { bstrncpy(dcr->VolumeName, VolumeName, sizeof(dcr->VolumeName)); } - strcpy(dcr->pool_name, "Default"); - strcpy(dcr->pool_type, "Backup"); + bstrncpy(dcr->pool_name, "Default", sizeof(dcr->pool_name)); + bstrncpy(dcr->pool_type, "Backup", sizeof(dcr->pool_type)); return jcr; } @@ -114,7 +126,8 @@ JCR *setup_jcr(const char *name, char *dev_name, BSR *bsr, * If the caller wants read access, acquire the device, otherwise, * the caller will do it. */ -static DCR *setup_to_access_device(JCR *jcr, char *dev_name, const char *VolumeName, int mode) +static DCR *setup_to_access_device(JCR *jcr, char *dev_name, + const char *VolumeName, int mode) { DEVICE *dev; char *p; @@ -122,59 +135,66 @@ static DCR *setup_to_access_device(JCR *jcr, char *dev_name, const char *VolumeN DCR *dcr; char VolName[MAX_NAME_LENGTH]; + init_reservations_lock(); + /* * If no volume name already given and no bsr, and it is a file, * try getting name from Filename */ if (VolumeName) { bstrncpy(VolName, VolumeName, sizeof(VolName)); + if (strlen(VolumeName) >= MAX_NAME_LENGTH) { + Jmsg0(jcr, M_ERROR, 0, _("Volume name or names is too long. Please use a .bsr file.\n")); + } } else { VolName[0] = 0; } if (!jcr->bsr && VolName[0] == 0) { if (strncmp(dev_name, "/dev/", 5) != 0) { - /* Try stripping file part */ - p = dev_name + strlen(dev_name); + /* Try stripping file part */ + p = dev_name + strlen(dev_name); - while (p >= dev_name && *p != '/') - p--; - if (*p == '/') { - bstrncpy(VolName, p+1, sizeof(VolName)); - *p = 0; - } + while (p >= dev_name && !IsPathSeparator(*p)) + p--; + if (IsPathSeparator(*p)) { + bstrncpy(VolName, p+1, sizeof(VolName)); + *p = 0; + } } } if ((device=find_device_res(dev_name, mode)) == NULL) { Jmsg2(jcr, M_FATAL, 0, _("Cannot find device \"%s\" in config file %s.\n"), - dev_name, configfile); + dev_name, configfile); return NULL; } - jcr->device = device; - dev = init_dev(NULL, device); + dev = init_dev(jcr, device); if (!dev) { Jmsg1(jcr, M_FATAL, 0, _("Cannot init device %s\n"), dev_name); return NULL; } device->dev = dev; - dcr = new_dcr(jcr, dev); + jcr->dcr = dcr = new_dcr(jcr, NULL, dev); if (VolName[0]) { bstrncpy(dcr->VolumeName, VolName, sizeof(dcr->VolumeName)); } bstrncpy(dcr->dev_name, device->device_name, sizeof(dcr->dev_name)); - if (!first_open_device(dev)) { - Jmsg1(jcr, M_FATAL, 0, _("Cannot open %s\n"), dcr->dev_name); - return NULL; - } - Dmsg0(90, "Device opened for read.\n"); - create_vol_list(jcr); + create_restore_volume_list(jcr); - if (mode) { /* read only access? */ - if (!acquire_device_for_read(jcr)) { - return NULL; + if (mode) { /* read only access? */ + Dmsg0(100, "Acquire device for read\n"); + if (!acquire_device_for_read(dcr)) { + return NULL; + } + jcr->read_dcr = dcr; + } else { + if (!first_open_device(dcr)) { + Jmsg1(jcr, M_FATAL, 0, _("Cannot open %s\n"), dev->print_name()); + return NULL; } + jcr->dcr = dcr; /* write dcr */ } return dcr; } @@ -203,7 +223,7 @@ static void my_free_jcr(JCR *jcr) jcr->fileset_md5 = NULL; } if (jcr->VolList) { - free_vol_list(jcr); + free_restore_volume_list(jcr); } if (jcr->dcr) { free_dcr(jcr->dcr); @@ -218,44 +238,52 @@ static void my_free_jcr(JCR *jcr) * device name on command line (or default). * * Returns: NULL on failure - * Device resource pointer on success + * Device resource pointer on success */ static DEVRES *find_device_res(char *device_name, int read_access) { bool found = false; DEVRES *device; + Dmsg0(900, "Enter find_device_res\n"); LockRes(); foreach_res(device, R_DEVICE) { + Dmsg2(900, "Compare %s and %s\n", device->device_name, device_name); if (strcmp(device->device_name, device_name) == 0) { - found = true; - break; + found = true; + break; } } if (!found) { /* Search for name of Device resource rather than archive name */ if (device_name[0] == '"') { - strcpy(device_name, device_name+1); - int len = strlen(device_name); - if (len > 0) { - device_name[len-1] = 0; /* zap trailing " */ - } + int len = strlen(device_name); + bstrncpy(device_name, device_name+1, len+1); + len--; + if (len > 0) { + device_name[len-1] = 0; /* zap trailing " */ + } } foreach_res(device, R_DEVICE) { - if (strcmp(device->hdr.name, device_name) == 0) { - found = true; - break; - } + Dmsg2(900, "Compare %s and %s\n", device->hdr.name, device_name); + if (strcmp(device->hdr.name, device_name) == 0) { + found = true; + break; + } } } UnlockRes(); if (!found) { Pmsg2(0, _("Could not find device \"%s\" in config file %s.\n"), device_name, - configfile); + configfile); return NULL; } - Pmsg2(0, _("Using device: \"%s\" for %s.\n"), device_name, - read_access?"reading":"writing"); + if (read_access) { + Pmsg1(0, _("Using device: \"%s\" for reading.\n"), device_name); + } + else { + Pmsg1(0, _("Using device: \"%s\" for writing.\n"), device_name); + } return device; }