/*
Bacula® - The Network Backup Solution
- Copyright (C) 2002-2008 Free Software Foundation Europe e.V.
+ Copyright (C) 2002-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.
* them in the encode_attribsEx() subroutine, but this is
* not recommended.
*/
-void encode_stat(char *buf, FF_PKT *ff_pkt, int data_stream)
+void encode_stat(char *buf, struct stat *statp, int32_t LinkFI, int data_stream)
{
char *p = buf;
- struct stat *statp = &ff_pkt->statp;
+
/*
* Encode a stat packet. I should have done this more intelligently
* with a length so that it could be easily expanded.
*p++ = ' ';
p += to_base64((int64_t)statp->st_ctime, p);
*p++ = ' ';
- p += to_base64((int64_t)ff_pkt->LinkFI, p);
+ p += to_base64((int64_t)LinkFI, p);
*p++ = ' ';
#ifdef HAVE_CHFLAGS
* restore, we can be sure we put back the whole resource.
*/
char *p;
+
+ *attribsEx = 0; /* no extended attributes (yet) */
+ if (jcr->cmd_plugin || ff_pkt->type == FT_DELETED) {
+ return STREAM_UNIX_ATTRIBUTES;
+ }
p = attribsEx;
if (ff_pkt->flags & FO_HFSPLUS) {
p += to_base64((uint64_t)(ff_pkt->hfsinfo.rsrclength), p);
attribsEx[0] = 0; /* no extended attributes */
+ if (jcr->cmd_plugin || ff_pkt->type == FT_DELETED) {
+ return STREAM_UNIX_ATTRIBUTES;
+ }
+
unix_name_to_win32(&ff_pkt->sys_fname, ff_pkt->fname);
// try unicode version
if (p_GetFileAttributesExW) {
- POOLMEM* pwszBuf = get_pool_memory (PM_FNAME);
+ POOLMEM* pwszBuf = get_pool_memory(PM_FNAME);
make_win32_path_UTF8_2_wchar(&pwszBuf, ff_pkt->fname);
- BOOL b=p_GetFileAttributesExW((LPCWSTR) pwszBuf, GetFileExInfoStandard, (LPVOID)&atts);
+ BOOL b=p_GetFileAttributesExW((LPCWSTR)pwszBuf, GetFileExInfoStandard,
+ (LPVOID)&atts);
free_pool_memory(pwszBuf);
if (!b) {
NULL);
Dmsg3(100, "Error in %s on file %s: ERR=%s\n", prefix, win32_ofile, msg);
strip_trailing_junk(msg);
- Jmsg(jcr, M_ERROR, 0, _("Error in %s file %s: ERR=%s\n"), prefix, win32_ofile, msg);
+ Jmsg3(jcr, M_ERROR, 0, _("Error in %s file %s: ERR=%s\n"), prefix, win32_ofile, msg);
LocalFree(msg);
}