*
*/
/*
- Copyright (C) 2002-2005 Kern Sibbald
+ Copyright (C) 2000-2005 Kern Sibbald
This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
+ modify it under the terms of the GNU General Public License
+ version 2 as amended with additional clauses defined in the
+ file LICENSE in the main source directory.
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 should have received a copy of the GNU General Public
- License along with this program; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ the file LICENSE for additional details.
*/
#if defined(HAVE_CYGWIN) || defined(HAVE_WIN32)
-#include "compat.h"
+#include "../lib/winapi.h"
+
/* Forward referenced subroutines */
static bool set_win32_attributes(JCR *jcr, ATTR *attr, BFILE *ofd);
old_mask = umask(0);
if (is_bopen(ofd)) {
char ec1[50], ec2[50];
- fsize = blseek(ofd, 0, SEEK_CUR);
+ fsize = blseek(ofd, 0, SEEK_END);
bclose(ofd); /* first close file */
- if (fsize > 0 && fsize != attr->statp.st_size) {
+ if (fsize > 0 && fsize != (off_t)attr->statp.st_size) {
Jmsg3(jcr, M_ERROR, 0, _("File size of restored file %s not correct. Original %s, restored %s.\n"),
attr->ofname, edit_uint64(attr->statp.st_size, ec1),
edit_uint64(fsize, ec2));
attribsEx[0] = 0; /* no extended attributes */
-#if USE_WIN32_UNICODE
- if (!p_GetFileAttributesExW)
- return STREAM_UNIX_ATTRIBUTES;
+ // try unicode version
+ if (p_GetFileAttributesExW) {
+ unix_name_to_win32(&ff_pkt->sys_fname, ff_pkt->fname);
- unix_name_to_win32(&ff_pkt->sys_fname, ff_pkt->fname);
+ POOLMEM* pwszBuf = get_pool_memory (PM_FNAME);
+ UTF8_2_wchar(&pwszBuf, ff_pkt->sys_fname);
- WCHAR szBuf[MAX_PATH_UNICODE];
- UTF8_2_wchar(szBuf, ff_pkt->sys_fname, MAX_PATH_UNICODE);
+ BOOL b=p_GetFileAttributesExW((LPCWSTR) pwszBuf, GetFileExInfoStandard, (LPVOID)&atts);
+ free_pool_memory(pwszBuf);
- if (!p_GetFileAttributesExW(szBuf, GetFileExInfoStandard,
- (LPVOID)&atts)) {
- win_error(jcr, "GetFileAttributesExW:", ff_pkt->sys_fname);
- return STREAM_UNIX_ATTRIBUTES;
+ if (!b) {
+ win_error(jcr, "GetFileAttributesExW:", ff_pkt->sys_fname);
+ return STREAM_UNIX_ATTRIBUTES;
+ }
}
-#else
- if (!p_GetFileAttributesExA)
- return STREAM_UNIX_ATTRIBUTES;
+ else {
+ if (!p_GetFileAttributesExA)
+ return STREAM_UNIX_ATTRIBUTES;
- unix_name_to_win32(&ff_pkt->sys_fname, ff_pkt->fname);
+ unix_name_to_win32(&ff_pkt->sys_fname, ff_pkt->fname);
- if (!p_GetFileAttributesExA(ff_pkt->sys_fname, GetFileExInfoStandard,
- (LPVOID)&atts)) {
- win_error(jcr, "GetFileAttributesExA:", ff_pkt->sys_fname);
- return STREAM_UNIX_ATTRIBUTES;
+ if (!p_GetFileAttributesExA(ff_pkt->sys_fname, GetFileExInfoStandard,
+ (LPVOID)&atts)) {
+ win_error(jcr, "GetFileAttributesExA:", ff_pkt->sys_fname);
+ return STREAM_UNIX_ATTRIBUTES;
+ }
}
-#endif
p += to_base64((uint64_t)atts.dwFileAttributes, p);
*p++ = ' '; /* separate fields with a space */
ULARGE_INTEGER li;
POOLMEM *win32_ofile;
-#if USE_WIN32_UNICODE
- if (!p_GetFileAttributesExW)
- return false;
-#else
- if (!p_GetFileAttributesExA)
+ // if we have neither ansi nor wchar version, we leave
+ if (!(p_SetFileAttributesW || p_SetFileAttributesA))
return false;
-#endif
-
if (!p || !*p) { /* we should have attributes */
Dmsg2(100, "Attributes missing. of=%s ofd=%d\n", attr->ofname, ofd->fid);
Dmsg1(100, "SetFileAtts %s\n", attr->ofname);
if (!(atts.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
{
-#if USE_WIN32_UNICODE
- WCHAR szBuf[MAX_PATH_UNICODE];
- UTF8_2_wchar(szBuf, win32_ofile, MAX_PATH_UNICODE);
-
- if (!SetFileAttributesW(szBuf, atts.dwFileAttributes & SET_ATTRS)) {
- win_error(jcr, "SetFileAttributesW:", win32_ofile);
-#else
- if (!SetFileAttributes(win32_ofile, atts.dwFileAttributes & SET_ATTRS)) {
- win_error(jcr, "SetFileAttributesA:", win32_ofile);
-#endif
+ if (p_SetFileAttributesW) {
+ POOLMEM* pwszBuf = get_pool_memory (PM_FNAME);
+ UTF8_2_wchar(&pwszBuf, win32_ofile);
+
+ BOOL b=p_SetFileAttributesW((LPCWSTR)pwszBuf, atts.dwFileAttributes & SET_ATTRS);
+ free_pool_memory(pwszBuf);
+
+ if (!b)
+ win_error(jcr, "SetFileAttributesW:", win32_ofile);
+ }
+ else {
+ if (!p_SetFileAttributesA(win32_ofile, atts.dwFileAttributes & SET_ATTRS)) {
+ win_error(jcr, "SetFileAttributesA:", win32_ofile);
+ }
}
}
free_pool_memory(win32_ofile);
}
-/* Cygwin API definition */
-extern "C" void cygwin_conv_to_win32_path(const char *path, char *win32_path);
-
+/* Conversion of a Unix filename to a Win32 filename */
+extern void conv_unix_to_win32_path(const char *path, char *win32_path, DWORD dwSize);
void unix_name_to_win32(POOLMEM **win32_name, char *name)
{
/* One extra byte should suffice, but we double it */
- *win32_name = check_pool_memory_size(*win32_name, 2*strlen(name)+1);
- cygwin_conv_to_win32_path(name, *win32_name);
+ /* add MAX_PATH bytes for VSS shadow copy name */
+ DWORD dwSize = 2*strlen(name)+MAX_PATH;
+ *win32_name = check_pool_memory_size(*win32_name, dwSize);
+ conv_unix_to_win32_path(name, *win32_name, dwSize);
}
#endif /* HAVE_CYGWIN */