Update projects + attempt to fix state file on Win32

[bacula/bacula] / bacula / src / filed / win32 / winservice.cpp

diff --git a/bacula/src/filed/win32/winservice.cpp b/bacula/src/filed/win32/winservice.cpp
index 98cb4140dde1bbca04e49eacabd40cc4a9c32b2a..3492da70e68a09786fb37146ee71d7c8bc8efaa9 100755 (executable)
--- a/bacula/src/filed/win32/winservice.cpp
+++ b/bacula/src/filed/win32/winservice.cpp
@@ -289,8 +289,8 @@ bacService::BaculaServiceMain()
       }
 
       // And find the RegisterServiceProcess function
-      DWORD WINAPI (*RegisterService)(DWORD, DWORD);
-      RegisterService = (DWORD (*)(DWORD, DWORD))
+      DWORD (WINAPI *RegisterService)(DWORD, DWORD);
+      RegisterService = (DWORD (WINAPI *)(DWORD, DWORD))
               GetProcAddress(kerneldll, "RegisterServiceProcess");
       if (RegisterService == NULL) {
          MessageBox(NULL, "Registry service not found: Bacula service not started",
@@ -426,7 +426,7 @@ bacService::InstallService()
 
    // Append the service-start flag to the end of the path:
    if ((int)strlen(path) + 20 + (int)strlen(BaculaRunService) < pathlength) {
-      sprintf(servicecmd, "\"%s\" %s -c %s", path, BaculaRunService, path);
+      sprintf(servicecmd, "\"%s\" %s -c \"%s\"", path, BaculaRunService, path);
       len = strlen(servicecmd) - 1;
       for ( ; len > 0; len--) {
          if (servicecmd[len] == '\\') {
@@ -781,7 +781,7 @@ void LogErrorMsg(char *message, char *fname, int lineno)
    }
    LocalFree(msg);
 }
-typedef BOOL WINAPI (*WinAPI)(SC_HANDLE, DWORD, LPVOID);
+typedef BOOL  (WINAPI * WinAPI)(SC_HANDLE, DWORD, LPVOID);
 
 void set_service_description(SC_HANDLE hSCManager, SC_HANDLE hService,
                              LPSTR lpDesc)