X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Flabel.c;h=99f285b550d8be7b5e6193ed57ba5fb799561a60;hb=4288f3abada794c77df8cc43da96ae09419ac203;hp=063375c54838c6d47981b59994ecf2d8003ac7b2;hpb=19c5fc982177c511144ede9bbbae16f323efdea6;p=bacula%2Fbacula diff --git a/bacula/src/stored/label.c b/bacula/src/stored/label.c index 063375c548..99f285b550 100644 --- a/bacula/src/stored/label.c +++ b/bacula/src/stored/label.c @@ -1,23 +1,14 @@ -/* - * - * label.c Bacula routines to handle labels - * - * Kern Sibbald, MM - * - * - * Version $Id$ - */ /* Bacula® - The Network Backup Solution - Copyright (C) 2000-2006 Free Software Foundation Europe e.V. + Copyright (C) 2000-2009 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 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 @@ -29,11 +20,20 @@ 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. */ +/* + * + * label.c Bacula routines to handle labels + * + * Kern Sibbald, MM + * + * + * Version $Id$ + */ #include "bacula.h" /* pull in global headers */ #include "stored.h" /* pull in Storage Deamon headers */ @@ -67,7 +67,7 @@ static void create_volume_label_record(DCR *dcr, DEV_RECORD *rec); int read_dev_volume_label(DCR *dcr) { JCR *jcr = dcr->jcr; - DEVICE *dev = dcr->dev; + DEVICE * volatile dev = dcr->dev; char *VolName = dcr->VolumeName; DEV_RECORD *record; bool ok = false; @@ -77,7 +77,7 @@ int read_dev_volume_label(DCR *dcr) bool have_ansi_label = false; Dmsg4(100, "Enter read_volume_label res=%d device=%s vol=%s dev_Vol=%s\n", - dev->reserved_device, dev->print_name(), VolName, + dev->num_reserved(), dev->print_name(), VolName, dev->VolHdr.VolumeName[0]?dev->VolHdr.VolumeName:"*NULL*"); if (!dev->is_open()) { @@ -85,25 +85,6 @@ int read_dev_volume_label(DCR *dcr) return VOL_IO_ERROR; } } - if (dev->is_labeled()) { /* did we already read label? */ - /* Compare Volume Names allow special wild card */ - if (VolName && *VolName && *VolName != '*' && strcmp(dev->VolHdr.VolumeName, VolName) != 0) { - Mmsg(jcr->errmsg, _("Wrong Volume mounted on device %s: Wanted %s have %s\n"), - dev->print_name(), VolName, dev->VolHdr.VolumeName); - /* - * Cancel Job if too many label errors - * => we are in a loop - */ - if (!dev->poll && jcr->label_errors++ > 100) { - Jmsg(jcr, M_FATAL, 0, _("Too many tries: %s"), jcr->errmsg); - } - Dmsg0(150, "return VOL_NAME_ERROR\n"); - stat = VOL_NAME_ERROR; - goto bail_out; - } - Dmsg0(30, "Leave read_volume_label() VOL_OK\n"); - return VOL_OK; /* label already read */ - } dev->clear_labeled(); dev->clear_append(); @@ -113,13 +94,12 @@ int read_dev_volume_label(DCR *dcr) if (!dev->rewind(dcr)) { Mmsg(jcr->errmsg, _("Couldn't rewind device %s: ERR=%s\n"), dev->print_name(), dev->print_errmsg()); - Dmsg1(30, "return VOL_NO_MEDIA: %s", jcr->errmsg); + Dmsg1(130, "return VOL_NO_MEDIA: %s", jcr->errmsg); return VOL_NO_MEDIA; } bstrncpy(dev->VolHdr.Id, "**error**", sizeof(dev->VolHdr.Id)); /* Read ANSI/IBM label if so requested */ - want_ansi_label = dcr->VolCatInfo.LabelType != B_BACULA_LABEL || dcr->device->label_type != B_BACULA_LABEL; if (want_ansi_label || dev->has_cap(CAP_CHECKLABELS)) { @@ -147,28 +127,32 @@ int read_dev_volume_label(DCR *dcr) record = new_record(); empty_block(block); - Dmsg0(90, "Big if statement in read_volume_label\n"); + Dmsg0(130, "Big if statement in read_volume_label\n"); if (!read_block_from_dev(dcr, NO_BLOCK_NUMBER_CHECK)) { Mmsg(jcr->errmsg, _("Requested Volume \"%s\" on %s is not a Bacula " "labeled Volume, because: ERR=%s"), NPRT(VolName), dev->print_name(), dev->print_errmsg()); - Dmsg1(30, "%s", jcr->errmsg); + Dmsg1(130, "%s", jcr->errmsg); } else if (!read_record_from_block(dcr, block, record)) { Mmsg(jcr->errmsg, _("Could not read Volume label from block.\n")); - Dmsg1(30, "%s", jcr->errmsg); + Dmsg1(130, "%s", jcr->errmsg); } else if (!unser_volume_label(dev, record)) { Mmsg(jcr->errmsg, _("Could not unserialize Volume label: ERR=%s\n"), dev->print_errmsg()); - Dmsg1(30, "%s", jcr->errmsg); + Dmsg1(130, "%s", jcr->errmsg); } else if (strcmp(dev->VolHdr.Id, BaculaId) != 0 && strcmp(dev->VolHdr.Id, OldBaculaId) != 0) { Mmsg(jcr->errmsg, _("Volume Header Id bad: %s\n"), dev->VolHdr.Id); - Dmsg1(30, "%s", jcr->errmsg); + Dmsg1(130, "%s", jcr->errmsg); } else { ok = true; } free_record(record); /* finished reading Volume record */ + if (!dev->is_volume_to_unload()) { + dev->clear_unload(); + } + if (!ok) { if (forge_on || jcr->ignore_label_errors) { dev->set_labeled(); /* set has Bacula label */ @@ -192,7 +176,7 @@ int read_dev_volume_label(DCR *dcr) dev->VolHdr.VerNum != OldCompatibleBaculaTapeVersion2) { Mmsg(jcr->errmsg, _("Volume on %s has wrong Bacula version. Wanted %d got %d\n"), dev->print_name(), BaculaTapeVersion, dev->VolHdr.VerNum); - Dmsg1(30, "VOL_VERSION_ERROR: %s", jcr->errmsg); + Dmsg1(130, "VOL_VERSION_ERROR: %s", jcr->errmsg); stat = VOL_VERSION_ERROR; goto bail_out; } @@ -203,7 +187,7 @@ int read_dev_volume_label(DCR *dcr) if (dev->VolHdr.LabelType != PRE_LABEL && dev->VolHdr.LabelType != VOL_LABEL) { Mmsg(jcr->errmsg, _("Volume on %s has bad Bacula label type: %x\n"), dev->print_name(), dev->VolHdr.LabelType); - Dmsg1(30, "%s", jcr->errmsg); + Dmsg1(130, "%s", jcr->errmsg); if (!dev->poll && jcr->label_errors++ > 100) { Jmsg(jcr, M_FATAL, 0, _("Too many tries: %s"), jcr->errmsg); } @@ -213,14 +197,13 @@ int read_dev_volume_label(DCR *dcr) } dev->set_labeled(); /* set has Bacula label */ - new_volume(dcr, dev->VolHdr.VolumeName); /* Compare Volume Names */ - Dmsg2(30, "Compare Vol names: VolName=%s hdr=%s\n", VolName?VolName:"*", dev->VolHdr.VolumeName); + Dmsg2(130, "Compare Vol names: VolName=%s hdr=%s\n", VolName?VolName:"*", dev->VolHdr.VolumeName); if (VolName && *VolName && *VolName != '*' && strcmp(dev->VolHdr.VolumeName, VolName) != 0) { Mmsg(jcr->errmsg, _("Wrong Volume mounted on device %s: Wanted %s have %s\n"), dev->print_name(), VolName, dev->VolHdr.VolumeName); - Dmsg1(30, "%s", jcr->errmsg); + Dmsg1(130, "%s", jcr->errmsg); /* * Cancel Job if too many label errors * => we are in a loop @@ -232,12 +215,12 @@ int read_dev_volume_label(DCR *dcr) stat = VOL_NAME_ERROR; goto bail_out; } - Dmsg1(30, "Copy vol_name=%s\n", dev->VolHdr.VolumeName); + if (debug_level >= 10) { dump_volume_label(dev); } - Dmsg0(30, "Leave read_volume_label() VOL_OK\n"); + Dmsg0(130, "Leave read_volume_label() VOL_OK\n"); /* If we are a streaming device, we only get one chance to read */ if (!dev->has_cap(CAP_STREAM)) { dev->rewind(dcr); @@ -249,6 +232,16 @@ int read_dev_volume_label(DCR *dcr) } } } + + Dmsg1(100, "Call reserve_volume=%s\n", dev->VolHdr.VolumeName); + if (reserve_volume(dcr, dev->VolHdr.VolumeName) == NULL) { + Mmsg2(jcr->errmsg, _("Could not reserve volume %s on %s\n"), + dev->VolHdr.VolumeName, dev->print_name()); + Dmsg2(150, "Could not reserve volume %s on %s\n", dev->VolHdr.VolumeName, dev->print_name()); + stat = VOL_NAME_ERROR; + goto bail_out; + } + empty_block(block); return VOL_OK; @@ -272,7 +265,7 @@ bool write_volume_label_to_block(DCR *dcr) JCR *jcr = dcr->jcr; DEV_BLOCK *block = dcr->block; - Dmsg0(20, "write Label in write_volume_label_to_block()\n"); + Dmsg0(130, "write Label in write_volume_label_to_block()\n"); memset(&rec, 0, sizeof(rec)); rec.data = get_memory(SER_LENGTH_Volume_Label); empty_block(block); /* Volume label always at beginning */ @@ -286,7 +279,8 @@ bool write_volume_label_to_block(DCR *dcr) dev->print_name()); return false; } else { - Dmsg1(90, "Wrote label of %d bytes to block\n", rec.data_len); + Dmsg2(130, "Wrote label of %d bytes to block. Vol=%s\n", rec.data_len, + dcr->VolumeName); } free_pool_memory(rec.data); return true; @@ -305,19 +299,25 @@ bool write_volume_label_to_block(DCR *dcr) bool write_new_volume_label_to_dev(DCR *dcr, const char *VolName, const char *PoolName, bool relabel, bool dvdnow) { - DEVICE *dev = dcr->dev; + DEVICE * volatile dev = dcr->dev; - Dmsg0(99, "write_volume_label()\n"); + Dmsg0(150, "write_volume_label()\n"); empty_block(dcr->block); - - /* If relabeling, truncate the device */ - if (relabel && !dev->truncate(dcr)) { + if (*VolName == 0) { + Pmsg0(0, "=== ERROR: write_new_volume_label_to_dev called with NULL VolName\n"); goto bail_out; } if (relabel) { - dev->close_part(dcr); /* make sure closed for rename */ + volume_unused(dcr); /* mark current volume unused */ + /* Truncate device */ + if (!dev->truncate(dcr)) { + goto bail_out; + } + if (!dev->is_tape()) { + dev->close_part(dcr); /* make sure DVD/file closed for rename */ + } } /* Set the new filename for open, ... */ @@ -327,18 +327,22 @@ bool write_new_volume_label_to_dev(DCR *dcr, const char *VolName, if (dev->open(dcr, OPEN_READ_WRITE) < 0) { /* If device is not tape, attempt to create it */ if (dev->is_tape() || dev->open(dcr, CREATE_READ_WRITE) < 0) { + Jmsg3(dcr->jcr, M_WARNING, 0, _("Open device %s Volume \"%s\" failed: ERR=%s\n"), + dev->print_name(), dcr->VolumeName, dev->bstrerror()); goto bail_out; } } Dmsg1(150, "Label type=%d\n", dev->label_type); if (!dev->rewind(dcr)) { - dev->clear_volhdr(); - Dmsg2(30, "Bad status on %s from rewind: ERR=%s\n", dev->print_name(), dev->print_errmsg()); + Dmsg2(130, "Bad status on %s from rewind: ERR=%s\n", dev->print_name(), dev->print_errmsg()); if (!forge_on) { goto bail_out; } } + /* Temporarily mark in append state to enable writing */ + dev->set_append(); + /* Create PRE_LABEL or VOL_LABEL if DVD */ create_volume_label(dev, VolName, PoolName, dvdnow); @@ -359,18 +363,16 @@ bool write_new_volume_label_to_dev(DCR *dcr, const char *VolName, create_volume_label_record(dcr, dcr->rec); dcr->rec->Stream = 0; - /* Temporarily mark in append state to enable writing */ - dev->set_append(); if (!write_record_to_block(dcr->block, dcr->rec)) { - Dmsg2(30, "Bad Label write on %s: ERR=%s\n", dev->print_name(), dev->print_errmsg()); + Dmsg2(130, "Bad Label write on %s: ERR=%s\n", dev->print_name(), dev->print_errmsg()); goto bail_out; } else { - Dmsg2(30, "Wrote label of %d bytes to %s\n", dcr->rec->data_len, dev->print_name()); + Dmsg2(130, "Wrote label of %d bytes to %s\n", dcr->rec->data_len, dev->print_name()); } - Dmsg0(99, "Call write_block_to_dev()\n"); + Dmsg0(130, "Call write_block_to_dev()\n"); if (!write_block_to_dev(dcr)) { - Dmsg2(30, "Bad Label write on %s: ERR=%s\n", dev->print_name(), dev->print_errmsg()); + Dmsg2(130, "Bad Label write on %s: ERR=%s\n", dev->print_name(), dev->print_errmsg()); goto bail_out; } @@ -378,12 +380,12 @@ bool write_new_volume_label_to_dev(DCR *dcr, const char *VolName, if (dev->is_dvd() && dvdnow) { Dmsg1(150, "New VolName=%s\n", dev->VolCatInfo.VolCatName); if (!dvd_write_part(dcr)) { - Dmsg2(30, "Bad DVD write on %s: ERR=%s\n", dev->print_name(), dev->print_errmsg()); + Dmsg2(130, "Bad DVD write on %s: ERR=%s\n", dev->print_name(), dev->print_errmsg()); goto bail_out; } } - Dmsg0(99, " Wrote block to device\n"); + Dmsg0(130, " Wrote block to device\n"); if (dev->weof(1)) { dev->set_labeled(); @@ -393,11 +395,20 @@ bool write_new_volume_label_to_dev(DCR *dcr, const char *VolName, if (debug_level >= 20) { dump_volume_label(dev); } - new_volume(dcr, VolName); + Dmsg0(100, "Call reserve_volume\n"); + if (reserve_volume(dcr, VolName) == NULL) { + Mmsg2(dcr->jcr->errmsg, _("Could not reserve volume %s on %s\n"), + dev->VolHdr.VolumeName, dev->print_name()); + Dmsg1(100, "%s", dcr->jcr->errmsg); + goto bail_out; + } + dev = dcr->dev; /* may have changed in reserve_volume */ + dev->clear_append(); /* remove append since this is PRE_LABEL */ return true; bail_out: + volume_unused(dcr); dev->clear_volhdr(); dev->clear_append(); /* remove append since this is PRE_LABEL */ return false; @@ -405,7 +416,8 @@ bail_out: /* * Write a volume label. This is ONLY called if we have a valid Bacula - * label of type PRE_LABEL; + * label of type PRE_LABEL or we are recyling an existing Volume. + * * Returns: true if OK * false if unable to write it */ @@ -415,6 +427,8 @@ bool rewrite_volume_label(DCR *dcr, bool recycle) JCR *jcr = dcr->jcr; if (dev->open(dcr, OPEN_READ_WRITE) < 0) { + Jmsg3(jcr, M_WARNING, 0, _("Open device %s Volume \"%s\" failed: ERR=%s\n"), + dev->print_name(), dcr->VolumeName, dev->bstrerror()); return false; } Dmsg2(190, "set append found freshly labeled volume. fd=%d dev=%x\n", dev->fd(), dev); @@ -424,6 +438,7 @@ bool rewrite_volume_label(DCR *dcr, bool recycle) Dmsg0(200, "Error from write volume label.\n"); return false; } + Dmsg1(150, "wrote vol label to block. Vol=%s\n", dcr->VolumeName); dev->VolCatInfo.VolCatBytes = 0; /* reset byte count */ @@ -441,6 +456,8 @@ bool rewrite_volume_label(DCR *dcr, bool recycle) return false; } if (recycle) { + Dmsg1(150, "Doing recycle. Vol=%s\n", dcr->VolumeName); +// volume_unused(dcr); /* mark volume unused */ if (!dev->truncate(dcr)) { Jmsg2(jcr, M_FATAL, 0, _("Truncate error on device %s: ERR=%s\n"), dev->print_name(), dev->print_errmsg()); @@ -487,15 +504,17 @@ bool rewrite_volume_label(DCR *dcr, bool recycle) if (recycle) { dev->VolCatInfo.VolCatMounts++; dev->VolCatInfo.VolCatRecycles++; + dir_create_jobmedia_record(dcr, true); } else { dev->VolCatInfo.VolCatMounts = 1; dev->VolCatInfo.VolCatRecycles = 0; dev->VolCatInfo.VolCatWrites = 1; dev->VolCatInfo.VolCatReads = 1; } - Dmsg0(150, "dir_update_vol_info. Set Append\n"); + Dmsg1(150, "dir_update_vol_info. Set Append vol=%s\n", dcr->VolumeName); bstrncpy(dev->VolCatInfo.VolCatStatus, "Append", sizeof(dev->VolCatInfo.VolCatStatus)); - if (!dir_update_volume_info(dcr, true)) { /* indicate doing relabel */ + bstrncpy(dev->VolCatInfo.VolCatName, dcr->VolumeName, sizeof(dev->VolCatInfo.VolCatName)); + if (!dir_update_volume_info(dcr, true, true)) { /* indicate doing relabel */ return false; } if (recycle) { @@ -509,7 +528,7 @@ bool rewrite_volume_label(DCR *dcr, bool recycle) * End writing real Volume label (from pre-labeled tape), or recycling * the volume. */ - Dmsg0(200, "OK from rewrite vol label.\n"); + Dmsg1(150, "OK from rewrite vol label. Vol=%s\n", dcr->VolumeName); return true; } @@ -565,6 +584,7 @@ static void create_volume_label_record(DCR *dcr, DEV_RECORD *rec) ser_string(dev->VolHdr.ProgDate); ser_end(rec->data, SER_LENGTH_Volume_Label); + bstrncpy(dcr->VolumeName, dev->VolHdr.VolumeName, sizeof(dcr->VolumeName)); rec->data_len = ser_length(rec->data); rec->FileIndex = dev->VolHdr.LabelType; rec->VolSessionId = jcr->VolSessionId; @@ -583,11 +603,11 @@ void create_volume_label(DEVICE *dev, const char *VolName, { DEVRES *device = (DEVRES *)dev->device; - Dmsg0(90, "Start create_volume_label()\n"); + Dmsg0(130, "Start create_volume_label()\n"); ASSERT(dev != NULL); - dev->clear_volhdr(); /* release any old volume */ + dev->clear_volhdr(); /* clear any old volume info */ bstrncpy(dev->VolHdr.Id, BaculaId, sizeof(dev->VolHdr.Id)); dev->VolHdr.VerNum = BaculaTapeVersion; @@ -651,8 +671,8 @@ void create_session_label(DCR *dcr, DEV_RECORD *rec, int label) /* Added in VerNum 10 */ ser_string(jcr->Job); /* Unique name of this Job */ ser_string(jcr->fileset_name); - ser_uint32(jcr->JobType); - ser_uint32(jcr->JobLevel); + ser_uint32(jcr->getJobType()); + ser_uint32(jcr->getJobLevel()); /* Added in VerNum 11 */ ser_string(jcr->fileset_md5); @@ -685,16 +705,10 @@ bool write_session_label(DCR *dcr, int label) char buf1[100], buf2[100]; rec = new_record(); - Dmsg1(90, "session_label record=%x\n", rec); + Dmsg1(130, "session_label record=%x\n", rec); switch (label) { case SOS_LABEL: - if (dev->is_tape()) { - dcr->StartBlock = dev->block_num; - dcr->StartFile = dev->file; - } else { - dcr->StartBlock = (uint32_t)dev->file_addr; - dcr->StartFile = (uint32_t)(dev->file_addr >> 32); - } + set_start_vol_position(dcr); break; case EOS_LABEL: if (dev->is_tape()) { @@ -706,7 +720,7 @@ bool write_session_label(DCR *dcr, int label) } break; default: - Jmsg1(jcr, M_ABORT, 0, _("Bad session label = %d\n"), label); + Jmsg1(jcr, M_ABORT, 0, _("Bad Volume session label = %d\n"), label); break; } create_session_label(dcr, rec, label); @@ -722,30 +736,25 @@ bool write_session_label(DCR *dcr, int label) if (!can_write_record_to_block(block, rec)) { Dmsg0(150, "Cannot write session label to block.\n"); if (!write_block_to_device(dcr)) { - Dmsg0(90, "Got session label write_block_to_dev error.\n"); - /* ****FIXME***** errno is not set here */ - Jmsg(jcr, M_FATAL, 0, _("Error writing Session label to %s: %s\n"), - dev_vol_name(dev), strerror(errno)); + Dmsg0(130, "Got session label write_block_to_dev error.\n"); free_record(rec); return false; } } if (!write_record_to_block(block, rec)) { - Jmsg(jcr, M_FATAL, 0, _("Error writing Session label to %s: %s\n"), - dev_vol_name(dev), strerror(errno)); free_record(rec); return false; } - Dmsg6(50, "Write sesson_label record JobId=%d FI=%s SessId=%d Strm=%s len=%d " + Dmsg6(150, "Write sesson_label record JobId=%d FI=%s SessId=%d Strm=%s len=%d " "remainder=%d\n", jcr->JobId, FI_to_ascii(buf1, rec->FileIndex), rec->VolSessionId, stream_to_ascii(buf2, rec->Stream, rec->FileIndex), rec->data_len, rec->remainder); free_record(rec); - Dmsg2(50, "Leave write_session_label Block=%ud File=%ud\n", - dev->get_block(), dev->get_file()); + Dmsg2(150, "Leave write_session_label Block=%ud File=%ud\n", + dev->get_block_num(), dev->get_file()); return true; } @@ -918,15 +927,15 @@ void dump_volume_label(DEVICE *dev) if (dev->VolHdr.VerNum >= 11) { char dt[50]; - bstrftime(dt, sizeof(dt), btime_to_unix(dev->VolHdr.label_btime)); + bstrftime(dt, sizeof(dt), btime_to_utime(dev->VolHdr.label_btime)); Pmsg1(-1, _("Date label written: %s\n"), dt); } else { - dt.julian_day_number = dev->VolHdr.label_date; - dt.julian_day_fraction = dev->VolHdr.label_time; - tm_decode(&dt, &tm); - Pmsg5(-1, -_("Date label written: %04d-%02d-%02d at %02d:%02d\n"), - tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday, tm.tm_hour, tm.tm_min); + dt.julian_day_number = dev->VolHdr.label_date; + dt.julian_day_fraction = dev->VolHdr.label_time; + tm_decode(&dt, &tm); + Pmsg5(-1, + _("Date label written: %04d-%02d-%02d at %02d:%02d\n"), + tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday, tm.tm_hour, tm.tm_min); } bail_out: @@ -987,7 +996,7 @@ static void dump_session_label(DEV_RECORD *rec, const char *type) } if (label.VerNum >= 11) { char dt[50]; - bstrftime(dt, sizeof(dt), btime_to_unix(label.write_btime)); + bstrftime(dt, sizeof(dt), btime_to_utime(label.write_btime)); Pmsg1(-1, _("Date written : %s\n"), dt); } else { dt.julian_day_number = label.write_date; @@ -1066,7 +1075,7 @@ void dump_label_record(DEVICE *dev, DEV_RECORD *rec, int verbose) switch (rec->FileIndex) { case SOS_LABEL: unser_session_label(&label, rec); - bstrftimes(dt, sizeof(dt), btime_to_unix(label.write_btime)); + bstrftimes(dt, sizeof(dt), btime_to_utime(label.write_btime)); Pmsg6(-1, _("%s Record: File:blk=%u:%u SessId=%d SessTime=%d JobId=%d\n"), type, dev->file, dev->block_num, rec->VolSessionId, rec->VolSessionTime, label.JobId); Pmsg4(-1, _(" Job=%s Date=%s Level=%c Type=%c\n"), @@ -1075,7 +1084,7 @@ void dump_label_record(DEVICE *dev, DEV_RECORD *rec, int verbose) case EOS_LABEL: char ed1[30], ed2[30]; unser_session_label(&label, rec); - bstrftimes(dt, sizeof(dt), btime_to_unix(label.write_btime)); + bstrftimes(dt, sizeof(dt), btime_to_utime(label.write_btime)); Pmsg6(-1, _("%s Record: File:blk=%u:%u SessId=%d SessTime=%d JobId=%d\n"), type, dev->file, dev->block_num, rec->VolSessionId, rec->VolSessionTime, label.JobId); Pmsg7(-1, _(" Date=%s Level=%c Type=%c Files=%s Bytes=%s Errors=%d Status=%c\n"),