X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fwin32%2Fcompat%2Fcompat.cpp;h=d662f0279f7ede19bdeaa16962baff7dc7ea424d;hb=e24571079145872d07e448c855668ca6105fc4c7;hp=edd04b528b400233cec40f0cded43bdca05e60ae;hpb=14b82a889f1ab2f3139aa7ac91bc79a6399ad8ec;p=bacula%2Fbacula

diff --git a/bacula/src/win32/compat/compat.cpp b/bacula/src/win32/compat/compat.cpp
index edd04b528b..d662f0279f 100644
--- a/bacula/src/win32/compat/compat.cpp
+++ b/bacula/src/win32/compat/compat.cpp
@@ -1,3 +1,30 @@
+/*
+   Bacula® - The Network Backup Solution
+
+   Copyright (C) 2004-2010 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.
+   This program is Free Software; you can redistribute it and/or
+   modify it under the terms of version three of the GNU Affero General Public
+   License as published by the Free Software Foundation and included
+   in the file LICENSE.
+
+   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 Affero General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+
+   Bacula® is a registered trademark of Kern Sibbald.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
+*/
 //                              -*- Mode: C++ -*-
 // compat.cpp -- compatibilty layer to make bacula-fd run
 //               natively under windows
@@ -5,61 +32,130 @@
 // Copyright transferred from Raider Solutions, Inc to
 //   Kern Sibbald and John Walker by express permission.
 //
-//  Copyright (C) 2004-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
-//  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 
-//  the file LICENSE for additional details.
-//
 // Author          : Christopher S. Hull
 // Created On      : Sat Jan 31 15:55:00 2004
-// $Id$
+
 
 #include "bacula.h"
+#include "compat.h"
+#include "jcr.h"
+#include "findlib/find.h"
+
+static const int dbglvl = 500;
+
 #define b_errno_win32 (1<<29)
 
-#include "vss.h"
+#define MAX_PATHLENGTH  1024
+
+/**
+   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 = NULL;
+static POOLMEM *g_pWin32ConvUCS2Cache = NULL;
+static DWORD g_dwWin32ConvUTF8strlen = 0;
+static pthread_mutex_t Win32Convmutex = PTHREAD_MUTEX_INITIALIZER;
+
+static t_pVSSPathConvert   g_pVSSPathConvert;
+static t_pVSSPathConvertW  g_pVSSPathConvertW;
+
+/* Forward referenced functions */
+static const char *errorString(void);
 
-#include "../../lib/winapi.h"
+
+void SetVSSPathConvert(t_pVSSPathConvert pPathConvert, t_pVSSPathConvertW pPathConvertW)
+{
+   g_pVSSPathConvert = pPathConvert;
+   g_pVSSPathConvertW = pPathConvertW;
+}
+
+static void Win32ConvInitCache()
+{
+   if (g_pWin32ConvUTF8Cache) {
+      return;
+   }
+   g_pWin32ConvUTF8Cache = get_pool_memory(PM_FNAME);
+   g_pWin32ConvUCS2Cache = get_pool_memory(PM_FNAME);
+}
+
+void Win32ConvCleanupCache()
+{
+   P(Win32Convmutex);
+   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;
+   V(Win32Convmutex);
+}
 
 
 /* to allow the usage of the original version in this file here */
 #undef fputs
 
 
-#define USE_WIN32_COMPAT_IO 1
+//#define USE_WIN32_COMPAT_IO 1
+#define USE_WIN32_32KPATHCONVERSION 1
 
-extern void d_msg(const char *file, int line, int level, const char *fmt,...);
 extern DWORD   g_platform_id;
-extern int enable_vss;  
+extern DWORD   g_MinorVersion;
 
-// from MicroSoft SDK (KES) is the diff between Jan 1 1601 and Jan 1 1970
+/* 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
 
-void conv_unix_to_win32_path(const char *name, char *win32_name, DWORD dwSize)
+/**
+ * Convert from UTF-8 to VSS Windows path/file 
+ *  Used by compatibility layer for Unix system calls
+ */
+static void conv_unix_to_vss_win32_path(const char *name, char *win32_name, DWORD dwSize)
 {
     const char *fname = name;
     char *tname = win32_name;
+
+    Dmsg0(dbglvl, "Enter convert_unix_to_win32_path\n");
+
+    if (IsPathSeparator(name[0]) &&
+        IsPathSeparator(name[1]) &&
+        name[2] == '.' &&
+        IsPathSeparator(name[3])) {
+
+        *win32_name++ = '\\';
+        *win32_name++ = '\\';
+        *win32_name++ = '.';
+        *win32_name++ = '\\';
+
+        name += 4;
+    } else if (g_platform_id != VER_PLATFORM_WIN32_WINDOWS &&
+               g_pVSSPathConvert == NULL) {
+        /* allow path to be 32767 bytes */
+        *win32_name++ = '\\';
+        *win32_name++ = '\\';
+        *win32_name++ = '?';
+        *win32_name++ = '\\';
+    }
+
     while (*name) {
-        /* Check for Unix separator and convert to Win32 */
+        /** 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 */
+        /* If Win32 separator that is "quoted", remove quote */
         } else if (*name == '\\' && name[1] == '\\') {
             *win32_name++ = '\\';
             name++;                   /* skip first \ */
@@ -68,66 +164,285 @@ void conv_unix_to_win32_path(const char *name, char *win32_name, DWORD dwSize)
         }
         name++;
     }
-    /* Strip any trailing slash, if we stored something */
-    if (*fname != 0 && win32_name[-1] == '\\') {
+    /** Strip any trailing slash, if we stored something
+     * 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;
     }
 
-#ifdef WIN32_VSS
-    /* here we convert to VSS specific file name which
+    /** 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_pVSSClient && enable_vss && g_pVSSClient->IsInitialized()) {
+    */
+    Dmsg1(dbglvl, "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_pVSSClient->GetShadowPath(pszBuf, tname, dwSize);
+       g_pVSSPathConvert(pszBuf, tname, dwSize);
        free_pool_memory(pszBuf);
     }
-#endif
+
+    Dmsg1(dbglvl, "Leave cvt_u_to_win32_path path=%s\n", tname);
 }
 
-int 
-wchar_2_UTF8(char *pszUTF, const WCHAR *pszUCS, int cchChar)
+/** Conversion of a Unix filename to a Win32 filename */
+void unix_name_to_win32(POOLMEM **win32_name, char *name)
 {
-   /* the return value is the number of bytes written to the buffer. 
-      The number includes the byte for the null terminator. */
+   /* 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_vss_win32_path(name, *win32_name, dwSize);
+}
 
-   if (p_WideCharToMultiByte) {
-         int nRet = p_WideCharToMultiByte(CP_UTF8,0,pszUCS,-1,pszUTF,cchChar,NULL,NULL);
-         ASSERT (nRet > 0);
-         return nRet;
+
+/**
+ * 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.  
+ *
+ *        created 02/27/2006 Thorsten Engel
+ */
+static POOLMEM* 
+make_wchar_win32_path(POOLMEM *pszUCSPath, BOOL *pBIsRawPath /*= NULL*/)
+{
+
+   Dmsg0(dbglvl, "Enter wchar_win32_path\n");
+   if (pBIsRawPath) {
+      *pBIsRawPath = FALSE;              /* Initialize, set later */
+   }
+
+   if (!p_GetCurrentDirectoryW) {
+      Dmsg0(dbglvl, "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(dbglvl, "Leave wchar_win32_path no change \n");
+      return pszUCSPath;
+   }
+
+   wchar_t *pwszBuf = (wchar_t *)get_pool_memory(PM_FNAME);
+   wchar_t *pwszCurDirBuf = (wchar_t *)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 = (wchar_t *)check_pool_memory_size((POOLMEM *)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 (iswalpha(name[0]) && name[1] == ':' && IsPathSeparator(name[2])) {
+      bAddDrive = FALSE;
+      bAddCurrentPath = FALSE;
+   }
+
+   /* is path absolute? */
+   if (IsPathSeparator(name[0]))
+      bAddCurrentPath = FALSE; 
+
+   /* is path relative to itself?, if yes, skip ./ */
+   if (name[0] == '.' && IsPathSeparator(name[1])) {
+      name += 2;
+   }
+
+   /* is path of form '//./'? */
+   if (IsPathSeparator(name[0]) && 
+       IsPathSeparator(name[1]) && 
+       name[2] == '.' && 
+       IsPathSeparator(name[3])) {
+      bAddDrive = FALSE;
+      bAddCurrentPath = FALSE;
+      bAddPrefix = FALSE;
+      if (pBIsRawPath) {
+         *pBIsRawPath = TRUE;
       }
-   else
-      return NULL;
+   }
+
+   int nParseOffset = 0;
+   
+   /* add 4 bytes header */
+   if (bAddPrefix) {
+      nParseOffset = 4;
+      wcscpy(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 = (wchar_t *)check_pool_memory_size((POOLMEM *)pwszCurDirBuf, (dwCurDirPathSize+1)*sizeof(wchar_t));
+         p_GetCurrentDirectoryW(dwCurDirPathSize, 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 (IsPathSeparator(pwszCurDirBuf[0]) && 
+          IsPathSeparator(pwszCurDirBuf[1]) && 
+          pwszCurDirBuf[2] == '?' && 
+          IsPathSeparator(pwszCurDirBuf[3])) {
+         /* copy drive character */
+         szDrive[0] = pwszCurDirBuf[4];
+      } else {
+         /* copy drive character */
+         szDrive[0] = pwszCurDirBuf[0];
+      }
+
+      szDrive[1] = ':';
+      szDrive[2] = 0;
+
+      wcscat(pwszBuf, szDrive);
+      nParseOffset +=2;
+   }
+
+   /* add path if needed */
+   if (bAddCurrentPath) {
+      /* the 1 add. character is for the eventually added backslash */
+      dwBufCharsNeeded += dwCurDirPathSize+1; 
+      pwszBuf = (wchar_t *)check_pool_memory_size((POOLMEM *)pwszBuf, dwBufCharsNeeded*sizeof(wchar_t));
+      /* get directory into own buffer as it may either return c:\... or \\?\C:\.... */
+      
+      if (IsPathSeparator(pwszCurDirBuf[0]) && 
+          IsPathSeparator(pwszCurDirBuf[1]) && 
+          pwszCurDirBuf[2] == '?' && 
+          IsPathSeparator(pwszCurDirBuf[3])) {
+         /* copy complete string */
+         wcscpy(pwszBuf, pwszCurDirBuf);
+      } else {
+         /* append path  */
+         wcscat(pwszBuf, pwszCurDirBuf);
+      }
+
+      nParseOffset = wcslen((LPCWSTR) pwszBuf);
+
+      /* check if path ends with backslash, if not, add one */
+      if (!IsPathSeparator(pwszBuf[nParseOffset-1])) {
+         wcscat(pwszBuf, L"\\");
+         nParseOffset++;
+      }
+   }
+
+   wchar_t *win32_name = &pwszBuf[nParseOffset];
+   wchar_t *name_start = name;
+
+   while (*name) {
+      /* Check for Unix separator and convert to Win32, eliminating 
+       * duplicate separators.
+       */
+      if (IsPathSeparator(*name)) {
+         *win32_name++ = '\\';     /* convert char */
+
+         /* Eliminate consecutive slashes, but not at the start so that 
+          * \\.\ still works.
+          */
+         if (name_start != name && IsPathSeparator(name[1])) {
+            name++;
+         }
+      } 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 = (wchar_t *)check_pool_memory_size((POOLMEM *)pwszBuf, 
+                                                  (dwBufCharsNeeded+MAX_PATH)*sizeof(wchar_t));
+      /* create temp. buffer */
+      wchar_t *pszBuf = (wchar_t *)get_pool_memory(PM_FNAME);
+      pszBuf = (wchar_t *)check_pool_memory_size((POOLMEM *)pszBuf, 
+                                                 (dwBufCharsNeeded+MAX_PATH)*sizeof(wchar_t));
+      if (bAddPrefix)
+         nParseOffset = 4;
+      else
+         nParseOffset = 0; 
+      wcsncpy(pszBuf, &pwszBuf[nParseOffset], wcslen(pwszBuf)+1-nParseOffset);
+      g_pVSSPathConvertW(pszBuf, pwszBuf, dwBufCharsNeeded+MAX_PATH);
+      free_pool_memory((POOLMEM *)pszBuf);
+   }   
+
+   free_pool_memory(pszUCSPath);
+   free_pool_memory((POOLMEM *)pwszCurDirBuf);
+
+   Dmsg1(dbglvl, "Leave wchar_win32_path=%s\n", pwszBuf);
+   return (POOLMEM *)pwszBuf;
 }
 
-int 
+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 */ 
+      /* strlen of UTF8 +1 is enough */
       DWORD cchSize = (strlen(pszUTF)+1);
-      *ppszUCS = check_pool_memory_size(*ppszUCS, cchSize*sizeof (WCHAR));
-      
+      *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;
    }
-   else
-      return NULL;
 }
 
 
 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) {
@@ -151,33 +466,107 @@ wchar_win32_path(const char *name, WCHAR *win32_name)
     }
 }
 
+int 
+make_win32_path_UTF8_2_wchar(POOLMEM **pszUCS, const char *pszUTF, BOOL* pBIsRawPath /*= NULL*/)
+{
+   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_pWin32ConvUTF8Cache) {
+      Win32ConvInitCache();
+   } else if (g_dwWin32ConvUTF8strlen == strlen(pszUTF)) {
+      if (bstrcmp(pszUTF, g_pWin32ConvUTF8Cache)) {
+         /* Return cached value */
+         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+2);
+   bstrncpy(g_pWin32ConvUTF8Cache, pszUTF, g_dwWin32ConvUTF8strlen+1);
+   V(Win32Convmutex);
+
+   return nRet;
+}
+
+#if !defined(_MSC_VER) || (_MSC_VER < 1400) // VC8+
 int umask(int)
 {
    return 0;
 }
+#endif
+
+#ifndef LOAD_WITH_ALTERED_SEARCH_PATH
+#define LOAD_WITH_ALTERED_SEARCH_PATH 0x00000008
+#endif
 
-int chmod(const char *, mode_t)
+void *dlopen(const char *file, int mode)
 {
-   return 0;
+   void *handle;
+
+   handle = LoadLibraryEx(file, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
+   return handle;
 }
 
-int chown(const char *k, uid_t, gid_t)
+void *dlsym(void *handle, const char *name)
 {
-   return 0;
+   void *symaddr;
+   symaddr = (void *)GetProcAddress((HMODULE)handle, name);
+   return symaddr;
 }
 
-int lchown(const char *k, uid_t, gid_t)
+int dlclose(void *handle) 
+{
+   if (handle && !FreeLibrary((HMODULE)handle)) {
+      errno = b_errno_win32;
+      return 1;        /* failed */
+   }
+   return 0;           /* OK */
+}
+
+char *dlerror(void) 
+{
+   static char buf[200];
+   const char *err = errorString();
+   bstrncpy(buf, (char *)err, sizeof(buf));
+   LocalFree((void *)err);
+   return buf;
+}
+
+int fcntl(int fd, int cmd)
 {
    return 0;
 }
 
-#ifdef needed
-bool fstype(const char *fname, char *fs, int fslen)
+int chown(const char *k, uid_t, gid_t)
 {
-   return true;                       /* accept anything */
+   return 0;
 }
-#endif
 
+int lchown(const char *k, uid_t, gid_t)
+{
+   return 0;
+}
 
 long int
 random(void)
@@ -196,16 +585,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
@@ -221,8 +610,7 @@ cvt_ftime_to_utime(const FILETIME &time)
     return (time_t) (mstime & 0xffffffff);
 }
 
-static const char *
-errorString(void)
+static const char *errorString(void)
 {
    LPVOID lpMsgBuf;
 
@@ -236,10 +624,19 @@ 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)
@@ -248,168 +645,221 @@ statDir(const char *file, struct stat *sb)
    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;
-
+   DWORD *pdwFileAttributes;
+   DWORD *pnFileSizeHigh;
+   DWORD *pnFileSizeLow;
+   DWORD *pdwReserved0;
+   FILETIME *pftLastAccessTime;
+   FILETIME *pftLastWriteTime;
+   FILETIME *pftCreationTime;
+
+   /* 
+    * Oh, cool, another exception: Microsoft doesn't let us do 
+    *  FindFile operations on a Drive, so simply fake root attibutes.
+    */
    if (file[1] == ':' && file[2] == 0) {
-        d_msg(__FILE__, __LINE__, 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);
-        time(&sb->st_mtime);
-        time(&sb->st_atime);
-        return 0;
+      time_t now = time(NULL);
+      Dmsg1(dbglvl, "faking ROOT attrs(%s).\n", file);
+      sb->st_mode = S_IFDIR;
+      sb->st_mode |= S_IREAD|S_IEXEC|S_IWRITE;
+      sb->st_ctime = now;
+      sb->st_mtime = now;
+      sb->st_atime = now;
+      sb->st_rdev = 0;
+      return 0;
     }
 
    HANDLE h = INVALID_HANDLE_VALUE;
 
-   // use unicode or ascii
+   // use unicode
    if (p_FindFirstFileW) {
-      POOLMEM* pwszBuf = get_pool_memory (PM_FNAME);         
-      UTF8_2_wchar(&pwszBuf, file);
-      
-      h = p_FindFirstFileW((LPCWSTR) pwszBuf, &info_w);
+      POOLMEM* pwszBuf = get_pool_memory (PM_FNAME);
+      make_win32_path_UTF8_2_wchar(&pwszBuf, file);
+
+      Dmsg1(dbglvl, "FindFirstFileW=%s\n", file);
+      h = p_FindFirstFileW((LPCWSTR)pwszBuf, &info_w);
       free_pool_memory(pwszBuf);
 
       pdwFileAttributes = &info_w.dwFileAttributes;
+      pdwReserved0      = &info_w.dwReserved0;
       pnFileSizeHigh    = &info_w.nFileSizeHigh;
       pnFileSizeLow     = &info_w.nFileSizeLow;
       pftLastAccessTime = &info_w.ftLastAccessTime;
       pftLastWriteTime  = &info_w.ftLastWriteTime;
       pftCreationTime   = &info_w.ftCreationTime;
-   }
-   else if (p_FindFirstFileA) {
+
+   // use ASCII
+   } else if (p_FindFirstFileA) {
+      Dmsg1(dbglvl, "FindFirstFileA=%s\n", file);
       h = p_FindFirstFileA(file, &info_a);
 
       pdwFileAttributes = &info_a.dwFileAttributes;
+      pdwReserved0      = &info_a.dwReserved0;
       pnFileSizeHigh    = &info_a.nFileSizeHigh;
       pnFileSizeLow     = &info_a.nFileSizeLow;
       pftLastAccessTime = &info_a.ftLastAccessTime;
       pftLastWriteTime  = &info_a.ftLastWriteTime;
       pftCreationTime   = &info_a.ftCreationTime;
+   } else {
+      Dmsg0(dbglvl, "No findFirstFile A or W found\n");
    }
 
-    if (h == INVALID_HANDLE_VALUE) {
-        const char *err = errorString();
-        d_msg(__FILE__, __LINE__, 99, "FindFirstFile(%s):%s\n", file, err);
-        LocalFree((void *)err);
-        errno = b_errno_win32;
-        return -1;
-    }
+   if (h == INVALID_HANDLE_VALUE) {
+      const char *err = errorString();
+      /*
+       * Note, in creating leading paths, it is normal that
+       * the file does not exist.
+       */
+      Dmsg2(2099, "FindFirstFile(%s):%s\n", file, err);
+      LocalFree((void *)err);
+      errno = b_errno_win32;
+      return -1;
+   } else {
+      FindClose(h);
+   }
 
-    sb->st_mode = 0777;               /* start with everything */
-    if (*pdwFileAttributes & FILE_ATTRIBUTE_READONLY)
-        sb->st_mode &= ~(S_IRUSR|S_IRGRP|S_IROTH);
-    if (*pdwFileAttributes & FILE_ATTRIBUTE_SYSTEM)
-        sb->st_mode &= ~S_IRWXO; /* remove everything for other */
-    if (*pdwFileAttributes & FILE_ATTRIBUTE_HIDDEN)
-        sb->st_mode |= S_ISVTX; /* use sticky bit -> hidden */
-    sb->st_mode |= S_IFDIR;
-
-    sb->st_size = *pnFileSizeHigh;
-    sb->st_size <<= 32;
-    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(*pftLastAccessTime);
-    sb->st_mtime = cvt_ftime_to_utime(*pftLastWriteTime);
-    sb->st_ctime = cvt_ftime_to_utime(*pftCreationTime);
-    FindClose(h);
+   sb->st_mode = 0777;               /* start with everything */
+   if (*pdwFileAttributes & FILE_ATTRIBUTE_READONLY)
+       sb->st_mode &= ~(S_IRUSR|S_IRGRP|S_IROTH);
+   if (*pdwFileAttributes & FILE_ATTRIBUTE_SYSTEM)
+       sb->st_mode &= ~S_IRWXO; /* remove everything for other */
+   if (*pdwFileAttributes & FILE_ATTRIBUTE_HIDDEN)
+       sb->st_mode |= S_ISVTX; /* use sticky bit -> hidden */
+   sb->st_mode |= S_IFDIR;
+
+   /* 
+    * Store reparse/mount point info in st_rdev.  Note a
+    *  Win32 reparse point (junction point) is like a link
+    *  though it can have many properties (directory link,
+    *  soft link, hard link, HSM, ...
+    *  A mount point is a reparse point where another volume
+    *  is mounted, so it is like a Unix mount point (change of
+    *  filesystem).
+    */
+   if (*pdwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
+      if (*pdwReserved0 & IO_REPARSE_TAG_MOUNT_POINT) {
+         sb->st_rdev = WIN32_MOUNT_POINT;           /* mount point */
+      } else {
+         sb->st_rdev = WIN32_REPARSE_POINT;         /* reparse point */
+      }
+   }  
+   Dmsg2(dbglvl, "st_rdev=%d file=%s\n", sb->st_rdev, file);
+   sb->st_size = *pnFileSizeHigh;
+   sb->st_size <<= 32;
+   sb->st_size |= *pnFileSizeLow;
+   sb->st_blksize = 4096;
+   sb->st_blocks = (uint32_t)(sb->st_size + 4095)/4096;
 
-    return 0;
+   sb->st_atime = cvt_ftime_to_utime(*pftLastAccessTime);
+   sb->st_mtime = cvt_ftime_to_utime(*pftLastWriteTime);
+   sb->st_ctime = cvt_ftime_to_utime(*pftCreationTime);
+
+   return 0;
+}
+
+int
+fstat(intptr_t fd, struct stat *sb)
+{
+   BY_HANDLE_FILE_INFORMATION info;
+
+   if (!GetFileInformationByHandle((HANDLE)_get_osfhandle(fd), &info)) {
+       const char *err = errorString();
+       Dmsg1(2099, "GetfileInformationByHandle: %s\n", err);
+       LocalFree((void *)err);
+       errno = b_errno_win32;
+       return -1;
+   }
+
+   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(dbglvl,  "st_nlink=%d\n", sb->st_nlink);
+   }
+
+   sb->st_mode = 0777;               /* start with everything */
+   if (info.dwFileAttributes & FILE_ATTRIBUTE_READONLY)
+       sb->st_mode &= ~(S_IRUSR|S_IRGRP|S_IROTH);
+   if (info.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM)
+       sb->st_mode &= ~S_IRWXO; /* remove everything for other */
+   if (info.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN)
+       sb->st_mode |= S_ISVTX; /* use sticky bit -> hidden */
+   sb->st_mode |= S_IFREG;
+
+   /* Use st_rdev to store reparse attribute */
+   if  (info.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
+      sb->st_rdev = WIN32_REPARSE_POINT;
+   }
+   Dmsg3(dbglvl, "st_rdev=%d sizino=%d ino=%lld\n", sb->st_rdev, sizeof(sb->st_ino),
+      (long long)sb->st_ino);
+
+   sb->st_size = info.nFileSizeHigh;
+   sb->st_size <<= 32;
+   sb->st_size |= info.nFileSizeLow;
+   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);
+
+   return 0;
 }
 
 static int
 stat2(const char *file, struct stat *sb)
 {
-    BY_HANDLE_FILE_INFORMATION info;
-    HANDLE h;
-    int rval = 0;
-    char tmpbuf[1024];
-    conv_unix_to_win32_path(file, tmpbuf, 1024);
+   HANDLE h = INVALID_HANDLE_VALUE;
+   int rval = 0;
+   char tmpbuf[5000];
+   conv_unix_to_vss_win32_path(file, tmpbuf, 5000);
 
-    DWORD attr = -1;
+   DWORD attr = (DWORD)-1;
 
-    if (p_GetFileAttributesW) {
+   if (p_GetFileAttributesW) {
       POOLMEM* pwszBuf = get_pool_memory(PM_FNAME);
-      UTF8_2_wchar(&pwszBuf, tmpbuf);
-      
+      make_win32_path_UTF8_2_wchar(&pwszBuf, tmpbuf);
+
       attr = p_GetFileAttributesW((LPCWSTR) pwszBuf);
+      if (p_CreateFileW) {
+         h = CreateFileW((LPCWSTR)pwszBuf, GENERIC_READ,
+                FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
+      }
       free_pool_memory(pwszBuf);
-    } else if (p_GetFileAttributesA) {
-       attr = p_GetFileAttributesA(tmpbuf);
-    }
-
-    if (attr == -1) {
-        const char *err = errorString();
-        d_msg(__FILE__, __LINE__, 99,
-              "GetFileAttrubtes(%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);
+   } else if (p_GetFileAttributesA) {
+      attr = p_GetFileAttributesA(tmpbuf);
+      h = CreateFileA(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 (attr == (DWORD)-1) {
+      const char *err = errorString();
+      Dmsg2(2099, "GetFileAttributes(%s): %s\n", tmpbuf, err);
+      LocalFree((void *)err);
+      if (h != INVALID_HANDLE_VALUE) {
+         CloseHandle(h);
+      }
+      errno = b_errno_win32;
+      return -1;
+   }
 
-    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;
-    }
+   if (h == INVALID_HANDLE_VALUE) {
+      const char *err = errorString();
+      Dmsg2(2099, "Cannot open file for stat (%s):%s\n", tmpbuf, err);
+      LocalFree((void *)err);
+      errno = b_errno_win32;
+      return -1;
+   }
 
-    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) {
-       d_msg(__FILE__, __LINE__, 99,  "st_nlink=%d\n", sb->st_nlink);
-    }
+   rval = fstat((intptr_t)h, sb);
+   CloseHandle(h);
 
-    sb->st_mode = 0777;               /* start with everything */
-    if (info.dwFileAttributes & FILE_ATTRIBUTE_READONLY)
-        sb->st_mode &= ~(S_IRUSR|S_IRGRP|S_IROTH);
-    if (info.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM)
-        sb->st_mode &= ~S_IRWXO; /* remove everything for other */
-    if (info.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN)
-        sb->st_mode |= S_ISVTX; /* use sticky bit -> hidden */
-    sb->st_mode |= S_IFREG;
-
-    sb->st_size = info.nFileSizeHigh;
-    sb->st_size <<= 32;
-    sb->st_size |= info.nFileSizeLow;
-    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);
-
-error:
-    CloseHandle(h);
-    return rval;
+   if (attr & FILE_ATTRIBUTE_DIRECTORY &&
+        file[1] == ':' && file[2] != 0) {
+      rval = statDir(file, sb);
+   }
+   return rval;
 }
 
 int
@@ -418,39 +868,20 @@ stat(const char *file, struct stat *sb)
    WIN32_FILE_ATTRIBUTE_DATA data;
    errno = 0;
 
-
    memset(sb, 0, sizeof(*sb));
 
-   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] = '\\';
-
-   wchar_win32_path(file, buf+4);
-
-   if (!GetFileAttributesExW((WCHAR *)buf, GetFileExInfoStandard, &data)) {
-      return stat2(file, sb);
-   }
-#else
-
    if (p_GetFileAttributesExW) {
       /* dynamically allocate enough space for UCS2 filename */
-      POOLMEM* pwszBuf = get_pool_memory (PM_FNAME);          
-      UTF8_2_wchar(&pwszBuf, file);
+      POOLMEM *pwszBuf = get_pool_memory(PM_FNAME);
+      make_win32_path_UTF8_2_wchar(&pwszBuf, file);
 
-      BOOL b = p_GetFileAttributesExW((LPCWSTR) pwszBuf, GetFileExInfoStandard, &data);
+      BOOL b = p_GetFileAttributesExW((LPCWSTR)pwszBuf, GetFileExInfoStandard, &data);
       free_pool_memory(pwszBuf);
-                        
+
       if (!b) {
          return stat2(file, sb);
       }
+
    } else if (p_GetFileAttributesExA) {
       if (!p_GetFileAttributesExA(file, GetFileExInfoStandard, &data)) {
          return stat2(file, sb);
@@ -459,8 +890,6 @@ stat(const char *file, struct stat *sb)
       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);
@@ -477,6 +906,9 @@ stat(const char *file, struct stat *sb)
       sb->st_mode |= S_IFREG;
    }
 
+   /* Use st_rdev to store reparse attribute */
+   sb->st_rdev = (data.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) ? 1 : 0; 
+
    sb->st_nlink = 1;
    sb->st_size = data.nFileSizeHigh;
    sb->st_size <<= 32;
@@ -486,10 +918,70 @@ stat(const char *file, struct stat *sb)
    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);
+
+   /*
+    * If we are not at the root, then to distinguish a reparse 
+    *  point from a mount point, we must call FindFirstFile() to
+    *  get the WIN32_FIND_DATA, which has the bit that indicates
+    *  that this directory is a mount point -- aren't Win32 APIs
+    *  wonderful? (sarcasm).  The code exists in the statDir
+    *  subroutine.
+    */
+   if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY && 
+        file[1] == ':' && file[2] != 0) {
+      statDir(file, sb);
+   }
+   Dmsg3(dbglvl, "sizino=%d ino=%lld file=%s\n", sizeof(sb->st_ino),
+                       (long long)sb->st_ino, file);
    return 0;
 }
 
-#endif //HAVE_MINGW
+/*
+ * We write our own ftruncate because the one in the
+ *  Microsoft library mrcrt.dll does not truncate
+ *  files greater than 2GB.
+ *  KES - May 2007
+ */
+int win32_ftruncate(int fd, int64_t length) 
+{
+   /* Set point we want to truncate file */
+   __int64 pos = _lseeki64(fd, (__int64)length, SEEK_SET);
+
+   if (pos != (__int64)length) {
+      errno = EACCES;         /* truncation failed, get out */
+      return -1;
+   }
+
+   /* Truncate file */
+   if (SetEndOfFile((HANDLE)_get_osfhandle(fd)) == 0) {
+      errno = b_errno_win32;
+      return -1;
+   }
+   errno = 0;
+   return 0;
+}
+
+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)
@@ -571,23 +1063,24 @@ strcasecmp(const char *s1, const char *s2)
 int
 strncasecmp(const char *s1, const char *s2, int len)
 {
-    register int ch1, ch2;
+   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;
-    } 
+   if (s1==s2)
+      return 0;       /* strings are equal if same object. */
+   else if (!s1)
+      return -1;
+   else if (!s2)
+      return 1;
 
-    return (ch1 - ch2);
+   while (len--) {
+      ch1 = *s1;
+      ch2 = *s2;
+      s1++;
+      s2++;
+      if (ch1 == 0 || tolower(ch1) != tolower(ch2)) break;
+   }
+
+   return (ch1 - ch2);
 }
 
 int
@@ -595,6 +1088,7 @@ gettimeofday(struct timeval *tv, struct timezone *)
 {
     SYSTEMTIME now;
     FILETIME tmp;
+
     GetSystemTime(&now);
 
     if (tv == NULL) {
@@ -611,19 +1105,41 @@ gettimeofday(struct timeval *tv, struct timezone *)
     _100nsec |= tmp.dwLowDateTime;
     _100nsec -= WIN32_FILETIME_ADJUST;
 
-    tv->tv_sec =(long) (_100nsec / 10000000);
-    tv->tv_usec = (long) ((_100nsec % 10000000)/10);
+    tv->tv_sec = (long)(_100nsec / 10000000);
+    tv->tv_usec = (long)((_100nsec % 10000000)/10);
     return 0;
 
 }
 
-int
-syslog(int type, const char *fmt, const char *msg)
+/* 
+ * Write in Windows System log 
+ */
+extern "C" void syslog(int type, const char *fmt, ...) 
+{
+   va_list   arg_ptr;
+   int len, maxlen;
+   POOLMEM *msg;
+
+   msg = get_pool_memory(PM_EMSG);
+
+   for (;;) {
+      maxlen = sizeof_pool_memory(msg) - 1;
+      va_start(arg_ptr, fmt);
+      len = bvsnprintf(msg, maxlen, fmt, arg_ptr);
+      va_end(arg_ptr);
+      if (len < 0 || len >= (maxlen-5)) {
+         msg = realloc_pool_memory(msg, maxlen + maxlen/2);
+         continue;
+      }
+      break;
+   }
+   LogErrorMsg((const char *)msg);
+   free_memory(msg);
+}
+
+void
+closelog()
 {
-/*#ifndef HAVE_CONSOLE
-    MessageBox(NULL, msg, "Bacula", MB_OK);
-#endif*/
-    return 0;
 }
 
 struct passwd *
@@ -656,43 +1172,42 @@ opendir(const char *path)
 {
     /* enough space for VSS !*/
     int max_len = strlen(path) + MAX_PATH;
+    char *tspec = NULL;
     _dir *rval = NULL;
     if (path == NULL) {
        errno = ENOENT;
        return NULL;
     }
 
+    Dmsg1(dbglvl, "Opendir path=%s\n", path);
     rval = (_dir *)malloc(sizeof(_dir));
+    if (!rval) {
+       goto err;
+    }
     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) {
-#ifdef WIN32_VSS
-       /* will append \\?\ at front itself */
-       conv_unix_to_win32_path(path, tspec, max_len-4);
-#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);
-#endif
-    } else {
-       conv_unix_to_win32_path(path, tspec, max_len);
+
+    tspec = (char *)malloc(max_len);
+    if (!tspec) { 
+       goto err;
     }
 
-    bstrncat(tspec, "\\*", max_len);
+    conv_unix_to_vss_win32_path(path, tspec, max_len);
+    Dmsg1(dbglvl, "win32 path=%s\n", tspec);
+
+    // 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;
 
-    // convert to WCHAR
+    // convert to wchar_t
     if (p_FindFirstFileW) {
       POOLMEM* pwcBuf = get_pool_memory(PM_FNAME);;
-      UTF8_2_wchar(&pwcBuf,rval->spec);
-      rval->dirh = p_FindFirstFileW((LPCWSTR)pwcBuf, &rval->data_w);   
+      make_win32_path_UTF8_2_wchar(&pwcBuf, rval->spec);
+
+      rval->dirh = p_FindFirstFileW((LPCWSTR)pwcBuf, &rval->data_w);
 
       free_pool_memory(pwcBuf);
 
@@ -700,33 +1215,36 @@ opendir(const char *path)
         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;
 
 
-    d_msg(__FILE__, __LINE__,
-          99, "opendir(%s)\n\tspec=%s,\n\tFindFirstFile returns %d\n",
+    Dmsg3(dbglvl, "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;
 
-    if (rval->valid_w)
-      d_msg(__FILE__, __LINE__,
-            99, "\tFirstFile=%s\n", rval->data_w.cFileName);
+    if (rval->valid_w) {
+      Dmsg1(dbglvl, "\tFirstFile=%s\n", rval->data_w.cFileName);
+    }
 
-    if (rval->valid_a)
-      d_msg(__FILE__, __LINE__,
-            99, "\tFirstFile=%s\n", rval->data_a.cFileName);
+    if (rval->valid_a) {
+      Dmsg1(dbglvl, "\tFirstFile=%s\n", rval->data_a.cFileName);
+    }
 
     return (DIR *)rval;
 
 err:
-    free((void *)rval->spec);
-    free(rval);
+    if (rval) {
+       free(rval);
+    }
+    if (tspec) {
+       free(tspec);
+    }
     errno = b_errno_win32;
     return NULL;
 }
@@ -776,28 +1294,27 @@ readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result)
     _dir *dp = (_dir *)dirp;
     if (dp->valid_w || dp->valid_a) {
       entry->d_off = dp->offset;
-                
+
       // copy unicode
       if (dp->valid_w) {
-         char szBuf[MAX_PATH_UTF8];
+         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 */
-      d_msg(__FILE__, __LINE__,
-            99, "readdir_r(%p, { d_name=\"%s\", d_reclen=%d, d_off=%d\n",
+      Dmsg4(dbglvl, "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(dbglvl, "readdir_r !valid\n");
         errno = b_errno_win32;
         return -1;
     }
 
     // get next file, try unicode first
-    if (p_FindNextFileW) 
+    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);
@@ -878,7 +1395,7 @@ pathconf(const char *path, int name)
     case _PC_NAME_MAX :
         return 255;
     }
-    errno = ENOSYS;                                                         
+    errno = ENOSYS;
     return -1;
 }
 
@@ -900,46 +1417,112 @@ WSA_Init(void)
     return 0;
 }
 
+static DWORD fill_attribute(DWORD attr, mode_t mode)
+{
+   Dmsg1(dbglvl, "  before attr=%lld\n", (uint64_t) attr);
+   /* Use Bacula mappings define in stat() above */
+   if (mode & (S_IRUSR|S_IRGRP|S_IROTH)) { // If file is readable
+      attr &= ~FILE_ATTRIBUTE_READONLY;    // then this is not READONLY
+   } else {
+      attr |= FILE_ATTRIBUTE_READONLY;
+   }
+   if (mode & S_ISVTX) {                   // The sticky bit <=> HIDDEN 
+      attr |= FILE_ATTRIBUTE_HIDDEN;
+   } else {
+      attr &= ~FILE_ATTRIBUTE_HIDDEN;
+   }
+   if (mode & S_IRWXO) {              // Other can read/write/execute ?
+      attr &= ~FILE_ATTRIBUTE_SYSTEM; // => Not system
+   } else {
+      attr |= FILE_ATTRIBUTE_SYSTEM;
+   }
+   Dmsg1(dbglvl, "  after attr=%lld\n", (uint64_t)attr);
+   return attr;
+}
+
+int win32_chmod(const char *path, mode_t mode)
+{
+   bool ret=false;
+   DWORD attr;
+
+   Dmsg2(dbglvl, "win32_chmod(path=%s mode=%lld)\n", path, (uint64_t)mode);
+   if (p_GetFileAttributesW) {
+      POOLMEM* pwszBuf = get_pool_memory(PM_FNAME);
+      make_win32_path_UTF8_2_wchar(&pwszBuf, path);
+
+      attr = p_GetFileAttributesW((LPCWSTR) pwszBuf);
+      if (attr != INVALID_FILE_ATTRIBUTES) {
+         /* Use Bacula mappings define in stat() above */
+         attr = fill_attribute(attr, mode);
+         ret = p_SetFileAttributesW((LPCWSTR)pwszBuf, attr);
+      }
+      free_pool_memory(pwszBuf);
+      Dmsg0(dbglvl, "Leave win32_chmod. AttributesW\n");
+   } else if (p_GetFileAttributesA) {
+      attr = p_GetFileAttributesA(path);
+      if (attr != INVALID_FILE_ATTRIBUTES) {
+         attr = fill_attribute(attr, mode);
+         ret = p_SetFileAttributesA(path, attr);
+      }
+      Dmsg0(dbglvl, "Leave win32_chmod did AttributesA\n");
+   } else {
+      Dmsg0(dbglvl, "Leave win32_chmod did nothing\n");
+   }
+    
+   if (!ret) {
+      const char *err = errorString();
+      Dmsg2(dbglvl, "Get/SetFileAttributes(%s): %s\n", path, err);
+      LocalFree((void *)err);
+      errno = b_errno_win32;
+      return -1;
+   }
+   return 0;
+}
+
 
 int
 win32_chdir(const char *dir)
 {
    if (p_SetCurrentDirectoryW) {
       POOLMEM* pwszBuf = get_pool_memory(PM_FNAME);
-      UTF8_2_wchar(&pwszBuf, dir);
+      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) {
+   } else if (p_SetCurrentDirectoryA) {
       if (0 == p_SetCurrentDirectoryA(dir)) {
          errno = b_errno_win32;
          return -1;
       }
+   } else {
+      return -1;
    }
-   else return -1;
-   
+
    return 0;
 }
 
 int
 win32_mkdir(const char *dir)
 {
+   Dmsg1(dbglvl, "enter win32_mkdir. dir=%s\n", dir);
    if (p_wmkdir){
       POOLMEM* pwszBuf = get_pool_memory(PM_FNAME);
-      UTF8_2_wchar(&pwszBuf, dir);
+      make_win32_path_UTF8_2_wchar(&pwszBuf, dir);
 
-      int n=p_wmkdir((LPCWSTR)pwszBuf);
-      free_pool_memory(pwszBuf);      
+      int n = p_wmkdir((LPCWSTR)pwszBuf);
+      free_pool_memory(pwszBuf);
+      Dmsg0(dbglvl, "Leave win32_mkdir did wmkdir\n");
       return n;
    }
 
-   return _mkdir(dir);        
+   Dmsg0(dbglvl, "Leave win32_mkdir did _mkdir\n");
+   return _mkdir(dir);
 }
 
 
@@ -950,10 +1533,11 @@ win32_getcwd(char *buf, int maxlen)
 
    if (p_GetCurrentDirectoryW) {
       POOLMEM* pwszBuf = get_pool_memory(PM_FNAME);
-      pwszBuf = check_pool_memory_size (pwszBuf, maxlen*sizeof(WCHAR));
+      pwszBuf = check_pool_memory_size (pwszBuf, maxlen*sizeof(wchar_t));
 
       n = p_GetCurrentDirectoryW(maxlen, (LPWSTR) pwszBuf);
-      n = wchar_2_UTF8 (buf, (WCHAR*)pwszBuf, maxlen)-1;
+      if (n!=0)
+         n = wchar_2_UTF8 (buf, (wchar_t *)pwszBuf, maxlen)-1;
       free_pool_memory(pwszBuf);
 
    } else if (p_GetCurrentDirectoryA)
@@ -969,44 +1553,45 @@ win32_getcwd(char *buf, int maxlen)
    return buf;
 }
 
-int 
+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 && 
+   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;   
+         return dwCharsWritten;
       }
-      
-      /* convert to local codepage and try WriteConsoleA */      
-      POOLMEM* pszBuf = get_pool_memory(PM_MESSAGE);         
+
+      /* 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);      
+      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 dwCharsWritten;
       }
+      free_pool_memory(pszBuf);
    }
-
+   /* Fall back */
    return fputs(string, stream);
 }
 
@@ -1017,15 +1602,15 @@ win32_cgets (char* buffer, int len)
       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) {            
+   if (hIn && (hIn != INVALID_HANDLE_VALUE) && p_WideCharToMultiByte && p_MultiByteToWideChar) {
       DWORD dwRead;
-      WCHAR wszBuf[1024];
-      char  szBuf[1024];    
+      wchar_t wszBuf[1024];
+      char  szBuf[1024];
 
       /* nt and unicode conversion */
       if (ReadConsoleW (hIn, wszBuf, 1024, &dwRead, NULL)) {
 
-         /* null terminate at end */                
+         /* null terminate at end */
          if (wszBuf[dwRead-1] == L'\n') {
             wszBuf[dwRead-1] = L'\0';
             dwRead --;
@@ -1035,15 +1620,15 @@ win32_cgets (char* buffer, int len)
             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 */                
+         /* null terminate at end */
          if (szBuf[dwRead-1] == L'\n') {
             szBuf[dwRead-1] = L'\0';
             dwRead --;
@@ -1054,17 +1639,17 @@ win32_cgets (char* buffer, int len)
             dwRead --;
          }
 
-         /* convert from ansii to WCHAR */
+         /* convert from ansii to wchar_t */
          p_MultiByteToWideChar(GetConsoleCP(), 0, szBuf, -1, wszBuf,1024);
-         /* convert from WCHAR to UTF-8 */
+         /* convert from wchar_t to UTF-8 */
          if (wchar_2_UTF8(buffer, wszBuf, len))
-            return buffer;         
+            return buffer;
       }
    }
 
    /* fallback */
-   if (fgets(buffer, len, stdin)) 
-      return buffer;   
+   if (fgets(buffer, len, stdin))
+      return buffer;
    else
       return NULL;
 }
@@ -1074,12 +1659,43 @@ win32_unlink(const char *filename)
 {
    int nRetCode;
    if (p_wunlink) {
-      POOLMEM* pwszBuf = get_pool_memory(PM_FNAME);      
-      UTF8_2_wchar(&pwszBuf, filename);
+      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;
 }
@@ -1089,6 +1705,7 @@ win32_unlink(const char *filename)
 
 char WIN_VERSION_LONG[64];
 char WIN_VERSION[32];
+char WIN_RAWVERSION[32];
 
 class winver {
 public:
@@ -1097,8 +1714,6 @@ public:
 
 static winver INIT;                     // cause constructor to be called before main()
 
-#include "bacula.h"
-#include "jcr.h"
 
 winver::winver(void)
 {
@@ -1112,8 +1727,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;
@@ -1122,11 +1740,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
@@ -1160,7 +1778,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;
@@ -1169,13 +1788,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++;
 
@@ -1183,94 +1802,340 @@ getArgv0(const char *cmdline)
     return rval;
 }
 
+/*
+ * Extracts the executable or script name from the first string in 
+ * cmdline.
+ *
+ * If the name contains blanks then it must be quoted with double quotes,
+ * otherwise quotes are optional.  If the name contains blanks then it 
+ * will be converted to a short name.
+ *
+ * The optional quotes will be removed.  The result is copied to a malloc'ed
+ * buffer and returned through the pexe argument.  The pargs parameter is set
+ * to the address of the character in cmdline located after the name.
+ *
+ * The malloc'ed buffer returned in *pexe must be freed by the caller.
+ */
+bool
+GetApplicationName(const char *cmdline, char **pexe, const char **pargs)
+{
+   const char *pExeStart = NULL;    /* Start of executable name in cmdline */
+   const char *pExeEnd = NULL;      /* Character after executable name (separator) */
+
+   const char *pBasename = NULL;    /* Character after last path separator */
+   const char *pExtension = NULL;   /* Period at start of extension */
+
+   const char *current = cmdline;
+
+   bool bQuoted = false;
+
+   /* Skip initial whitespace */
+
+   while (*current == ' ' || *current == '\t')
+   {
+      current++;
+   }
+
+   /* Calculate start of name and determine if quoted */
+
+   if (*current == '"') {
+      pExeStart = ++current;
+      bQuoted = true;
+   } else {
+      pExeStart = current;
+      bQuoted = false;
+   }
+
+   *pargs = NULL;
+   *pexe = NULL;
+
+   /* 
+    * Scan command line looking for path separators (/ and \\) and the 
+    * terminator, either a quote or a blank.  The location of the 
+    * extension is also noted.
+    */
+
+   for ( ; *current != '\0'; current++)
+   {
+      if (*current == '.') {
+         pExtension = current;
+      } else if (IsPathSeparator(*current) && current[1] != '\0') {
+         pBasename = &current[1];
+         pExtension = NULL;
+      }
+
+      /* Check for terminator, either quote or blank */
+      if (bQuoted) {
+         if (*current != '"') {
+            continue;
+         }
+      } else {
+         if (*current != ' ') {
+            continue;
+         }
+      }
+
+      /*
+       * Hit terminator, remember end of name (address of terminator) and 
+       * start of arguments 
+       */
+      pExeEnd = current;
+
+      if (bQuoted && *current == '"') {
+         *pargs = &current[1];
+      } else {
+         *pargs = current;
+      }
+
+      break;
+   }
+
+   if (pBasename == NULL) {
+      pBasename = pExeStart;
+   }
+
+   if (pExeEnd == NULL) {
+      pExeEnd = current;
+   }
+
+   if (*pargs == NULL)
+   {
+      *pargs = current;
+   }
+
+   bool bHasPathSeparators = pExeStart != pBasename;
+
+   /* We have pointers to all the useful parts of the name */
+
+   /* Default extensions in the order cmd.exe uses to search */
+
+   static const char ExtensionList[][5] = { ".com", ".exe", ".bat", ".cmd" };
+   DWORD dwBasePathLength = pExeEnd - pExeStart;
+
+   DWORD dwAltNameLength = 0;
+   char *pPathname = (char *)alloca(MAX_PATHLENGTH + 1);
+   char *pAltPathname = (char *)alloca(MAX_PATHLENGTH + 1);
+
+   pPathname[MAX_PATHLENGTH] = '\0';
+   pAltPathname[MAX_PATHLENGTH] = '\0';
+
+   memcpy(pPathname, pExeStart, dwBasePathLength);
+   pPathname[dwBasePathLength] = '\0';
+
+   if (pExtension == NULL) {
+      /* Try appending extensions */
+      for (int index = 0; index < (int)(sizeof(ExtensionList) / sizeof(ExtensionList[0])); index++) {
+
+         if (!bHasPathSeparators) {
+            /* There are no path separators, search in the standard locations */
+            dwAltNameLength = SearchPath(NULL, pPathname, ExtensionList[index], MAX_PATHLENGTH, pAltPathname, NULL);
+            if (dwAltNameLength > 0 && dwAltNameLength <= MAX_PATHLENGTH) {
+               memcpy(pPathname, pAltPathname, dwAltNameLength);
+               pPathname[dwAltNameLength] = '\0';
+               break;
+            }
+         } else {
+            bstrncpy(&pPathname[dwBasePathLength], ExtensionList[index], MAX_PATHLENGTH - dwBasePathLength);
+            if (GetFileAttributes(pPathname) != INVALID_FILE_ATTRIBUTES) {
+               break;
+            }
+            pPathname[dwBasePathLength] = '\0';
+         }
+      }
+   } else if (!bHasPathSeparators) {
+      /* There are no path separators, search in the standard locations */
+      dwAltNameLength = SearchPath(NULL, pPathname, NULL, MAX_PATHLENGTH, pAltPathname, NULL);
+      if (dwAltNameLength > 0 && dwAltNameLength < MAX_PATHLENGTH) {
+         memcpy(pPathname, pAltPathname, dwAltNameLength);
+         pPathname[dwAltNameLength] = '\0';
+      }
+   }
+
+   if (strchr(pPathname, ' ') != NULL) {
+      dwAltNameLength = GetShortPathName(pPathname, pAltPathname, MAX_PATHLENGTH);
+
+      if (dwAltNameLength > 0 && dwAltNameLength <= MAX_PATHLENGTH) {
+         *pexe = (char *)malloc(dwAltNameLength + 1);
+         if (*pexe == NULL) {
+            return false;
+         }
+         memcpy(*pexe, pAltPathname, dwAltNameLength + 1);
+      }
+   }
+
+   if (*pexe == NULL) {
+      DWORD dwPathnameLength = strlen(pPathname);
+      *pexe = (char *)malloc(dwPathnameLength + 1);
+      if (*pexe == NULL) {
+         return false;
+      }
+      memcpy(*pexe, pPathname, dwPathnameLength + 1);
+   }
+
+   return true;
+}
+
+/**
+ * Create the process with WCHAR API
+ */
+static BOOL
+CreateChildProcessW(const char *comspec, const char *cmdLine,
+                    PROCESS_INFORMATION *hProcInfo,
+                    HANDLE in, HANDLE out, HANDLE err)
+{
+   STARTUPINFOW siStartInfo;
+   BOOL bFuncRetn = FALSE;
+
+   // Set up members of the STARTUPINFO structure.
+   ZeroMemory( &siStartInfo, sizeof(siStartInfo) );
+   siStartInfo.cb = sizeof(siStartInfo);
+   // setup new process to use supplied handles for stdin,stdout,stderr
+
+   siStartInfo.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW;
+   siStartInfo.wShowWindow = SW_SHOWMINNOACTIVE;
+
+   siStartInfo.hStdInput = in;
+   siStartInfo.hStdOutput = out;
+   siStartInfo.hStdError = err;
+   
+   // Convert argument to WCHAR
+   POOLMEM *cmdLine_wchar = get_pool_memory(PM_FNAME);
+   POOLMEM *comspec_wchar = get_pool_memory(PM_FNAME);
+
+   UTF8_2_wchar(&cmdLine_wchar, cmdLine);
+   UTF8_2_wchar(&comspec_wchar, comspec);
+
+   // Create the child process.
+   Dmsg2(dbglvl, "Calling CreateProcess(%s, %s, ...)\n", comspec_wchar, cmdLine_wchar);
+
+   // try to execute program
+   bFuncRetn = p_CreateProcessW((WCHAR*)comspec_wchar,
+                                (WCHAR*)cmdLine_wchar,// command line
+                                NULL,      // process security attributes
+                                NULL,      // primary thread security attributes
+                                TRUE,      // handles are inherited
+                                0,         // creation flags
+                                NULL,      // use parent's environment
+                                NULL,      // use parent's current directory
+                                &siStartInfo,  // STARTUPINFO pointer
+                                hProcInfo);   // receives PROCESS_INFORMATION
+   free_pool_memory(cmdLine_wchar);
+   free_pool_memory(comspec_wchar);
+
+   return bFuncRetn;
+}
+
+
+/**
+ * Create the process with ANSI API
+ */
+static BOOL
+CreateChildProcessA(const char *comspec, char *cmdLine,
+                    PROCESS_INFORMATION *hProcInfo,
+                    HANDLE in, HANDLE out, HANDLE err)
+{
+   STARTUPINFOA siStartInfo;
+   BOOL bFuncRetn = FALSE;
+
+   // Set up members of the STARTUPINFO structure.
+   ZeroMemory( &siStartInfo, sizeof(siStartInfo) );
+   siStartInfo.cb = sizeof(siStartInfo);
+   // setup new process to use supplied handles for stdin,stdout,stderr
+   siStartInfo.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW;
+   siStartInfo.wShowWindow = SW_SHOWMINNOACTIVE;
+
+   siStartInfo.hStdInput = in;
+   siStartInfo.hStdOutput = out;
+   siStartInfo.hStdError = err;
+
+   // Create the child process.
+   Dmsg2(dbglvl, "Calling CreateProcess(%s, %s, ...)\n", comspec, cmdLine);
+
+   // try to execute program
+   bFuncRetn = p_CreateProcessA(comspec,
+                                cmdLine,  // command line
+                                NULL,     // process security attributes
+                                NULL,     // primary thread security attributes
+                                TRUE,     // handles are inherited
+                                0,        // creation flags
+                                NULL,     // use parent's environment
+                                NULL,     // use parent's current directory
+                                &siStartInfo,// STARTUPINFO pointer
+                                hProcInfo);// receives PROCESS_INFORMATION
+   return bFuncRetn;
+}
 
 /**
  * OK, so it would seem CreateProcess only handles true executables:
- *  .com or .exe files.
- * So test to see whether we're getting a .bat file and if so grab
- * $COMSPEC value and pass batch file to it.
+ * .com or .exe files.  So grab $COMSPEC value and pass command line to it.
  */
 HANDLE
 CreateChildProcess(const char *cmdline, HANDLE in, HANDLE out, HANDLE err)
 {
-    PROCESS_INFORMATION piProcInfo;
-    STARTUPINFOA siStartInfo;
-    BOOL bFuncRetn = FALSE;
+   static const char *comspec = NULL;
+   PROCESS_INFORMATION piProcInfo;
+   BOOL bFuncRetn = FALSE;
 
-    // Set up members of the PROCESS_INFORMATION structure.
+   if (!p_CreateProcessA || !p_CreateProcessW)
+      return INVALID_HANDLE_VALUE;
 
-    ZeroMemory( &piProcInfo, sizeof(PROCESS_INFORMATION) );
+   if (comspec == NULL) 
+      comspec = getenv("COMSPEC");
+   if (comspec == NULL) // should never happen
+      return INVALID_HANDLE_VALUE;
 
-    // Set up members of the STARTUPINFO structure.
+   // Set up members of the PROCESS_INFORMATION structure.
+   ZeroMemory( &piProcInfo, sizeof(PROCESS_INFORMATION) );
 
-    ZeroMemory( &siStartInfo, sizeof(STARTUPINFO) );
-    siStartInfo.cb = sizeof(STARTUPINFO);
-    // setup new process to use supplied handles for stdin,stdout,stderr
-    // if supplied handles are not used the send a copy of our STD_HANDLE
-    // as appropriate
-    siStartInfo.dwFlags = STARTF_USESTDHANDLES;
+   // if supplied handles are not used the send a copy of our STD_HANDLE
+   // as appropriate
+   if (in == INVALID_HANDLE_VALUE)
+      in = GetStdHandle(STD_INPUT_HANDLE);
 
-    if (in != INVALID_HANDLE_VALUE)
-        siStartInfo.hStdInput = in;
-    else
-        siStartInfo.hStdInput = GetStdHandle(STD_INPUT_HANDLE);
+   if (out == INVALID_HANDLE_VALUE)
+      out = GetStdHandle(STD_OUTPUT_HANDLE);
 
-    if (out != INVALID_HANDLE_VALUE)
-        siStartInfo.hStdOutput = out;
-    else
-        siStartInfo.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
-    if (err != INVALID_HANDLE_VALUE)
-        siStartInfo.hStdError = err;
-    else
-        siStartInfo.hStdError = GetStdHandle(STD_ERROR_HANDLE);
-    // Create the child process.
+   if (err == INVALID_HANDLE_VALUE)
+      err = GetStdHandle(STD_ERROR_HANDLE);
 
-    char exeFile[256];
+   char *exeFile;
+   const char *argStart;
 
-    const char *comspec = getenv("COMSPEC");
-    
-    if (comspec == NULL) // should never happen
-        return INVALID_HANDLE_VALUE;
+   if (!GetApplicationName(cmdline, &exeFile, &argStart)) {
+      return INVALID_HANDLE_VALUE;
+   }
 
-    char *cmdLine = (char *)alloca(strlen(cmdline) + strlen(comspec) + 16);
-    
-    strcpy(exeFile, comspec);
-    strcpy(cmdLine, comspec);
-    strcat(cmdLine, " /c ");
-    strcat(cmdLine, cmdline);
-
-    // try to execute program
-    bFuncRetn = CreateProcessA(exeFile,
-                              cmdLine, // command line
-                              NULL, // process security attributes
-                              NULL, // primary thread security attributes
-                              TRUE, // handles are inherited
-                              0, // creation flags
-                              NULL, // use parent's environment
-                              NULL, // use parent's current directory
-                              &siStartInfo, // STARTUPINFO pointer
-                              &piProcInfo); // receives PROCESS_INFORMATION
-
-    if (bFuncRetn == 0) {
-        ErrorExit("CreateProcess failed\n");
-        const char *err = errorString();
-        d_msg(__FILE__, __LINE__, 99,
-              "CreateProcess(%s, %s, ...)=%s\n", exeFile, cmdLine, err);
-        LocalFree((void *)err);
-        return INVALID_HANDLE_VALUE;
-    }
-    // we don't need a handle on the process primary thread so we close
-    // this now.
-    CloseHandle(piProcInfo.hThread);
+   POOL_MEM cmdLine(PM_FNAME);
+   Mmsg(cmdLine, "%s /c %s%s", comspec, exeFile, argStart);
 
-    return piProcInfo.hProcess;
-}
+   free(exeFile);
+
+   // New function disabled
+   if (p_CreateProcessW && p_MultiByteToWideChar) {
+      bFuncRetn = CreateChildProcessW(comspec, cmdLine.c_str(), &piProcInfo,
+                                      in, out, err);
+   } else {
+      bFuncRetn = CreateChildProcessA(comspec, cmdLine.c_str(), &piProcInfo,
+                                      in, out, err);
+   }
 
+   if (bFuncRetn == 0) {
+      ErrorExit("CreateProcess failed\n");
+      const char *err = errorString();
+      Dmsg3(dbglvl, "CreateProcess(%s, %s, ...)=%s\n",comspec,cmdLine.c_str(),err);
+      LocalFree((void *)err);
+      return INVALID_HANDLE_VALUE;
+   }
+   // we don't need a handle on the process primary thread so we close
+   // this now.
+   CloseHandle(piProcInfo.hThread);
+   return piProcInfo.hProcess;
+}
 
 void
 ErrorExit (LPCSTR lpszMessage)
 {
-    d_msg(__FILE__, __LINE__, 0, "%s", lpszMessage);
+    Dmsg1(0, "%s", lpszMessage);
 }
 
 
@@ -1292,7 +2157,6 @@ CloseIfValid(HANDLE handle)
         CloseHandle(handle);
 }
 
-#ifndef HAVE_MINGW
 BPIPE *
 open_bpipe(char *prog, int wait, const char *mode)
 {
@@ -1385,23 +2249,23 @@ open_bpipe(char *prog, int wait, const char *mode)
                                      // process terminates we can
                                      // detect eof.
         // ugly but convert WIN32 HANDLE to FILE*
-        int rfd = _open_osfhandle((long)hChildStdoutRdDup, O_RDONLY);
+        int rfd = _open_osfhandle((intptr_t)hChildStdoutRdDup, O_RDONLY | O_BINARY);
         if (rfd >= 0) {
-           bpipe->rfd = _fdopen(rfd, "r");
+           bpipe->rfd = _fdopen(rfd, "rb");
         }
     }
     if (mode_write) {
         CloseHandle(hChildStdinRd); // close our read side so as not
                                     // to interfre with child's copy
         // ugly but convert WIN32 HANDLE to FILE*
-        int wfd = _open_osfhandle((long)hChildStdinWrDup, O_WRONLY);
+        int wfd = _open_osfhandle((intptr_t)hChildStdinWrDup, O_WRONLY | O_BINARY);
         if (wfd >= 0) {
-           bpipe->wfd = _fdopen(wfd, "w");
+           bpipe->wfd = _fdopen(wfd, "wb");
         }
     }
 
     if (wait > 0) {
-        bpipe->timer_id = start_child_timer(bpipe->worker_pid, wait);
+        bpipe->timer_id = start_child_timer(NULL, bpipe->worker_pid, wait);
     }
 
     return bpipe;
@@ -1418,7 +2282,6 @@ cleanup:
     return NULL;
 }
 
-#endif //HAVE_MINGW
 
 int
 kill(int pid, int signal)
@@ -1432,7 +2295,6 @@ kill(int pid, int signal)
    return rval;
 }
 
-#ifndef HAVE_MINGW
 
 int
 close_bpipe(BPIPE *bpipe)
@@ -1440,6 +2302,16 @@ close_bpipe(BPIPE *bpipe)
    int rval = 0;
    int32_t remaining_wait = bpipe->wait;
 
+   /* Close pipes */
+   if (bpipe->rfd) {
+      fclose(bpipe->rfd);
+      bpipe->rfd = NULL;
+   }
+   if (bpipe->wfd) {
+      fclose(bpipe->wfd);
+      bpipe->wfd = NULL;
+   }
+
    if (remaining_wait == 0) {         /* wait indefinitely */
       remaining_wait = INT32_MAX;
    }
@@ -1448,8 +2320,7 @@ close_bpipe(BPIPE *bpipe)
       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);
+         Dmsg1(dbglvl, "GetExitCode error %s\n", err);
          LocalFree((void *)err);
          break;
       }
@@ -1481,27 +2352,26 @@ close_bpipe(BPIPE *bpipe)
 int
 close_wpipe(BPIPE *bpipe)
 {
-    int stat = 1;
+    int result = 1;
 
     if (bpipe->wfd) {
         fflush(bpipe->wfd);
         if (fclose(bpipe->wfd) != 0) {
-            stat = 0;
+            result = 0;
         }
         bpipe->wfd = NULL;
     }
-    return stat;
+    return result;
 }
 
-#include "findlib/find.h"
-
+#ifndef MINGW64
 int
 utime(const char *fname, struct utimbuf *times)
 {
     FILETIME acc, mod;
-    char tmpbuf[1024];
+    char tmpbuf[5000];
 
-    conv_unix_to_win32_path(fname, tmpbuf, 1024);
+    conv_unix_to_vss_win32_path(fname, tmpbuf, 5000);
 
     cvt_utime_to_ftime(times->actime, acc);
     cvt_utime_to_ftime(times->modtime, mod);
@@ -1509,35 +2379,34 @@ utime(const char *fname, struct utimbuf *times)
     HANDLE h = INVALID_HANDLE_VALUE;
 
     if (p_CreateFileW) {
-      POOLMEM* pwszBuf = get_pool_memory(PM_FNAME);
-      UTF8_2_wchar(&pwszBuf, tmpbuf);
+       POOLMEM* pwszBuf = get_pool_memory(PM_FNAME);
+       make_win32_path_UTF8_2_wchar(&pwszBuf, tmpbuf);
 
-      h = p_CreateFileW((LPCWSTR) pwszBuf,
+       h = p_CreateFileW((LPCWSTR)pwszBuf,
                         FILE_WRITE_ATTRIBUTES,
-                        FILE_SHARE_WRITE,
+                        FILE_SHARE_WRITE|FILE_SHARE_READ|FILE_SHARE_DELETE,
                         NULL,
                         OPEN_EXISTING,
-                        0,
+                        FILE_FLAG_BACKUP_SEMANTICS, // required for directories
                         NULL);
-     
-      free_pool_memory(pwszBuf);
+
+       free_pool_memory(pwszBuf);
     } else if (p_CreateFileA) {
-      h = p_CreateFileA(tmpbuf,
+       h = p_CreateFileA(tmpbuf,
                         FILE_WRITE_ATTRIBUTES,
-                        FILE_SHARE_WRITE,
+                        FILE_SHARE_WRITE|FILE_SHARE_READ|FILE_SHARE_DELETE,
                         NULL,
                         OPEN_EXISTING,
-                        0,
+                        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 \"%s\" for utime(): ERR=%s", tmpbuf, err);
-        LocalFree((void *)err);
-        errno = b_errno_win32;
-        return -1;
+       const char *err = errorString();
+       Dmsg2(dbglvl, "Cannot open file \"%s\" for utime(): ERR=%s", tmpbuf, err);
+       LocalFree((void *)err);
+       errno = b_errno_win32;
+       return -1;
     }
 
     int rval = SetFileTime(h, NULL, &acc, &mod) ? 0 : -1;
@@ -1547,112 +2416,61 @@ utime(const char *fname, struct utimbuf *times)
     }
     return rval;
 }
-
-#if USE_WIN32_COMPAT_IO
-
-int
-open(const char *file, int flags, int mode)
-{
-   if (p_wopen) {
-      POOLMEM* pwszBuf = get_pool_memory(PM_FNAME);      
-      UTF8_2_wchar(&pwszBuf, file);
-
-      int nRet = p_wopen((LPCWSTR) pwszBuf, flags|_O_BINARY, mode);
-      free_pool_memory(pwszBuf);
-
-      return nRet;
-   }
-
-   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)
-{
-    DWORD access = 0;
-    DWORD shareMode = 0;
-    DWORD create = 0;
-    DWORD msflags = 0;
-    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_EXCL))
-        shareMode = FILE_SHARE_DELETE|FILE_SHARE_READ|FILE_SHARE_WRITE;
-
-    if (flags & O_APPEND) {
-        printf("open...APPEND not implemented yet.");
-        exit(-1);
-    }
+file_open(const char *file, int flags, int mode)
+{
+   DWORD access = 0;
+   DWORD shareMode = 0;
+   DWORD create = 0;
+   DWORD msflags = 0;
+   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 | 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;
+
+   shareMode = 0;
+
+   if (flags & O_APPEND) {
+      printf("open...APPEND not implemented yet.");
+      exit(-1);
+   }
 
-    if (p_CreateFileW) {
-       POOLMEM* pwszBuf = get_pool_memory(PM_FNAME);       
-       UTF8_2_wchar(pwszBuf, file);
+   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);
+      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;
-    }
-    return (int)foo;
+   if (INVALID_HANDLE_VALUE == foo) {
+      errno = b_errno_win32;
+      return (int)-1;
+   }
+   return (int)foo;
 
 }
 
 
 int
-close(int fd)
+file_close(int fd)
 {
     if (!CloseHandle((HANDLE)fd)) {
         errno = b_errno_win32;
@@ -1663,7 +2481,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;
@@ -1675,7 +2493,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;
@@ -1686,11 +2504,14 @@ read(int fd, void *data, ssize_t len)
     return -1;
 }
 
-off_t
-lseek(int fd, off_t offset, int whence)
+boffset_t
+file_seek(int fd, boffset_t offset, int whence)
 {
     DWORD method = 0;
     DWORD val;
+    LONG  offset_low = (LONG)offset;
+    LONG  offset_high = (LONG)(offset >> 32);
+
     switch (whence) {
     case SEEK_SET :
         method = FILE_BEGIN;
@@ -1706,7 +2527,8 @@ lseek(int fd, off_t offset, int whence)
         return -1;
     }
 
-    if ((val=SetFilePointer((HANDLE)fd, (DWORD)offset, NULL, method)) == INVALID_SET_FILE_POINTER) {
+
+    if ((val=SetFilePointer((HANDLE)fd, offset_low, &offset_high, method)) == INVALID_SET_FILE_POINTER) {
        errno = b_errno_win32;
        return -1;
     }
@@ -1715,18 +2537,105 @@ lseek(int fd, off_t offset, int whence)
 }
 
 int
-dup2(int, int)
+file_dup2(int, int)
 {
     errno = ENOSYS;
     return -1;
 }
+#endif
 
+#ifdef xxx
+/* 
+ * Emulation of mmap and unmmap for tokyo dbm
+ */
+void *mmap(void *start, size_t length, int prot, int flags,
+           int fd, off_t offset)
+{
+   DWORD fm_access = 0;
+   DWORD mv_access = 0;
+   HANDLE h;
+   HANDLE mv;
 
-#endif
+   if (length == 0) {
+      return MAP_FAILED;
+   }
+   if (!fd) {
+      return MAP_FAILED;
+   }
 
-#endif //HAVE_MINGW
+   if (flags & PROT_WRITE) {
+      fm_access |= PAGE_READWRITE;
+   } else if (flags & PROT_READ) {
+      fm_access |= PAGE_READONLY;
+   }
+   
+   if (flags & PROT_READ) {
+      mv_access |= FILE_MAP_READ;
+   }
+   if (flags & PROT_WRITE) {
+      mv_access |= FILE_MAP_WRITE;
+   }
+
+   h = CreateFileMapping((HANDLE)_get_osfhandle (fd), 
+                         NULL /* security */, 
+                         fm_access, 
+                         0 /* MaximumSizeHigh */, 
+                         0 /* MaximumSizeLow */, 
+                         NULL /* name of the file mapping object */);
+
+   if (!h || h == INVALID_HANDLE_VALUE) {
+      return MAP_FAILED;
+   }
+
+   mv = MapViewOfFile(h, mv_access, 
+                      0 /* offset hi */, 
+                      0 /* offset lo */,
+                      length);
+   CloseHandle(h);
+
+   if (!mv || mv == INVALID_HANDLE_VALUE) {
+      return MAP_FAILED;
+   }
+
+   return (void *) mv;
+}
+
+int munmap(void *start, size_t length)
+{
+   if (!start) {
+      return -1;
+   }
+   UnmapViewOfFile(start);
+   return 0;
+}
+#endif
 
 #ifdef HAVE_MINGW
 /* syslog function, added by Nicolas Boichat */
-void closelog() {}
+void openlog(const char *ident, int option, int facility) {}  
 #endif //HAVE_MINGW
+
+/* Log an error message */
+void LogErrorMsg(const char *message)
+{
+   HANDLE eventHandler;
+   const char *strings[2];
+
+   /* Use the OS event logging to log the error */
+   eventHandler = RegisterEventSource(NULL, "Bacula");
+
+   strings[0] = _("\n\nBacula ERROR: ");
+   strings[1] = message;
+
+   if (eventHandler) {
+      ReportEvent(eventHandler, EVENTLOG_ERROR_TYPE,
+              0,                      /* category */
+              0,                      /* ID */
+              NULL,                   /* SID */
+              2,                      /* Number of strings */
+              0,                      /* raw data size */
+              (const char **)strings, /* error strings */
+              NULL);                  /* raw data */
+      DeregisterEventSource(eventHandler);
+   }
+}