/*
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.
/* Forward referenced subroutines */
static bool set_win32_attributes(JCR *jcr, ATTR *attr, BFILE *ofd);
void unix_name_to_win32(POOLMEM **win32_name, char *name);
-void win_error(JCR *jcr, char *prefix, POOLMEM *ofile);
+void win_error(JCR *jcr, const char *prefix, POOLMEM *ofile);
HANDLE bget_handle(BFILE *bfd);
#endif /* HAVE_WIN32 */
* 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) {
- return STREAM_UNIX_ATTRIBUTES;
- }
-
- if (ff_pkt->type == FT_DELETED) { /* Don't check deleted files */
+ if (jcr->cmd_plugin || ff_pkt->type == FT_DELETED) {
return STREAM_UNIX_ATTRIBUTES;
}
return true;
}
-void win_error(JCR *jcr, char *prefix, POOLMEM *win32_ofile)
+void win_error(JCR *jcr, const char *prefix, POOLMEM *win32_ofile)
{
DWORD lerror = GetLastError();
LPTSTR msg;
LocalFree(msg);
}
-void win_error(JCR *jcr, char *prefix, DWORD lerror)
+void win_error(JCR *jcr, const char *prefix, DWORD lerror)
{
LPTSTR msg;
FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|