/*
- Bacula® - The Network Backup Solution
+ Bacula(R) - The Network Backup Solution
- Copyright (C) 2003-2010 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2016 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 three of the GNU Affero 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 Affero 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.
*/
/*
* attr.c Unpack an Attribute record returned from the tape
return 0;
}
Dmsg2(dbglvl, "Got Attr: FilInx=%d type=%d\n", attr->file_index, attr->type);
+ /*
+ * Note AR_DATA_STREAM should never be set since it is encoded
+ * at the end of the attributes.
+ */
if (attr->type & AR_DATA_STREAM) {
attr->data_stream = 1;
} else {
while (*p++ != ' ') /* skip type */
{ }
- attr->fname = p; /* set filname position */
+ attr->fname = p; /* set filename position */
while (*p++ != 0) /* skip filename */
{ }
attr->attr = p; /* set attributes position */
attr->lname = p; /* set link position */
while (*p++ != 0) /* skip link */
{ }
+ attr->delta_seq = 0;
if (attr->type == FT_RESTORE_FIRST) {
/* We have an object, so do a binary copy */
object_len = reclen + rec - p;
attr->attrEx = check_pool_memory_size(attr->attrEx, object_len + 1);
- memcpy(attr->attrEx, p, object_len);
+ memcpy(attr->attrEx, p, object_len);
/* Add a EOS for those who attempt to print the object */
p = attr->attrEx + object_len;
*p = 0;
pm_strcpy(attr->attrEx, p); /* copy extended attributes, if any */
if (attr->data_stream) {
int64_t val;
- while (*p++ != 0) /* skip extended attributes */
+ while (*p++ != 0) /* skip extended attributes */
{ }
from_base64(&val, p);
attr->data_stream = (int32_t)val;
+ } else {
+ while (*p++ != 0) /* skip extended attributes */
+ { }
+ if (p - rec < reclen) {
+ attr->delta_seq = str_to_int32(p); /* delta_seq */
+ }
}
}
- Dmsg7(dbglvl, "unpack_attr FI=%d Type=%d fname=%s attr=%s lname=%s attrEx=%s ds=%d\n",
+ Dmsg8(dbglvl, "unpack_attr FI=%d Type=%d fname=%s attr=%s lname=%s attrEx=%s datastr=%d delta_seq=%d\n",
attr->file_index, attr->type, attr->fname, attr->attr, attr->lname,
- attr->attrEx, attr->data_stream);
+ attr->attrEx, attr->data_stream, attr->delta_seq);
*attr->ofname = 0;
*attr->olname = 0;
return 1;
*
*/
- if (jcr->where_bregexp) {
+ if (jcr->where_bregexp) {
char *ret;
apply_bregexps(attr->fname, jcr->where_bregexp, &ret);
pm_strcpy(attr->ofname, ret);
pm_strcpy(attr->olname, attr->lname);
}
}
-
+
} else if (jcr->where[0] == 0) {
pm_strcpy(attr->ofname, attr->fname);
pm_strcpy(attr->olname, attr->lname);
#endif
fn = attr->lname; /* take whole name */
/* Ensure where is terminated with a slash */
- if (add_link &&
- !IsPathSeparator(jcr->where[wherelen-1]) &&
+ if (add_link &&
+ !IsPathSeparator(jcr->where[wherelen-1]) &&
!IsPathSeparator(fn[0])) {
pm_strcat(attr->olname, "/");
}
if (attr->type == FT_DELETED) { /* TODO: change this to get last seen values */
bsnprintf(buf, sizeof(buf),
- "---------- - - - - ---------- -------- %s\n", attr->ofname);
+ "---------- - - - - ---------- -------- %s\n", attr->ofname);
Dmsg1(dbglvl, "%s", buf);
Jmsg(jcr, M_RESTORED, 1, "%s", buf);
return;
guid = jcr->id_list;
p = encode_mode(attr->statp.st_mode, buf);
p += sprintf(p, " %2d ", (uint32_t)attr->statp.st_nlink);
- p += sprintf(p, "%-8.8s %-8.8s",
+ p += sprintf(p, "%-8.8s %-8.8s",
guid->uid_to_name(attr->statp.st_uid, en1, sizeof(en1)),
guid->gid_to_name(attr->statp.st_gid, en2, sizeof(en2)));
p += sprintf(p, "%12.12s ", edit_int64(attr->statp.st_size, ec1));
projects / bacula / bacula / blobdiff