X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fwin32%2Fcompat%2Fcompat.cpp;h=d5931f439254f717d11449ff39accd88c2b01ecf;hb=6c210279bc094ec7bfedf140e515ed98eb2734a3;hp=f5e07de92b2679c5789f7250f60874ad45ddd168;hpb=f6cf7e20233311eaf549725bd0690e97012c81fd;p=bacula%2Fbacula diff --git a/bacula/src/win32/compat/compat.cpp b/bacula/src/win32/compat/compat.cpp index f5e07de92b..d5931f4392 100644 --- a/bacula/src/win32/compat/compat.cpp +++ b/bacula/src/win32/compat/compat.cpp @@ -5,54 +5,108 @@ // Copyright transferred from Raider Solutions, Inc to // Kern Sibbald and John Walker by express permission. // -// Copyright (C) 2004 Kern Sibbald and John Walker +// Copyright (C) 2004-2006 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. +// This program is free software; you can redistribute it and/or +// 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. +// 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 +// the file LICENSE for additional details. // // Author : Christopher S. Hull // Created On : Sat Jan 31 15:55:00 2004 // $Id$ -#include - +#include "bacula.h" #include "compat.h" -#include "pthread.h" +#include "jcr.h" #define b_errno_win32 (1<<29) -#define USE_WIN32_COMPAT_IO 1 -extern void d_msg(const char *file, int line, int level, const char *fmt,...); +/* UTF-8 to UCS2 path conversion is expensive, + so we cache the conversion. During backup the + conversion is called 3 times (lstat, attribs, open), + by using the cache this is reduced to 1 time */ + +static POOLMEM *g_pWin32ConvUTF8Cache = get_pool_memory (PM_FNAME); +static POOLMEM *g_pWin32ConvUCS2Cache = get_pool_memory (PM_FNAME); +static DWORD g_dwWin32ConvUTF8strlen = 0; +static pthread_mutex_t Win32Convmutex = PTHREAD_MUTEX_INITIALIZER; + +static t_pVSSPathConvert g_pVSSPathConvert; +static t_pVSSPathConvertW g_pVSSPathConvertW; + +void SetVSSPathConvert(t_pVSSPathConvert pPathConvert, t_pVSSPathConvertW pPathConvertW) +{ + g_pVSSPathConvert = pPathConvert; + g_pVSSPathConvertW = pPathConvertW; +} + +void Win32ConvCleanupCache() +{ + if (g_pWin32ConvUTF8Cache) { + free_pool_memory(g_pWin32ConvUTF8Cache); + g_pWin32ConvUTF8Cache = NULL; + } + + if (g_pWin32ConvUCS2Cache) { + free_pool_memory(g_pWin32ConvUCS2Cache); + g_pWin32ConvUCS2Cache = NULL; + } + + g_dwWin32ConvUTF8strlen = 0; +} + + +/* to allow the usage of the original version in this file here */ +#undef fputs + + +//#define USE_WIN32_COMPAT_IO 1 +#define USE_WIN32_32KPATHCONVERSION 1 + extern DWORD g_platform_id; +extern DWORD g_MinorVersion; // from MicroSoft SDK (KES) is the diff between Jan 1 1601 and Jan 1 1970 #ifdef HAVE_MINGW -#define WIN32_FILETIME_ADJUST 0x19DB1DED53E8000UL //Not sure it works +#define WIN32_FILETIME_ADJUST 0x19DB1DED53E8000ULL #else #define WIN32_FILETIME_ADJUST 0x19DB1DED53E8000I64 #endif #define WIN32_FILETIME_SCALE 10000000 // 100ns/second -extern "C" void -cygwin_conv_to_win32_path(const char *name, char *win32_name) +void conv_unix_to_win32_path(const char *name, char *win32_name, DWORD dwSize) { const char *fname = name; + char *tname = win32_name; + + Dmsg0(100, "Enter convert_unix_to_win32_path\n"); + + if ((name[0] == '/' || name[0] == '\\') && + (name[1] == '/' || name[1] == '\\') && + (name[2] == '.') && + (name[3] == '/' || name[3] == '\\')) { + + *win32_name++ = '\\'; + *win32_name++ = '\\'; + *win32_name++ = '.'; + *win32_name++ = '\\'; + + name += 4; + } + while (*name) { /* Check for Unix separator and convert to Win32 */ + if (name[0] == '/' && name[1] == '/') { /* double slash? */ + name++; /* yes, skip first one */ + } if (*name == '/') { *win32_name++ = '\\'; /* convert char */ /* If Win32 separated that is "quoted", remove quote */ @@ -65,16 +119,268 @@ cygwin_conv_to_win32_path(const char *name, char *win32_name) name++; } /* Strip any trailing slash, if we stored something */ - if (*fname != 0 && win32_name[-1] == '\\') { + /* but leave "c:\" with backslash (root directory case */ + if (*fname != 0 && win32_name[-1] == '\\' && strlen (fname) != 3) { win32_name[-1] = 0; } else { *win32_name = 0; } + + /* here we convert to VSS specific file name which + can get longer because VSS will make something like + \\\\?\\GLOBALROOT\\Device\\HarddiskVolumeShadowCopy1\\bacula\\uninstall.exe + from c:\bacula\uninstall.exe + */ + Dmsg1(100, "path=%s\n", tname); + if (g_pVSSPathConvert != NULL) { + POOLMEM *pszBuf = get_pool_memory (PM_FNAME); + pszBuf = check_pool_memory_size(pszBuf, dwSize); + bstrncpy(pszBuf, tname, strlen(tname)+1); + g_pVSSPathConvert(pszBuf, tname, dwSize); + free_pool_memory(pszBuf); + } + Dmsg1(100, "Leave cvt_u_to_win32_path path=%s\n", tname); +} + +/* Conversion of a Unix filename to a Win32 filename */ +void unix_name_to_win32(POOLMEM **win32_name, char *name) +{ + /* One extra byte should suffice, but we double it */ + /* 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); +} + +POOLMEM* +make_wchar_win32_path(POOLMEM *pszUCSPath, BOOL *pBIsRawPath /*= NULL*/) +{ + /* created 02/27/2006 Thorsten Engel + * + * This function expects an UCS-encoded standard wchar_t in pszUCSPath and + * will complete the input path to an absolue path of the form \\?\c:\path\file + * + * With this trick, it is possible to have 32K characters long paths. + * + * Optionally one can use pBIsRawPath to determine id pszUCSPath contains a path + * to a raw windows partition. + */ + + Dmsg0(100, "Enter wchar_win32_path\n"); + if (pBIsRawPath) { + *pBIsRawPath = FALSE; /* Initialize, set later */ + } + + if (!p_GetCurrentDirectoryW) { + Dmsg0(100, "Leave wchar_win32_path no change \n"); + return pszUCSPath; + } + + wchar_t *name = (wchar_t *)pszUCSPath; + + /* if it has already the desired form, exit without changes */ + if (wcslen(name) > 3 && wcsncmp(name, L"\\\\?\\", 4) == 0) { + Dmsg0(100, "Leave wchar_win32_path no change \n"); + return pszUCSPath; + } + + POOLMEM *pwszBuf = get_pool_memory(PM_FNAME); + POOLMEM *pwszCurDirBuf = get_pool_memory(PM_FNAME); + DWORD dwCurDirPathSize = 0; + + /* get buffer with enough size (name+max 6. wchars+1 null terminator */ + DWORD dwBufCharsNeeded = (wcslen(name)+7); + pwszBuf = check_pool_memory_size(pwszBuf, dwBufCharsNeeded*sizeof(wchar_t)); + + /* add \\?\ to support 32K long filepaths + it is important to make absolute paths, so we add drive and + current path if necessary */ + + BOOL bAddDrive = TRUE; + BOOL bAddCurrentPath = TRUE; + BOOL bAddPrefix = TRUE; + + /* does path begin with drive? if yes, it is absolute */ + if (wcslen(name) >= 3 && (iswalpha (*name) && *(name+1) == ':' + && (*(name+2) == '\\' || *(name+2) == '/'))) { + bAddDrive = FALSE; + bAddCurrentPath = FALSE; + } + + /* is path absolute? */ + if (*name == '/' || *name == '\\') + bAddCurrentPath = FALSE; + + /* is path relative to itself?, if yes, skip ./ */ + if (wcslen(name) > 2 && ((wcsncmp(name, L"./", 2) == 0) || (wcsncmp(name, L".\\", 2) == 0))) { + name += 2; + } + + /* is path of form '//./'? */ + if (wcslen(name) > 3 && ((wcsncmp(name, L"//./", 4) == 0) || (wcsncmp(name, L"\\\\.\\", 4) == 0))) { + bAddDrive = FALSE; + bAddCurrentPath = FALSE; + bAddPrefix = FALSE; + if (pBIsRawPath) { + *pBIsRawPath = TRUE; + } + } + + int nParseOffset = 0; + + /* add 4 bytes header */ + if (bAddPrefix) { + nParseOffset = 4; + wcscpy((wchar_t *)pwszBuf, L"\\\\?\\"); + } + + /* get current path if needed */ + if (bAddDrive || bAddCurrentPath) { + dwCurDirPathSize = p_GetCurrentDirectoryW(0, NULL); + if (dwCurDirPathSize > 0) { + /* get directory into own buffer as it may either return c:\... or \\?\C:\.... */ + pwszCurDirBuf = check_pool_memory_size(pwszCurDirBuf, (dwCurDirPathSize+1)*sizeof(wchar_t)); + p_GetCurrentDirectoryW(dwCurDirPathSize,(wchar_t *)pwszCurDirBuf); + } else { + /* we have no info for doing so */ + bAddDrive = FALSE; + bAddCurrentPath = FALSE; + } + } + + + /* add drive if needed */ + if (bAddDrive && !bAddCurrentPath) { + wchar_t szDrive[3]; + + if (dwCurDirPathSize > 3 && wcsncmp((LPCWSTR)pwszCurDirBuf, L"\\\\?\\", 4) == 0) { + /* copy drive character */ + wcsncpy((wchar_t *)szDrive, (LPCWSTR)pwszCurDirBuf+4, 2); + } else { + /* copy drive character */ + wcsncpy((wchar_t *)szDrive, (LPCWSTR)pwszCurDirBuf, 2); + } + + szDrive[2] = 0; + + wcscat((wchar_t *)pwszBuf, szDrive); + nParseOffset +=2; + } + + /* add path if needed */ + if (bAddCurrentPath) { + /* the 1 add. character is for the eventually added backslash */ + dwBufCharsNeeded += dwCurDirPathSize+1; + pwszBuf = check_pool_memory_size(pwszBuf, dwBufCharsNeeded*sizeof(wchar_t)); + /* get directory into own buffer as it may either return c:\... or \\?\C:\.... */ + + if (dwCurDirPathSize > 3 && wcsncmp((LPCWSTR)pwszCurDirBuf, L"\\\\?\\", 4) == 0) { + /* copy complete string */ + wcscpy((wchar_t *)pwszBuf, (LPCWSTR)pwszCurDirBuf); + } else { + /* append path */ + wcscat((wchar_t *)pwszBuf, (LPCWSTR)pwszCurDirBuf); + } + + nParseOffset = wcslen((LPCWSTR) pwszBuf); + + /* check if path ends with backslash, if not, add one */ + if (*((wchar_t *)pwszBuf+nParseOffset-1) != L'\\') { + wcscat((wchar_t *)pwszBuf, L"\\"); + nParseOffset++; + } + } + + + wchar_t *win32_name = (wchar_t *)pwszBuf+nParseOffset; + + while (*name) { + /* Check for Unix separator and convert to Win32 */ + if (*name == '/') { + *win32_name++ = '\\'; /* convert char */ + /* If Win32 separated that is "quoted", remove quote */ +/* HELPME (Thorsten Engel): I don't understand the following part + * and it removes a backslash from e.g. "\\.\c:" which I need for + * RAW device access. So I took it out. + */ +#ifdef needed + } else if (*name == '\\' && name[1] == '\\') { + *win32_name++ = '\\'; + name++; /* skip first \ */ +#endif + } else { + *win32_name++ = *name; /* copy character */ + } + name++; + } + + /* null terminate string */ + *win32_name = 0; + + /* here we convert to VSS specific file name which + * can get longer because VSS will make something like + * \\\\?\\GLOBALROOT\\Device\\HarddiskVolumeShadowCopy1\\bacula\\uninstall.exe + * from c:\bacula\uninstall.exe + */ + if (g_pVSSPathConvertW != NULL) { + /* is output buffer large enough? */ + pwszBuf = check_pool_memory_size(pwszBuf, (dwBufCharsNeeded+MAX_PATH)*sizeof(wchar_t)); + /* create temp. buffer */ + POOLMEM* pszBuf = get_pool_memory(PM_FNAME); + pszBuf = check_pool_memory_size(pszBuf, (dwBufCharsNeeded+MAX_PATH)*sizeof(wchar_t)); + if (bAddPrefix) + nParseOffset = 4; + else + nParseOffset = 0; + wcsncpy((wchar_t *)pszBuf, (wchar_t *)pwszBuf+nParseOffset, wcslen((wchar_t *)pwszBuf)+1-nParseOffset); + g_pVSSPathConvertW((wchar_t *)pszBuf, (wchar_t *)pwszBuf, dwBufCharsNeeded+MAX_PATH); + free_pool_memory(pszBuf); + } + + free_pool_memory(pszUCSPath); + free_pool_memory(pwszCurDirBuf); + + Dmsg1(100, "Leave wchar_win32_path=%s\n", pwszBuf); + return pwszBuf; +} + +int +wchar_2_UTF8(char *pszUTF, const wchar_t *pszUCS, int cchChar) +{ + /* the return value is the number of bytes written to the buffer. + The number includes the byte for the null terminator. */ + + if (p_WideCharToMultiByte) { + int nRet = p_WideCharToMultiByte(CP_UTF8,0,pszUCS,-1,pszUTF,cchChar,NULL,NULL); + ASSERT (nRet > 0); + return nRet; + } + else + return 0; +} + +int +UTF8_2_wchar(POOLMEM **ppszUCS, const char *pszUTF) +{ + /* the return value is the number of wide characters written to the buffer. */ + /* convert null terminated string from utf-8 to ucs2, enlarge buffer if necessary */ + + if (p_MultiByteToWideChar) { + /* strlen of UTF8 +1 is enough */ + DWORD cchSize = (strlen(pszUTF)+1); + *ppszUCS = check_pool_memory_size(*ppszUCS, cchSize*sizeof (wchar_t)); + + int nRet = p_MultiByteToWideChar(CP_UTF8, 0, pszUTF, -1, (LPWSTR) *ppszUCS,cchSize); + ASSERT (nRet > 0); + return nRet; + } + else + return 0; } void -wchar_win32_path(const char *name, WCHAR *win32_name) +wchar_win32_path(const char *name, wchar_t *win32_name) { const char *fname = name; while (*name) { @@ -98,31 +404,72 @@ wchar_win32_path(const char *name, WCHAR *win32_name) } } -int -umask(int) +int +make_win32_path_UTF8_2_wchar(POOLMEM **pszUCS, const char *pszUTF, BOOL* pBIsRawPath /*= NULL*/) { - return 0; + P(Win32Convmutex); + /* if we find the utf8 string in cache, we use the cached ucs2 version. + we compare the stringlength first (quick check) and then compare the content. + */ + if (g_dwWin32ConvUTF8strlen == strlen(pszUTF)) { + if (bstrcmp(pszUTF, g_pWin32ConvUTF8Cache)) { + int32_t nBufSize = sizeof_pool_memory(g_pWin32ConvUCS2Cache); + *pszUCS = check_pool_memory_size(*pszUCS, nBufSize); + wcscpy((LPWSTR) *pszUCS, (LPWSTR) g_pWin32ConvUCS2Cache); + V(Win32Convmutex); + return nBufSize / sizeof (WCHAR); + } + } + + /* helper to convert from utf-8 to UCS-2 and to complete a path for 32K path syntax */ + int nRet = UTF8_2_wchar(pszUCS, pszUTF); + +#ifdef USE_WIN32_32KPATHCONVERSION + /* add \\?\ to support 32K long filepaths */ + *pszUCS = make_wchar_win32_path(*pszUCS, pBIsRawPath); +#else + if (pBIsRawPath) + *pBIsRawPath = FALSE; +#endif + + /* populate cache */ + g_pWin32ConvUCS2Cache = check_pool_memory_size(g_pWin32ConvUCS2Cache, sizeof_pool_memory(*pszUCS)); + wcscpy((LPWSTR) g_pWin32ConvUCS2Cache, (LPWSTR) *pszUCS); + + g_dwWin32ConvUTF8strlen = strlen(pszUTF); + g_pWin32ConvUTF8Cache = check_pool_memory_size(g_pWin32ConvUTF8Cache, g_dwWin32ConvUTF8strlen+1); + bstrncpy(g_pWin32ConvUTF8Cache, pszUTF, g_dwWin32ConvUTF8strlen+1); + V(Win32Convmutex); + + return nRet; } -int -chmod(const char *, mode_t) +#if !defined(_MSC_VER) || (_MSC_VER < 1400) // VC8+ +int umask(int) { - return 0; + return 0; } +#endif -int -chown(const char *k, uid_t, gid_t) +int fcntl(int fd, int cmd) { - return 0; + return 0; } -int -lchown(const char *k, uid_t, gid_t) +int chmod(const char *, mode_t) { - return 0; + return 0; } +int chown(const char *k, uid_t, gid_t) +{ + return 0; +} +int lchown(const char *k, uid_t, gid_t) +{ + return 0; +} long int random(void) @@ -133,7 +480,7 @@ random(void) void srandom(unsigned int seed) { - srand(seed); + srand(seed); } // ///////////////////////////////////////////////////////////////// // convert from Windows concept of time to Unix concept of time @@ -141,16 +488,16 @@ srandom(unsigned int seed) void cvt_utime_to_ftime(const time_t &time, FILETIME &wintime) { - uint64_t mstime = time; - mstime *= WIN32_FILETIME_SCALE; - mstime += WIN32_FILETIME_ADJUST; + uint64_t mstime = time; + mstime *= WIN32_FILETIME_SCALE; + mstime += WIN32_FILETIME_ADJUST; - #ifdef HAVE_MINGW - wintime.dwLowDateTime = (DWORD)(mstime & 0xffffffffUL); - #else - wintime.dwLowDateTime = (DWORD)(mstime & 0xffffffffI64); - #endif - wintime.dwHighDateTime = (DWORD) ((mstime>>32)& 0xffffffffUL); +#if defined(_MSC_VER) + wintime.dwLowDateTime = (DWORD)(mstime & 0xffffffffI64); +#else + wintime.dwLowDateTime = (DWORD)(mstime & 0xffffffffUL); +#endif + wintime.dwHighDateTime = (DWORD) ((mstime>>32)& 0xffffffffUL); } time_t @@ -181,18 +528,36 @@ errorString(void) 0, NULL); - return (const char *) lpMsgBuf; + /* Strip any \r or \n */ + char *rval = (char *) lpMsgBuf; + char *cp = strchr(rval, '\r'); + if (cp != NULL) { + *cp = 0; + } else { + cp = strchr(rval, '\n'); + if (cp != NULL) + *cp = 0; + } + return rval; } -#ifndef HAVE_MINGW static int statDir(const char *file, struct stat *sb) { - WIN32_FIND_DATA info; // window's file info - - if (file[1] == ':' && file[2] == 0) { - d_msg(__FILE__, __LINE__, 99, "faking ROOT attrs(%s).\n", file); + WIN32_FIND_DATAW info_w; // window's file info + WIN32_FIND_DATAA info_a; // window's file info + + // cache some common vars to make code more transparent + DWORD* pdwFileAttributes; + DWORD* pnFileSizeHigh; + DWORD* pnFileSizeLow; + FILETIME* pftLastAccessTime; + FILETIME* pftLastWriteTime; + FILETIME* pftCreationTime; + + if (file[1] == ':' && file[2] == 0) { + Dmsg1(99, "faking ROOT attrs(%s).\n", file); sb->st_mode = S_IFDIR; sb->st_mode |= S_IREAD|S_IEXEC|S_IWRITE; time(&sb->st_ctime); @@ -200,90 +565,88 @@ statDir(const char *file, struct stat *sb) time(&sb->st_atime); return 0; } - HANDLE h = FindFirstFile(file, &info); + + HANDLE h = INVALID_HANDLE_VALUE; + + // use unicode or ascii + if (p_FindFirstFileW) { + POOLMEM* pwszBuf = get_pool_memory (PM_FNAME); + make_win32_path_UTF8_2_wchar(&pwszBuf, file); + + h = p_FindFirstFileW((LPCWSTR) pwszBuf, &info_w); + free_pool_memory(pwszBuf); + + pdwFileAttributes = &info_w.dwFileAttributes; + pnFileSizeHigh = &info_w.nFileSizeHigh; + pnFileSizeLow = &info_w.nFileSizeLow; + pftLastAccessTime = &info_w.ftLastAccessTime; + pftLastWriteTime = &info_w.ftLastWriteTime; + pftCreationTime = &info_w.ftCreationTime; + } + else if (p_FindFirstFileA) { + h = p_FindFirstFileA(file, &info_a); + + pdwFileAttributes = &info_a.dwFileAttributes; + pnFileSizeHigh = &info_a.nFileSizeHigh; + pnFileSizeLow = &info_a.nFileSizeLow; + pftLastAccessTime = &info_a.ftLastAccessTime; + pftLastWriteTime = &info_a.ftLastWriteTime; + pftCreationTime = &info_a.ftCreationTime; + } if (h == INVALID_HANDLE_VALUE) { const char *err = errorString(); - d_msg(__FILE__, __LINE__, 99, "FindFirstFile(%s):%s\n", file, err); + Dmsg2(99, "FindFirstFile(%s):%s\n", file, err); LocalFree((void *)err); errno = b_errno_win32; return -1; } sb->st_mode = 0777; /* start with everything */ - if (info.dwFileAttributes & FILE_ATTRIBUTE_READONLY) + if (*pdwFileAttributes & FILE_ATTRIBUTE_READONLY) sb->st_mode &= ~(S_IRUSR|S_IRGRP|S_IROTH); - if (info.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM) + if (*pdwFileAttributes & FILE_ATTRIBUTE_SYSTEM) sb->st_mode &= ~S_IRWXO; /* remove everything for other */ - if (info.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) + if (*pdwFileAttributes & FILE_ATTRIBUTE_HIDDEN) sb->st_mode |= S_ISVTX; /* use sticky bit -> hidden */ sb->st_mode |= S_IFDIR; - sb->st_size = info.nFileSizeHigh; + sb->st_size = *pnFileSizeHigh; sb->st_size <<= 32; - sb->st_size |= info.nFileSizeLow; + sb->st_size |= *pnFileSizeLow; sb->st_blksize = 4096; sb->st_blocks = (uint32_t)(sb->st_size + 4095)/4096; - sb->st_atime = cvt_ftime_to_utime(info.ftLastAccessTime); - sb->st_mtime = cvt_ftime_to_utime(info.ftLastWriteTime); - sb->st_ctime = cvt_ftime_to_utime(info.ftCreationTime); + sb->st_atime = cvt_ftime_to_utime(*pftLastAccessTime); + sb->st_mtime = cvt_ftime_to_utime(*pftLastWriteTime); + sb->st_ctime = cvt_ftime_to_utime(*pftCreationTime); FindClose(h); return 0; } -static int -stat2(const char *file, struct stat *sb) +int +fstat(int fd, struct stat *sb) { BY_HANDLE_FILE_INFORMATION info; - HANDLE h; - int rval = 0; char tmpbuf[1024]; - cygwin_conv_to_win32_path(file, tmpbuf); - DWORD attr = GetFileAttributes(tmpbuf); - - if (attr == -1) { + if (!GetFileInformationByHandle((HANDLE)fd, &info)) { const char *err = errorString(); - d_msg(__FILE__, __LINE__, 99, - "GetFileAttrubtes(%s): %s\n", tmpbuf, err); + Dmsg2(99, "GetfileInformationByHandle(%s): %s\n", tmpbuf, err); LocalFree((void *)err); errno = b_errno_win32; return -1; } - if (attr & FILE_ATTRIBUTE_DIRECTORY) - return statDir(tmpbuf, sb); - - h = CreateFile(tmpbuf, GENERIC_READ, - FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); - - if (h == INVALID_HANDLE_VALUE) { - const char *err = errorString(); - d_msg(__FILE__, __LINE__, 99, - "Cannot open file for stat (%s):%s\n", tmpbuf, err); - LocalFree((void *)err); - rval = -1; - errno = b_errno_win32; - goto error; - } - - if (!GetFileInformationByHandle(h, &info)) { - const char *err = errorString(); - d_msg(__FILE__, __LINE__, 99, - "GetfileInformationByHandle(%s): %s\n", tmpbuf, err); - LocalFree((void *)err); - rval = -1; - errno = b_errno_win32; - goto error; - } - sb->st_dev = info.dwVolumeSerialNumber; sb->st_ino = info.nFileIndexHigh; sb->st_ino <<= 32; sb->st_ino |= info.nFileIndexLow; sb->st_nlink = (short)info.nNumberOfLinks; + if (sb->st_nlink > 1) { + Dmsg1(99, "st_nlink=%d\n", sb->st_nlink); + } sb->st_mode = 0777; /* start with everything */ if (info.dwFileAttributes & FILE_ATTRIBUTE_READONLY) @@ -303,118 +666,193 @@ stat2(const char *file, struct stat *sb) sb->st_mtime = cvt_ftime_to_utime(info.ftLastWriteTime); sb->st_ctime = cvt_ftime_to_utime(info.ftCreationTime); -error: + return 0; +} + +static int +stat2(const char *file, struct stat *sb) +{ + HANDLE h; + int rval = 0; + char tmpbuf[1024]; + conv_unix_to_win32_path(file, tmpbuf, 1024); + + DWORD attr = (DWORD)-1; + + if (p_GetFileAttributesW) { + POOLMEM* pwszBuf = get_pool_memory(PM_FNAME); + make_win32_path_UTF8_2_wchar(&pwszBuf, tmpbuf); + + attr = p_GetFileAttributesW((LPCWSTR) pwszBuf); + free_pool_memory(pwszBuf); + } else if (p_GetFileAttributesA) { + attr = p_GetFileAttributesA(tmpbuf); + } + + if (attr == (DWORD)-1) { + const char *err = errorString(); + Dmsg2(99, "GetFileAttributes(%s): %s\n", tmpbuf, err); + LocalFree((void *)err); + errno = b_errno_win32; + return -1; + } + + if (attr & FILE_ATTRIBUTE_DIRECTORY) + return statDir(tmpbuf, sb); + + h = CreateFileA(tmpbuf, GENERIC_READ, + FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + + if (h == INVALID_HANDLE_VALUE) { + const char *err = errorString(); + Dmsg2(99, "Cannot open file for stat (%s):%s\n", tmpbuf, err); + LocalFree((void *)err); + errno = b_errno_win32; + return -1; + } + + rval = fstat((int)h, sb); CloseHandle(h); + return rval; } int stat(const char *file, struct stat *sb) { - WIN32_FILE_ATTRIBUTE_DATA data; - errno = 0; + WIN32_FILE_ATTRIBUTE_DATA data; + errno = 0; - memset(sb, 0, sizeof(*sb)); + memset(sb, 0, sizeof(*sb)); - if (g_platform_id == VER_PLATFORM_WIN32_WINDOWS) - return stat2(file, sb); + /* why not allow win 95 to use p_GetFileAttributesExA ? + * this function allows _some_ open files to be stat'ed + * if (g_platform_id == VER_PLATFORM_WIN32_WINDOWS) { + * return stat2(file, sb); + * } + */ - // otherwise we're on NT -#if 0 - WCHAR buf[32767]; - buf[0] = '\\'; - buf[1] = '\\'; - buf[2] = '?'; - buf[3] = '\\'; + if (p_GetFileAttributesExW) { + /* dynamically allocate enough space for UCS2 filename */ + POOLMEM* pwszBuf = get_pool_memory (PM_FNAME); + make_win32_path_UTF8_2_wchar(&pwszBuf, file); - wchar_win32_path(file, buf+4); + BOOL b = p_GetFileAttributesExW((LPCWSTR) pwszBuf, GetFileExInfoStandard, &data); + free_pool_memory(pwszBuf); - if (!GetFileAttributesExW((WCHAR *)buf, GetFileExInfoStandard, &data)) - return stat2(file, sb); -#else - if (!GetFileAttributesEx(file, GetFileExInfoStandard, &data)) - return stat2(file, sb); -#endif - - sb->st_mode = 0777; /* start with everything */ - if (data.dwFileAttributes & FILE_ATTRIBUTE_READONLY) - sb->st_mode &= ~(S_IRUSR|S_IRGRP|S_IROTH); - if (data.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM) - sb->st_mode &= ~S_IRWXO; /* remove everything for other */ - if (data.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) - sb->st_mode |= S_ISVTX; /* use sticky bit -> hidden */ + if (!b) { + return stat2(file, sb); + } + } else if (p_GetFileAttributesExA) { + if (!p_GetFileAttributesExA(file, GetFileExInfoStandard, &data)) { + return stat2(file, sb); + } + } else { + return stat2(file, sb); + } - if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - sb->st_mode |= S_IFDIR; - else - sb->st_mode |= S_IFREG; + sb->st_mode = 0777; /* start with everything */ + if (data.dwFileAttributes & FILE_ATTRIBUTE_READONLY) { + sb->st_mode &= ~(S_IRUSR|S_IRGRP|S_IROTH); + } + if (data.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM) { + sb->st_mode &= ~S_IRWXO; /* remove everything for other */ + } + if (data.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) { + sb->st_mode |= S_ISVTX; /* use sticky bit -> hidden */ + } + if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { + sb->st_mode |= S_IFDIR; + } else { + sb->st_mode |= S_IFREG; + } - sb->st_nlink = 1; - sb->st_size = data.nFileSizeHigh; - sb->st_size <<= 32; - sb->st_size |= data.nFileSizeLow; - sb->st_blksize = 4096; - sb->st_blocks = (uint32_t)(sb->st_size + 4095)/4096; - sb->st_atime = cvt_ftime_to_utime(data.ftLastAccessTime); - sb->st_mtime = cvt_ftime_to_utime(data.ftLastWriteTime); - sb->st_ctime = cvt_ftime_to_utime(data.ftCreationTime); - return 0; + sb->st_nlink = 1; + sb->st_size = data.nFileSizeHigh; + sb->st_size <<= 32; + sb->st_size |= data.nFileSizeLow; + sb->st_blksize = 4096; + sb->st_blocks = (uint32_t)(sb->st_size + 4095)/4096; + sb->st_atime = cvt_ftime_to_utime(data.ftLastAccessTime); + sb->st_mtime = cvt_ftime_to_utime(data.ftLastWriteTime); + sb->st_ctime = cvt_ftime_to_utime(data.ftCreationTime); + return 0; } -#endif //HAVE_MINGW +int fcntl(int fd, int cmd, long arg) +{ + int rval = 0; + + switch (cmd) { + case F_GETFL: + rval = O_NONBLOCK; + break; + + case F_SETFL: + rval = 0; + break; + + default: + errno = EINVAL; + rval = -1; + break; + } + + return rval; +} int lstat(const char *file, struct stat *sb) { - return stat(file, sb); + return stat(file, sb); } void sleep(int sec) { - Sleep(sec * 1000); + Sleep(sec * 1000); } int geteuid(void) { - return 0; + return 0; } int execvp(const char *, char *[]) { - errno = ENOSYS; - return -1; + errno = ENOSYS; + return -1; } int fork(void) { - errno = ENOSYS; - return -1; + errno = ENOSYS; + return -1; } int pipe(int[]) { - errno = ENOSYS; - return -1; + errno = ENOSYS; + return -1; } int waitpid(int, int*, int) { - errno = ENOSYS; - return -1; + errno = ENOSYS; + return -1; } int readlink(const char *, char *, int) { - errno = ENOSYS; - return -1; + errno = ENOSYS; + return -1; } @@ -422,47 +860,46 @@ readlink(const char *, char *, int) int strcasecmp(const char *s1, const char *s2) { - register int ch1, ch2; - - if (s1==s2) - return 0; /* strings are equal if same object. */ - else if (!s1) - return -1; - else if (!s2) - return 1; - do - { - ch1 = *s1; - ch2 = *s2; - s1++; - s2++; - } while (ch1 != 0 && tolower(ch1) == tolower(ch2)); + register int ch1, ch2; + + if (s1==s2) + return 0; /* strings are equal if same object. */ + else if (!s1) + return -1; + else if (!s2) + return 1; + do { + ch1 = *s1; + ch2 = *s2; + s1++; + s2++; + } while (ch1 != 0 && tolower(ch1) == tolower(ch2)); - return(ch1 - ch2); + return(ch1 - ch2); } #endif //HAVE_MINGW int strncasecmp(const char *s1, const char *s2, int len) { - register int ch1, ch2; - - if (s1==s2) - return 0; /* strings are equal if same object. */ - else if (!s1) - return -1; - else if (!s2) - return 1; - while (len--) - { - ch1 = *s1; - ch2 = *s2; - s1++; - s2++; - if (ch1 == 0 || tolower(ch1) != tolower(ch2)) break; - } + register int ch1 = 0, ch2 = 0; + + if (s1==s2) + return 0; /* strings are equal if same object. */ + else if (!s1) + return -1; + else if (!s2) + return 1; + + while (len--) { + ch1 = *s1; + ch2 = *s2; + s1++; + s2++; + if (ch1 == 0 || tolower(ch1) != tolower(ch2)) break; + } - return (ch1 - ch2); + return (ch1 - ch2); } int @@ -492,13 +929,17 @@ gettimeofday(struct timeval *tv, struct timezone *) } -int -syslog(int type, const char *fmt, const char *msg) +/* For apcupsd this is in src/lib/wincompat.c */ +extern "C" void syslog(int type, const char *fmt, ...) { /*#ifndef HAVE_CONSOLE MessageBox(NULL, msg, "Bacula", MB_OK); #endif*/ - return 0; +} + +void +closelog() +{ } struct passwd * @@ -514,56 +955,98 @@ getgrgid(uid_t) } // implement opendir/readdir/closedir on top of window's API + typedef struct _dir { - WIN32_FIND_DATA data; // window's file info + WIN32_FIND_DATAA data_a; // window's file info (ansii version) + WIN32_FIND_DATAW data_w; // window's file info (wchar version) const char *spec; // the directory we're traversing HANDLE dirh; // the search handle - BOOL valid; // the info in data field is valid + BOOL valid_a; // the info in data_a field is valid + BOOL valid_w; // the info in data_w field is valid UINT32 offset; // pseudo offset for d_off } _dir; DIR * opendir(const char *path) { - int max_len = strlen(path) + 16; + /* enough space for VSS !*/ + int max_len = strlen(path) + MAX_PATH; _dir *rval = NULL; if (path == NULL) { errno = ENOENT; return NULL; } + Dmsg1(100, "Opendir path=%s\n", path); rval = (_dir *)malloc(sizeof(_dir)); + memset (rval, 0, sizeof (_dir)); if (rval == NULL) return NULL; char *tspec = (char *)malloc(max_len); if (tspec == NULL) return NULL; if (g_platform_id != VER_PLATFORM_WIN32_WINDOWS) { - // allow path to be 32767 bytes - tspec[0] = '\\'; - tspec[1] = '\\'; - tspec[2] = '?'; - tspec[3] = '\\'; - tspec[4] = 0; - cygwin_conv_to_win32_path(path, tspec+4); +#ifdef WIN32_VSS + /* will append \\?\ at front itself */ + conv_unix_to_win32_path(path, tspec, max_len-4); + Dmsg1(100, "win32 path=%s\n", tspec); +#else + /* allow path to be 32767 bytes */ + tspec[0] = '\\'; + tspec[1] = '\\'; + tspec[2] = '?'; + tspec[3] = '\\'; + tspec[4] = 0; + conv_unix_to_win32_path(path, tspec+4, max_len-4); + Dmsg1(100, "win32 path=%s\n", tspec); +#endif } else { - cygwin_conv_to_win32_path(path, tspec); + conv_unix_to_win32_path(path, tspec, max_len); + Dmsg1(100, "win32 path=%s\n", tspec); } - strncat(tspec, "\\*", max_len); + // add backslash only if there is none yet (think of c:\) + if (tspec[strlen(tspec)-1] != '\\') + bstrncat(tspec, "\\*", max_len); + else + bstrncat(tspec, "*", max_len); + rval->spec = tspec; - rval->dirh = FindFirstFile(rval->spec, &rval->data); - d_msg(__FILE__, __LINE__, - 99, "opendir(%s)\n\tspec=%s,\n\tFindFirstFile returns %d\n", + // convert to wchar_t + if (p_FindFirstFileW) { + POOLMEM* pwcBuf = get_pool_memory(PM_FNAME);; + make_win32_path_UTF8_2_wchar(&pwcBuf, rval->spec); + + rval->dirh = p_FindFirstFileW((LPCWSTR)pwcBuf, &rval->data_w); + + free_pool_memory(pwcBuf); + + if (rval->dirh != INVALID_HANDLE_VALUE) + rval->valid_w = 1; + } else if (p_FindFirstFileA) { + rval->dirh = p_FindFirstFileA(rval->spec, &rval->data_a); + + if (rval->dirh != INVALID_HANDLE_VALUE) + rval->valid_a = 1; + } else goto err; + + + Dmsg3(99, "opendir(%s)\n\tspec=%s,\n\tFindFirstFile returns %d\n", path, rval->spec, rval->dirh); rval->offset = 0; if (rval->dirh == INVALID_HANDLE_VALUE) goto err; - rval->valid = 1; - d_msg(__FILE__, __LINE__, - 99, "\tFirstFile=%s\n", rval->data.cFileName); + + if (rval->valid_w) { + Dmsg1(99, "\tFirstFile=%s\n", rval->data_w.cFileName); + } + + if (rval->valid_a) { + Dmsg1(99, "\tFirstFile=%s\n", rval->data_a.cFileName); + } + return (DIR *)rval; err: @@ -616,19 +1099,37 @@ int readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result) { _dir *dp = (_dir *)dirp; - if (dp->valid) { - entry->d_off = dp->offset; - dp->offset += copyin(*entry, dp->data.cFileName); - *result = entry; /* return entry address */ - d_msg(__FILE__, __LINE__, - 99, "readdir_r(%p, { d_name=\"%s\", d_reclen=%d, d_off=%d\n", - dirp, entry->d_name, entry->d_reclen, entry->d_off); + if (dp->valid_w || dp->valid_a) { + entry->d_off = dp->offset; + + // copy unicode + if (dp->valid_w) { + char szBuf[MAX_PATH_UTF8+1]; + wchar_2_UTF8(szBuf,dp->data_w.cFileName); + dp->offset += copyin(*entry, szBuf); + } else if (dp->valid_a) { // copy ansi (only 1 will be valid) + dp->offset += copyin(*entry, dp->data_a.cFileName); + } + + *result = entry; /* return entry address */ + Dmsg4(99, "readdir_r(%p, { d_name=\"%s\", d_reclen=%d, d_off=%d\n", + dirp, entry->d_name, entry->d_reclen, entry->d_off); } else { -// d_msg(__FILE__, __LINE__, 99, "readdir_r !valid\n"); +// Dmsg0(99, "readdir_r !valid\n"); errno = b_errno_win32; return -1; } - dp->valid = FindNextFile(dp->dirh, &dp->data); + + // get next file, try unicode first + if (p_FindNextFileW) + dp->valid_w = p_FindNextFileW(dp->dirh, &dp->data_w); + else if (p_FindNextFileA) + dp->valid_a = p_FindNextFileA(dp->dirh, &dp->data_a); + else { + dp->valid_a = FALSE; + dp->valid_w = FALSE; + } + return 0; } @@ -701,7 +1202,7 @@ pathconf(const char *path, int name) case _PC_NAME_MAX : return 255; } - errno = ENOSYS; + errno = ENOSYS; return -1; } @@ -727,17 +1228,62 @@ WSA_Init(void) int win32_chdir(const char *dir) { - if (0 == SetCurrentDirectory(dir)) { - errno = b_errno_win32; - return -1; - } - return 0; + if (p_SetCurrentDirectoryW) { + POOLMEM* pwszBuf = get_pool_memory(PM_FNAME); + make_win32_path_UTF8_2_wchar(&pwszBuf, dir); + + BOOL b=p_SetCurrentDirectoryW((LPCWSTR)pwszBuf); + + free_pool_memory(pwszBuf); + + if (!b) { + errno = b_errno_win32; + return -1; + } + } + else if (p_SetCurrentDirectoryA) { + if (0 == p_SetCurrentDirectoryA(dir)) { + errno = b_errno_win32; + return -1; + } + } + else return -1; + + return 0; +} + +int +win32_mkdir(const char *dir) +{ + if (p_wmkdir){ + POOLMEM* pwszBuf = get_pool_memory(PM_FNAME); + make_win32_path_UTF8_2_wchar(&pwszBuf, dir); + + int n = p_wmkdir((LPCWSTR)pwszBuf); + free_pool_memory(pwszBuf); + return n; + } + + return _mkdir(dir); } + char * win32_getcwd(char *buf, int maxlen) { - int n = GetCurrentDirectory(maxlen, buf); + int n=0; + + if (p_GetCurrentDirectoryW) { + POOLMEM* pwszBuf = get_pool_memory(PM_FNAME); + pwszBuf = check_pool_memory_size (pwszBuf, maxlen*sizeof(wchar_t)); + + n = p_GetCurrentDirectoryW(maxlen, (LPWSTR) pwszBuf); + if (n!=0) + n = wchar_2_UTF8 (buf, (wchar_t *)pwszBuf, maxlen)-1; + free_pool_memory(pwszBuf); + + } else if (p_GetCurrentDirectoryA) + n = p_GetCurrentDirectoryA(maxlen, buf); if (n == 0 || n > maxlen) return NULL; @@ -749,10 +1295,156 @@ win32_getcwd(char *buf, int maxlen) return buf; } +int +win32_fputs(const char *string, FILE *stream) +{ + /* we use WriteConsoleA / WriteConsoleA + so we can be sure that unicode support works on win32. + with fallback if something fails + */ + + HANDLE hOut = GetStdHandle (STD_OUTPUT_HANDLE); + if (hOut && (hOut != INVALID_HANDLE_VALUE) && p_WideCharToMultiByte && + p_MultiByteToWideChar && (stream == stdout)) { + + POOLMEM* pwszBuf = get_pool_memory(PM_MESSAGE); + + DWORD dwCharsWritten; + DWORD dwChars; + + dwChars = UTF8_2_wchar(&pwszBuf, string); + + /* try WriteConsoleW */ + if (WriteConsoleW (hOut, pwszBuf, dwChars-1, &dwCharsWritten, NULL)) { + free_pool_memory(pwszBuf); + return dwCharsWritten; + } + + /* convert to local codepage and try WriteConsoleA */ + POOLMEM* pszBuf = get_pool_memory(PM_MESSAGE); + pszBuf = check_pool_memory_size(pszBuf, dwChars+1); + + dwChars = p_WideCharToMultiByte(GetConsoleOutputCP(),0,(LPCWSTR) pwszBuf,-1,pszBuf,dwChars,NULL,NULL); + free_pool_memory(pwszBuf); + + if (WriteConsoleA (hOut, pszBuf, dwChars-1, &dwCharsWritten, NULL)) { + free_pool_memory(pszBuf); + return dwCharsWritten; + } + } + + return fputs(string, stream); +} + +char* +win32_cgets (char* buffer, int len) +{ + /* we use console ReadConsoleA / ReadConsoleW to be able to read unicode + from the win32 console and fallback if seomething fails */ + + HANDLE hIn = GetStdHandle (STD_INPUT_HANDLE); + if (hIn && (hIn != INVALID_HANDLE_VALUE) && p_WideCharToMultiByte && p_MultiByteToWideChar) { + DWORD dwRead; + wchar_t wszBuf[1024]; + char szBuf[1024]; + + /* nt and unicode conversion */ + if (ReadConsoleW (hIn, wszBuf, 1024, &dwRead, NULL)) { + + /* null terminate at end */ + if (wszBuf[dwRead-1] == L'\n') { + wszBuf[dwRead-1] = L'\0'; + dwRead --; + } + + if (wszBuf[dwRead-1] == L'\r') { + wszBuf[dwRead-1] = L'\0'; + dwRead --; + } + + wchar_2_UTF8(buffer, wszBuf, len); + return buffer; + } + + /* win 9x and unicode conversion */ + if (ReadConsoleA (hIn, szBuf, 1024, &dwRead, NULL)) { + + /* null terminate at end */ + if (szBuf[dwRead-1] == L'\n') { + szBuf[dwRead-1] = L'\0'; + dwRead --; + } + + if (szBuf[dwRead-1] == L'\r') { + szBuf[dwRead-1] = L'\0'; + dwRead --; + } + + /* convert from ansii to wchar_t */ + p_MultiByteToWideChar(GetConsoleCP(), 0, szBuf, -1, wszBuf,1024); + /* convert from wchar_t to UTF-8 */ + if (wchar_2_UTF8(buffer, wszBuf, len)) + return buffer; + } + } + + /* fallback */ + if (fgets(buffer, len, stdin)) + return buffer; + else + return NULL; +} + +int +win32_unlink(const char *filename) +{ + int nRetCode; + if (p_wunlink) { + POOLMEM* pwszBuf = get_pool_memory(PM_FNAME); + make_win32_path_UTF8_2_wchar(&pwszBuf, filename); + + nRetCode = _wunlink((LPCWSTR) pwszBuf); + + /* special case if file is readonly, + we retry but unset attribute before */ + if (nRetCode == -1 && errno == EACCES && p_SetFileAttributesW && p_GetFileAttributesW) { + DWORD dwAttr = p_GetFileAttributesW((LPCWSTR)pwszBuf); + if (dwAttr != INVALID_FILE_ATTRIBUTES) { + if (p_SetFileAttributesW((LPCWSTR)pwszBuf, dwAttr & ~FILE_ATTRIBUTE_READONLY)) { + nRetCode = _wunlink((LPCWSTR) pwszBuf); + /* reset to original if it didn't help */ + if (nRetCode == -1) + p_SetFileAttributesW((LPCWSTR)pwszBuf, dwAttr); + } + } + } + free_pool_memory(pwszBuf); + } else { + nRetCode = _unlink(filename); + + /* special case if file is readonly, + we retry but unset attribute before */ + if (nRetCode == -1 && errno == EACCES && p_SetFileAttributesA && p_GetFileAttributesA) { + DWORD dwAttr = p_GetFileAttributesA(filename); + if (dwAttr != INVALID_FILE_ATTRIBUTES) { + if (p_SetFileAttributesA(filename, dwAttr & ~FILE_ATTRIBUTE_READONLY)) { + nRetCode = _unlink(filename); + /* reset to original if it didn't help */ + if (nRetCode == -1) + p_SetFileAttributesA(filename, dwAttr); + } + } + } + } + return nRetCode; +} + + #include "mswinver.h" char WIN_VERSION_LONG[64]; char WIN_VERSION[32]; +char WIN_RAWVERSION[32]; class winver { public: @@ -761,8 +1453,6 @@ public: static winver INIT; // cause constructor to be called before main() -#include "bacula.h" -#include "jcr.h" winver::winver(void) { @@ -776,8 +1466,11 @@ winver::winver(void) version = "Unknown"; platform = "Unknown"; } - else - switch (_mkversion(osvinfo.dwPlatformId, osvinfo.dwMajorVersion, osvinfo.dwMinorVersion)) + const int ver = _mkversion(osvinfo.dwPlatformId, + osvinfo.dwMajorVersion, + osvinfo.dwMinorVersion); + snprintf(WIN_RAWVERSION, sizeof(WIN_RAWVERSION), "Windows %#08x", ver); + switch (ver) { case MS_WINDOWS_95: (version = "Windows 95"); break; case MS_WINDOWS_98: (version = "Windows 98"); break; @@ -786,11 +1479,11 @@ winver::winver(void) case MS_WINDOWS_2K: (version = "Windows 2000");platform = "NT"; break; case MS_WINDOWS_XP: (version = "Windows XP");platform = "NT"; break; case MS_WINDOWS_S2003: (version = "Windows Server 2003");platform = "NT"; break; - default: version = "Windows ??"; break; + default: version = WIN_RAWVERSION; break; } bstrncpy(WIN_VERSION_LONG, version, sizeof(WIN_VERSION_LONG)); - snprintf(WIN_VERSION, sizeof(WIN_VERSION), "%s %d.%d.%d", + snprintf(WIN_VERSION, sizeof(WIN_VERSION), "%s %lu.%lu.%lu", platform, osvinfo.dwMajorVersion, osvinfo.dwMinorVersion, osvinfo.dwBuildNumber); #if 0 @@ -810,7 +1503,7 @@ winver::winver(void) BOOL CreateChildProcess(VOID); VOID WriteToPipe(VOID); VOID ReadFromPipe(VOID); -VOID ErrorExit(LPTSTR); +VOID ErrorExit(LPCSTR); VOID ErrMsg(LPTSTR, BOOL); /** @@ -824,7 +1517,8 @@ getArgv0(const char *cmdline) { int inquote = 0; - for (const char *cp = cmdline; *cp; cp++) + const char *cp; + for (cp = cmdline; *cp; cp++) { if (*cp == '"') { inquote = !inquote; @@ -833,13 +1527,13 @@ getArgv0(const char *cmdline) break; } - + int len = cp - cmdline; char *rval = (char *)malloc(len+1); cp = cmdline; char *rp = rval; - + while (len--) *rp++ = *cp++; @@ -857,12 +1551,18 @@ getArgv0(const char *cmdline) HANDLE CreateChildProcess(const char *cmdline, HANDLE in, HANDLE out, HANDLE err) { + static const char *comspec = NULL; PROCESS_INFORMATION piProcInfo; - STARTUPINFO siStartInfo; + STARTUPINFOA siStartInfo; BOOL bFuncRetn = FALSE; - // Set up members of the PROCESS_INFORMATION structure. + if (comspec == NULL) { + comspec = getenv("COMSPEC"); + } + if (comspec == NULL) // should never happen + return INVALID_HANDLE_VALUE; + // Set up members of the PROCESS_INFORMATION structure. ZeroMemory( &piProcInfo, sizeof(PROCESS_INFORMATION) ); // Set up members of the STARTUPINFO structure. @@ -890,21 +1590,17 @@ CreateChildProcess(const char *cmdline, HANDLE in, HANDLE out, HANDLE err) // Create the child process. char exeFile[256]; + int cmdLen = strlen(cmdline) + strlen(comspec) + 16; - const char *comspec = getenv("COMSPEC"); - - if (comspec == NULL) // should never happen - return INVALID_HANDLE_VALUE; + char *cmdLine = (char *)alloca(cmdLen); - char *cmdLine = (char *)alloca(strlen(cmdline) + strlen(comspec) + 16); - - strcpy(exeFile, comspec); - strcpy(cmdLine, comspec); - strcat(cmdLine, " /c "); - strcat(cmdLine, cmdline); + bstrncpy(exeFile, comspec, sizeof(exeFile)); + bstrncpy(cmdLine, comspec, cmdLen); + bstrncat(cmdLine, " /c ", cmdLen); + bstrncat(cmdLine, cmdline, cmdLen); // try to execute program - bFuncRetn = CreateProcess(exeFile, + bFuncRetn = CreateProcessA(exeFile, cmdLine, // command line NULL, // process security attributes NULL, // primary thread security attributes @@ -918,8 +1614,7 @@ CreateChildProcess(const char *cmdline, HANDLE in, HANDLE out, HANDLE err) if (bFuncRetn == 0) { ErrorExit("CreateProcess failed\n"); const char *err = errorString(); - d_msg(__FILE__, __LINE__, 99, - "CreateProcess(%s, %s, ...)=%s\n", exeFile, cmdLine, err); + Dmsg3(99, "CreateProcess(%s, %s, ...)=%s\n", exeFile, cmdLine, err); LocalFree((void *)err); return INVALID_HANDLE_VALUE; } @@ -932,9 +1627,9 @@ CreateChildProcess(const char *cmdline, HANDLE in, HANDLE out, HANDLE err) void -ErrorExit (LPTSTR lpszMessage) +ErrorExit (LPCSTR lpszMessage) { - d_msg(__FILE__, __LINE__, 0, "%s", lpszMessage); + Dmsg1(0, "%s", lpszMessage); } @@ -956,7 +1651,6 @@ CloseIfValid(HANDLE handle) CloseHandle(handle); } -#ifndef HAVE_MINGW BPIPE * open_bpipe(char *prog, int wait, const char *mode) { @@ -1082,56 +1776,61 @@ cleanup: return NULL; } -#endif //HAVE_MINGW int kill(int pid, int signal) { - int rval = 0; - if (!TerminateProcess((HANDLE)pid, (UINT) signal)) { - rval = -1; - errno = b_errno_win32; - } - CloseHandle((HANDLE)pid); - return rval; + int rval = 0; + if (!TerminateProcess((HANDLE)pid, (UINT) signal)) { + rval = -1; + errno = b_errno_win32; + } + CloseHandle((HANDLE)pid); + return rval; } -#ifndef HAVE_MINGW int close_bpipe(BPIPE *bpipe) { - int rval = 0; - if (bpipe->rfd) fclose(bpipe->rfd); - if (bpipe->wfd) fclose(bpipe->wfd); - - if (bpipe->wait) { - int remaining_wait = bpipe->wait; - do { - DWORD exitCode; - if (!GetExitCodeProcess((HANDLE)bpipe->worker_pid, &exitCode)) { - const char *err = errorString(); - rval = b_errno_win32; - d_msg(__FILE__, __LINE__, 0, - "GetExitCode error %s\n", err); - LocalFree((void *)err); - break; - } + int rval = 0; + int32_t remaining_wait = bpipe->wait; - if (exitCode == STILL_ACTIVE) { - bmicrosleep(1, 0); /* wait one second */ - remaining_wait--; - } - else break; - } while(remaining_wait); - rval = ETIME; /* timed out */ - } + if (remaining_wait == 0) { /* wait indefinitely */ + remaining_wait = INT32_MAX; + } + for ( ;; ) { + DWORD exitCode; + if (!GetExitCodeProcess((HANDLE)bpipe->worker_pid, &exitCode)) { + const char *err = errorString(); + rval = b_errno_win32; + Dmsg1(0, "GetExitCode error %s\n", err); + LocalFree((void *)err); + break; + } + if (exitCode == STILL_ACTIVE) { + if (remaining_wait <= 0) { + rval = ETIME; /* timed out */ + break; + } + bmicrosleep(1, 0); /* wait one second */ + remaining_wait--; + } else if (exitCode != 0) { + /* Truncate exit code as it doesn't seem to be correct */ + rval = (exitCode & 0xFF) | b_errno_exit; + break; + } else { + break; /* Shouldn't get here */ + } + } - if (bpipe->timer_id) { - stop_child_timer(bpipe->timer_id); - } - free((void *)bpipe); - return rval; + if (bpipe->timer_id) { + stop_child_timer(bpipe->timer_id); + } + if (bpipe->rfd) fclose(bpipe->rfd); + if (bpipe->wfd) fclose(bpipe->wfd); + free((void *)bpipe); + return rval; } int @@ -1155,25 +1854,41 @@ int utime(const char *fname, struct utimbuf *times) { FILETIME acc, mod; - char tmpbuf[1024]; + char tmpbuf[5000]; - cygwin_conv_to_win32_path(fname, tmpbuf); + conv_unix_to_win32_path(fname, tmpbuf, 5000); cvt_utime_to_ftime(times->actime, acc); cvt_utime_to_ftime(times->modtime, mod); - HANDLE h = CreateFile(tmpbuf, - FILE_WRITE_ATTRIBUTES, - FILE_SHARE_WRITE, - NULL, - OPEN_EXISTING, - 0, - NULL); + HANDLE h = INVALID_HANDLE_VALUE; + + if (p_CreateFileW) { + POOLMEM* pwszBuf = get_pool_memory(PM_FNAME); + make_win32_path_UTF8_2_wchar(&pwszBuf, tmpbuf); + + h = p_CreateFileW((LPCWSTR)pwszBuf, + FILE_WRITE_ATTRIBUTES, + FILE_SHARE_WRITE|FILE_SHARE_READ|FILE_SHARE_DELETE, + NULL, + OPEN_EXISTING, + FILE_FLAG_BACKUP_SEMANTICS, // required for directories + NULL); + + free_pool_memory(pwszBuf); + } else if (p_CreateFileA) { + h = p_CreateFileA(tmpbuf, + FILE_WRITE_ATTRIBUTES, + FILE_SHARE_WRITE|FILE_SHARE_READ|FILE_SHARE_DELETE, + NULL, + OPEN_EXISTING, + FILE_FLAG_BACKUP_SEMANTICS, // required for directories + NULL); + } if (h == INVALID_HANDLE_VALUE) { const char *err = errorString(); - d_msg(__FILE__, __LINE__, 99, - "Cannot open file for utime(%s,...):%s\n", tmpbuf, err); + Dmsg2(99, "Cannot open file \"%s\" for utime(): ERR=%s", tmpbuf, err); LocalFree((void *)err); errno = b_errno_win32; return -1; @@ -1187,81 +1902,48 @@ utime(const char *fname, struct utimbuf *times) return rval; } -#if USE_WIN32_COMPAT_IO - -int -open(const char *file, int flags, int mode) -{ - return _open(file, flags|_O_BINARY, mode); - -} - -/* - * Note, this works only for a file. If you want - * to close a socket, use closesocket(). - * Bacula has been modified in src/lib/bnet.c - * to use closesocket(). - */ -int -close(int fd) -{ - return _close(fd); -} - -#ifndef HAVE_WXCONSOLE -ssize_t -read(int fd, void *buf, ssize_t len) -{ - return _read(fd, buf, (size_t)len); -} - -ssize_t -write(int fd, const void *buf, ssize_t len) -{ - return _write(fd, buf, (size_t)len); -} -#endif - -off_t -lseek(int fd, off_t offset, int whence) -{ - return _lseeki64(fd, offset, whence); -} - -int -dup2(int fd1, int fd2) -{ - return _dup2(fd1, fd2); -} -#else +#if 0 int -open(const char *file, int flags, int mode) +file_open(const char *file, int flags, int mode) { DWORD access = 0; DWORD shareMode = 0; DWORD create = 0; DWORD msflags = 0; - HANDLE foo; + HANDLE foo = INVALID_HANDLE_VALUE; const char *remap = file; if (flags & O_WRONLY) access = GENERIC_WRITE; else if (flags & O_RDWR) access = GENERIC_READ|GENERIC_WRITE; else access = GENERIC_READ; - if (flags & O_CREAT) create = CREATE_NEW; - else create = OPEN_EXISTING; - - if (flags & O_TRUNC) create = TRUNCATE_EXISTING; + if ((flags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL)) + create = CREATE_NEW; + else if ((flags & (O_CREAT | O_TRUNC)) == (O_CREAT | O_TRUNC)) + create = CREATE_ALWAYS; + else if (flags & O_CREAT) + create = OPEN_ALWAYS; + else if (flags & O_TRUNC) + create = TRUNCATE_EXISTING; + else + create = OPEN_EXISTING; - if (!(flags & O_EXCL)) - shareMode = FILE_SHARE_DELETE|FILE_SHARE_READ|FILE_SHARE_WRITE; + shareMode = 0; if (flags & O_APPEND) { printf("open...APPEND not implemented yet."); exit(-1); } - foo = CreateFile(file, access, shareMode, NULL, create, msflags, NULL); + if (p_CreateFileW) { + POOLMEM* pwszBuf = get_pool_memory(PM_FNAME); + make_win32_path_UTF8_2_wchar(&pwszBuf, file); + + foo = p_CreateFileW((LPCWSTR) pwszBuf, access, shareMode, NULL, create, msflags, NULL); + free_pool_memory(pwszBuf); + } else if (p_CreateFileA) + foo = CreateFile(file, access, shareMode, NULL, create, msflags, NULL); + if (INVALID_HANDLE_VALUE == foo) { errno = b_errno_win32; return(int) -1; @@ -1272,7 +1954,7 @@ open(const char *file, int flags, int mode) int -close(int fd) +file_close(int fd) { if (!CloseHandle((HANDLE)fd)) { errno = b_errno_win32; @@ -1283,7 +1965,7 @@ close(int fd) } ssize_t -write(int fd, const void *data, ssize_t len) +file_write(int fd, const void *data, ssize_t len) { BOOL status; DWORD bwrite; @@ -1295,7 +1977,7 @@ write(int fd, const void *data, ssize_t len) ssize_t -read(int fd, void *data, ssize_t len) +file_read(int fd, void *data, ssize_t len) { BOOL status; DWORD bread; @@ -1307,7 +1989,7 @@ read(int fd, void *data, ssize_t len) } off_t -lseek(int fd, off_t offset, int whence) +file_seek(int fd, off_t offset, int whence) { DWORD method = 0; DWORD val; @@ -1335,18 +2017,14 @@ lseek(int fd, off_t offset, int whence) } int -dup2(int, int) +file_dup2(int, int) { errno = ENOSYS; return -1; } - - #endif -#endif //HAVE_MINGW - #ifdef HAVE_MINGW /* syslog function, added by Nicolas Boichat */ -void closelog() {} +void openlog(const char *ident, int option, int facility) {} #endif //HAVE_MINGW