int len;
char *fname, *attr;
ATTR_DBR *ar = NULL;
-@@ -398,8 +399,8 @@
- unser_uint32(data_len);
- p += unser_length(p);
-
-- Dmsg1(400, "UpdCat msg=%s\n", bs->msg);
-- Dmsg5(400, "UpdCat VolSessId=%d VolSessT=%d FI=%d Strm=%d data_len=%d\n",
-+ Dmsg1(1, "UpdCat msg=%s\n", bs->msg);
-+ Dmsg5(1, "UpdCat VolSessId=%d VolSessT=%d FI=%d Strm=%d data_len=%d\n",
- VolSessionId, VolSessionTime, FileIndex, Stream, data_len);
-
- if (Stream == STREAM_UNIX_ATTRIBUTES || Stream == STREAM_UNIX_ATTRIBUTES_EX) {
@@ -415,6 +416,7 @@
p = jcr->attr - bs->msg + p; /* point p into jcr->attr */
skip_nonspaces(&p); /* skip FileIndex */
free_pool_memory(jcr->acl_text);
stop_heartbeat_monitor(jcr);
-@@ -1066,8 +1320,8 @@
- Jmsg0(jcr, M_FATAL, 0, _("Invalid file flags, no supported data stream type.\n"));
- return false;
- }
-+
- encode_stat(attribs, ff_pkt, data_stream);
--
- /* Now possibly extend the attributes */
- attr_stream = encode_attribsEx(jcr, attribsEx, ff_pkt);
-
@@ -1102,7 +1356,9 @@
* For a directory, link is the same as fname, but with trailing
* slash. For a linked file, link is the link.
if (!jcr->id_list) {
jcr->id_list = new_guid_list();
}
-@@ -268,6 +276,7 @@
- *p++ = *f++;
- }
- }
-+
- *p++ = '\n';
- *p = 0;
- Dmsg1(20, "%s", buf);
Index: src/findlib/create_file.c
===================================================================
--- src/findlib/create_file.c (révision 6471)
}
#ifdef HAVE_DARWIN_OS
-@@ -502,15 +526,13 @@
+@@ -502,10 +526,7 @@
link[len] = 0;
ff_pkt->link = link;
/* Incremental option, directory entry not changed */
ff_pkt->type = FT_DIRNOCHG;
} else {
- ff_pkt->type = FT_DIRBEGIN;
- }
-+
- /* We have set st_rdev to 1 if it is a reparse point, otherwise 0 */
- if (have_win32_api() && ff_pkt->statp.st_rdev) {
- ff_pkt->type = FT_REPARSE;
Index: src/findlib/find.h
===================================================================
--- src/findlib/find.h (révision 6471)