Win32 updates

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1092 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/lib/bsys.c b/bacula/src/lib/bsys.c
index 7f1cfa1804a1f27de4143649d09ccb9c79a1497b..0f1100d74f8369b3bc1ae489168db4151b94d579 100644 (file)
--- a/bacula/src/lib/bsys.c
+++ b/bacula/src/lib/bsys.c
@@ -317,7 +317,7 @@ void create_pid_file(char *dir, const char *progname, int port)
       unlink(mp_chr(fname));                 /* remove stale pid file */
    }
    /* Create new pid file */
-   if ((pidfd = open(mp_chr(fname), O_CREAT | O_TRUNC | O_WRONLY | O_BINARY, 0644)) >= 0) {
+   if ((pidfd = open(mp_chr(fname), O_CREAT|[CTRUNC|O_WRONLY|O_BINARY, 0644)) >= 0) {
       len = sprintf(pidbuf, "%d\n", (int)getpid());
       write(pidfd, pidbuf, len);
       close(pidfd);
@@ -376,7 +376,7 @@ void read_state_file(char *dir, const char *progname, int port)
 
    Mmsg(&fname, "%s/%s.%d.state", dir, progname, port);
    /* If file exists, see what we have */
-   Dmsg1(10, "O_BINARY=%d\n", O_BINARY);
+// Dmsg1(10, "O_BINARY=%d\n", O_BINARY);
    if ((sfd = open(mp_chr(fname), O_RDONLY|O_BINARY, 0)) < 0) {
       Dmsg3(010, "Could not open state file. sfd=%d size=%d: ERR=%s\n", 
                    sfd, sizeof(hdr), strerror(errno));
@@ -396,7 +396,7 @@ void read_state_file(char *dir, const char *progname, int port)
       Dmsg0(000, "State file header id invalid.\n");
       goto bail_out;
    }
-   Dmsg1(010, "Read header of %d bytes.\n", sizeof(hdr));
+// Dmsg1(010, "Read header of %d bytes.\n", sizeof(hdr));
    read_last_jobs_list(sfd, hdr.last_jobs_addr);
 bail_out:
    if (sfd >= 0) {
@@ -415,7 +415,7 @@ void write_state_file(char *dir, const char *progname, int port)
 
    Mmsg(&fname, "%s/%s.%d.state", dir, progname, port);
    /* Create new state file */
-   if ((sfd = open(mp_chr(fname), O_CREAT|O_TRUNC|O_WRONLY|O_BINARY, 0640)) < 0) {
+   if ((sfd = open(mp_chr(fname), O_CREAT|O_WRONLY|O_BINARY, 0640)) < 0) {
       Dmsg2(000, _("Could not create state file. %s ERR=%s\n"), fname, strerror(errno));
       Emsg2(M_ERROR, 0, _("Could not create state file. %s ERR=%s\n"), fname, strerror(errno));
       goto bail_out;
@@ -424,10 +424,10 @@ void write_state_file(char *dir, const char *progname, int port)
       Dmsg1(000, "Write hdr error: ERR=%s\n", strerror(errno));
       goto bail_out;
    }
-   Dmsg1(010, "Wrote header of %d bytes\n", sizeof(state_hdr));
+// Dmsg1(010, "Wrote header of %d bytes\n", sizeof(state_hdr));
    state_hdr.last_jobs_addr = sizeof(state_hdr);
    state_hdr.reserved[0] = write_last_jobs_list(sfd, state_hdr.last_jobs_addr);   
-   Dmsg1(010, "write last job end = %d\n", (int)state_hdr.reserved[0]);
+// Dmsg1(010, "write last job end = %d\n", (int)state_hdr.reserved[0]);
    if (lseek(sfd, 0, SEEK_SET) < 0) {
       Dmsg1(000, "lseek error: ERR=%s\n", strerror(errno));
       goto bail_out;
@@ -435,7 +435,7 @@ void write_state_file(char *dir, const char *progname, int port)
    if (write(sfd, &state_hdr, sizeof(state_hdr)) != sizeof(state_hdr)) {
       Dmsg1(000, "Write final hdr error: ERR=%s\n", strerror(errno));
    }
-
+// Dmsg1(010, "rewrote header = %d\n", sizeof(state_hdr));
 bail_out:
    if (sfd >= 0) {
       close(sfd);

diff --git a/bacula/src/win32/baculafd/GNUmakefile b/bacula/src/win32/baculafd/GNUmakefile
index 1f4d92db3f5e643e7a3a2a4f4efa5e14f08365b2..eeb2c5f5c0292d0b3205d06e94f0909e44445c08 100644 (file)
--- a/bacula/src/win32/baculafd/GNUmakefile
+++ b/bacula/src/win32/baculafd/GNUmakefile
@@ -1,5 +1,6 @@
+
 default:
        env MAKEFLAGS= nmake CFG="baculafd - Win32 Release" /f baculafd.mak
 clean:
        env MAKEFLAGS= nmake CFG="baculafd - Win32 Release" /f baculafd.mak clean
-
+       rm -f baculafd.plg baculafd.opt baculafd.ncb

diff --git a/bacula/src/win32/baculafd/baculafd.dsp b/bacula/src/win32/baculafd/baculafd.dsp
index 57fcee39162f804675f89a5b95c270128bbaf798..2115fddf84c990c18c51352ed7441584fd21721c 100644 (file)
--- a/bacula/src/win32/baculafd/baculafd.dsp
+++ b/bacula/src/win32/baculafd/baculafd.dsp
@@ -1,505 +1,505 @@
-# Microsoft Developer Studio Project File - Name="baculafd" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=baculafd - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "baculafd.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "baculafd.mak" CFG="baculafd - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "baculafd - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "baculafd - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "baculafd - Win32 Release"
-
-# PROP BASE Use_MFC 2
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 1
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../compat" /I "../.." /I "../pthreads" /I "../zlib" /I "." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_WIN32" /FD /c
-# SUBTRACT CPP /YX /Yc /Yu
-# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 wsock32.lib pthreadVCE.lib zlib.lib /nologo /subsystem:windows /pdb:none /machine:I386 /nodefaultlib:"MSVCRT.lib" /out:"Release/bacula-fd.exe" /libpath:"../pthreads" /libpath:"../zlib"
-
-!ELSEIF  "$(CFG)" == "baculafd - Win32 Debug"
-
-# PROP BASE Use_MFC 2
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 2
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../compat" /I "../.." /I "../pthreads" /I "../zlib" /I "." /D "_DEBUG" /D "_WINMAIN_" /D "PTW32_BUILD" /D "_AFXDLL" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_WIN32" /FR /FD /GZ /c
-# SUBTRACT CPP /YX /Yc /Yu
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
-# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 wsock32.lib pthreadVCE.lib zlib.lib /nologo /subsystem:windows /pdb:none /debug /machine:I386 /out:"Debug/bacula-fd.exe" /libpath:"../pthreads" /libpath:"../zlib"
-# SUBTRACT LINK32 /nodefaultlib
-
-!ENDIF 
-
-# Begin Target
-
-# Name "baculafd - Win32 Release"
-# Name "baculafd - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\lib\alist.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\alloc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\attr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\findlib\attribs.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\filed\authenticate.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\filed\backup.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\base64.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\findlib\bfile.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\bget_msg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\bnet.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\bnet_server.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\bshm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\bsys.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\btime.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\compat.cpp
-# End Source File
-# Begin Source File
-
-SOURCE="..\lib\cram-md5.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\crc32.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\findlib\create_file.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\daemon.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\dlist.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\edit.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\findlib\enable_priv.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\filed\estimate.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\filed\filed.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\filed\filed_conf.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\findlib\find.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\findlib\find_one.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\fnmatch.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\getopt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\filed\heartbeat.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\hmac.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\htable.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\idcache.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\jcr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\filed\job.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\lex.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\findlib\makepath.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\findlib\match.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\md5.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\mem_pool.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\message.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\parse_conf.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\print.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\queue.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\filed\restore.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\rwlock.cpp
-# End Source File
-# Begin Source File
-
-SOURCE="..\findlib\save-cwd.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\scan.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\semlock.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\serial.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\sha1.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\signal.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\smartall.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\filed\status.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\StdAfx.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\timers.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\tree.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\util.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\var.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\filed\verify.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\filed\verify_vol.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\watchdog.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\filed\win32\winabout.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\findlib\winapi.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\filed\win32\winevents.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\filed\win32\winmain.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\filed\win32\winres.rc
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\filed\win32\winservice.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\filed\win32\winstat.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\filed\win32\wintray.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\lib\workq.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\compat\alloca.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\compat.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\config.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\dirent.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\getopt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\grp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\host.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\mswinver.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\netdb.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\pwd.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\sched.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\StdAfx.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\stdint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\strings.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\syslog.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\compat\unistd.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\filed\win32\winabout.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\filed\win32\winbacula.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\filed\win32\winevents.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\filed\win32\winres.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\filed\win32\winservice.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\filed\win32\winstat.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\filed\win32\wintray.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=..\..\src\filed\win32\bacula.bmp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\filed\win32\bacula.ico
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\filed\win32\error.ico
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\filed\win32\idle.ico
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\filed\win32\running.ico
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\filed\win32\saving.ico
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\ReadMe.txt
-# End Source File
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="baculafd" - Package Owner=<4>\r
+# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
+# ** DO NOT EDIT **\r
+\r
+# TARGTYPE "Win32 (x86) Console Application" 0x0103\r
+\r
+CFG=baculafd - Win32 Debug\r
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
+!MESSAGE use the Export Makefile command and run\r
+!MESSAGE \r
+!MESSAGE NMAKE /f "baculafd.mak".\r
+!MESSAGE \r
+!MESSAGE You can specify a configuration when running NMAKE\r
+!MESSAGE by defining the macro CFG on the command line. For example:\r
+!MESSAGE \r
+!MESSAGE NMAKE /f "baculafd.mak" CFG="baculafd - Win32 Debug"\r
+!MESSAGE \r
+!MESSAGE Possible choices for configuration are:\r
+!MESSAGE \r
+!MESSAGE "baculafd - Win32 Release" (based on "Win32 (x86) Console Application")\r
+!MESSAGE "baculafd - Win32 Debug" (based on "Win32 (x86) Console Application")\r
+!MESSAGE \r
+\r
+# Begin Project\r
+# PROP AllowPerConfigDependencies 0\r
+# PROP Scc_ProjName ""\r
+# PROP Scc_LocalPath ""\r
+CPP=cl.exe\r
+RSC=rc.exe\r
+\r
+!IF  "$(CFG)" == "baculafd - Win32 Release"\r
+\r
+# PROP BASE Use_MFC 2\r
+# PROP BASE Use_Debug_Libraries 0\r
+# PROP BASE Output_Dir "Release"\r
+# PROP BASE Intermediate_Dir "Release"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 1\r
+# PROP Use_Debug_Libraries 0\r
+# PROP Output_Dir "Release"\r
+# PROP Intermediate_Dir "Release"\r
+# PROP Ignore_Export_Lib 0\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c\r
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../compat" /I "../.." /I "../pthreads" /I "../zlib" /I "." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_WIN32" /FD /c\r
+# SUBTRACT CPP /YX /Yc /Yu\r
+# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"\r
+# ADD RSC /l 0x409 /d "NDEBUG"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386\r
+# ADD LINK32 wsock32.lib pthreadVCE.lib zlib.lib /nologo /subsystem:windows /pdb:none /machine:I386 /nodefaultlib:"MSVCRT.lib" /out:"Release/bacula-fd.exe" /libpath:"../pthreads" /libpath:"../zlib"\r
+\r
+!ELSEIF  "$(CFG)" == "baculafd - Win32 Debug"\r
+\r
+# PROP BASE Use_MFC 2\r
+# PROP BASE Use_Debug_Libraries 1\r
+# PROP BASE Output_Dir "Debug"\r
+# PROP BASE Intermediate_Dir "Debug"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 2\r
+# PROP Use_Debug_Libraries 1\r
+# PROP Output_Dir "Debug"\r
+# PROP Intermediate_Dir "Debug"\r
+# PROP Ignore_Export_Lib 0\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_AFXDLL" /Yu"stdafx.h" /FD /GZ /c\r
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../compat" /I "../.." /I "../pthreads" /I "../zlib" /I "." /D "_DEBUG" /D "_WINMAIN_" /D "PTW32_BUILD" /D "_AFXDLL" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_WIN32" /FR /FD /GZ /c\r
+# SUBTRACT CPP /YX /Yc /Yu\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"\r
+# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept\r
+# ADD LINK32 wsock32.lib pthreadVCE.lib zlib.lib /nologo /subsystem:windows /pdb:none /debug /machine:I386 /out:"Debug/bacula-fd.exe" /libpath:"../pthreads" /libpath:"../zlib"\r
+# SUBTRACT LINK32 /nodefaultlib\r
+\r
+!ENDIF \r
+\r
+# Begin Target\r
+\r
+# Name "baculafd - Win32 Release"\r
+# Name "baculafd - Win32 Debug"\r
+# Begin Group "Source Files"\r
+\r
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\alist.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\alloc.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\attr.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\findlib\attribs.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\filed\authenticate.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\filed\backup.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\base64.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\findlib\bfile.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\bget_msg.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\bnet.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\bnet_server.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\bshm.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\bsys.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\btime.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\compat\compat.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE="..\lib\cram-md5.cpp"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\crc32.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\findlib\create_file.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\daemon.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\dlist.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\edit.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\findlib\enable_priv.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\filed\estimate.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\filed\filed.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\filed\filed_conf.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\findlib\find.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\findlib\find_one.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\fnmatch.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\compat\getopt.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\filed\heartbeat.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\hmac.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\htable.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\idcache.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\jcr.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\filed\job.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\lex.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\findlib\makepath.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\findlib\match.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\md5.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\mem_pool.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\message.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\parse_conf.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\compat\print.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\queue.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\filed\restore.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\rwlock.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE="..\findlib\save-cwd.cpp"\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\scan.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\semlock.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\serial.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\sha1.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\signal.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\smartall.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\filed\status.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\StdAfx.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\timers.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\tree.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\util.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\var.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\filed\verify.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\filed\verify_vol.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\watchdog.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\filed\win32\winabout.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\findlib\winapi.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\filed\win32\winevents.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\filed\win32\winmain.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\filed\win32\winres.rc\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\filed\win32\winservice.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\filed\win32\winstat.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\filed\win32\wintray.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\workq.cpp\r
+# End Source File\r
+# End Group\r
+# Begin Group "Header Files"\r
+\r
+# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
+# Begin Source File\r
+\r
+SOURCE=..\compat\alloca.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\compat\compat.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\compat\config.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\compat\dirent.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\compat\getopt.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\compat\grp.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\compat\host.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\compat\mswinver.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\compat\netdb.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\compat\pwd.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\compat\sched.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\StdAfx.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\compat\stdint.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\compat\strings.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\compat\syslog.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\compat\unistd.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\filed\win32\winabout.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\filed\win32\winbacula.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\filed\win32\winevents.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\filed\win32\winres.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\filed\win32\winservice.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\filed\win32\winstat.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\filed\win32\wintray.h\r
+# End Source File\r
+# End Group\r
+# Begin Group "Resource Files"\r
+\r
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\filed\win32\bacula.bmp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\filed\win32\bacula.ico\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\filed\win32\error.ico\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\filed\win32\idle.ico\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\filed\win32\running.ico\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\filed\win32\saving.ico\r
+# End Source File\r
+# End Group\r
+# Begin Source File\r
+\r
+SOURCE=.\ReadMe.txt\r
+# End Source File\r
+# End Target\r
+# End Project\r

diff --git a/bacula/src/win32/baculafd/setup-debug b/bacula/src/win32/baculafd/setup-debug
index 5c13a7d7fabe6c334cfb416f78828935aa0d675c..b4f729877064234fd9b554d37aba01c16c41dd6a 100755 (executable)
--- a/bacula/src/win32/baculafd/setup-debug
+++ b/bacula/src/win32/baculafd/setup-debug
@@ -1,3 +1,3 @@
 #!/bin/sh
-cp ../../pthreads/pthreadVCE.dll .
+cp ../pthreads/pthreadVCE.dll .
 cp /bacula/bin/bacula-fd.conf .