Add new win32 console files

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

diff --git a/bacula/src/console/console.c b/bacula/src/console/console.c
index de84cb93952dd7fe301fc08ee253aca2d5139f43..93802e85561fb0a665f6c9fdd0fb7918bd6bd91a 100644 (file)
--- a/bacula/src/console/console.c
+++ b/bacula/src/console/console.c
@@ -41,6 +41,12 @@
 #define clrbrk()
 #define usrbrk() 0  
 #endif
+
+#ifdef HAVE_WIN32
+#include <windows.h>
+#define isatty(fd) (fd==1)
+DWORD  g_platform_id = VER_PLATFORM_WIN32_WINDOWS;
+#endif
  
 /* Exported variables */
 
@@ -332,6 +338,7 @@ int main(int argc, char *argv[])
       init_signals(terminate_console);
    }
 
+#if !defined(HAVE_WIN32)
    /* Override Bacula default signals */
    signal(SIGCHLD, SIG_IGN);
    signal(SIGQUIT, SIG_IGN);
@@ -340,6 +347,7 @@ int main(int argc, char *argv[])
    signal(SIGTTIN, got_sigtin);
    signal(SIGTTOU, got_sigtout);
    trapctlc();
+#endif
 
    if (argc) {
       usage();

diff --git a/bacula/src/console/console_conf.c b/bacula/src/console/console_conf.c
index b9d4c72026e525ca3a013949bd6b2e68911873da..48e460b5819d69c20b2bb806473824b0fee42de4 100644 (file)
--- a/bacula/src/console/console_conf.c
+++ b/bacula/src/console/console_conf.c
@@ -21,7 +21,7 @@
  */
 
 /*
-   Copyright (C) 2000, 2001 Kern Sibbald and John Walker
+   Copyright (C) 2000-2004 Kern Sibbald and John Walker
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License

diff --git a/bacula/src/win32/console/authenticate.cpp b/bacula/src/win32/console/authenticate.cpp
new file mode 100644 (file)
index 0000000..96ae414
--- /dev/null
+++ b/bacula/src/win32/console/authenticate.cpp
@@ -0,0 +1 @@
+#include "../../console/authenticate.c"

diff --git a/bacula/src/win32/console/console.cpp b/bacula/src/win32/console/console.cpp
index f93356908de01cd804e423c062287339b1b53778..b28f319e0b8b933484697ca375bd874baa7623ca 100644 (file)
--- a/bacula/src/win32/console/console.cpp
+++ b/bacula/src/win32/console/console.cpp
@@ -1,10 +1 @@
-// console.cpp : Defines the entry point for the console application.
-//
-
-#include "stdafx.h"
-
-
-int main(int argc, char* argv[])
-{
-       return 0;
-}
+#include "../../console/console.c"

diff --git a/bacula/src/win32/console/console.dsp b/bacula/src/win32/console/console.dsp
index 0f76770d4b41c87c34076b8bb8f5f2a19c850172..fbd4eaf9862a7322e6bbeb9c387ff1d12f55e060 100644 (file)
--- a/bacula/src/win32/console/console.dsp
+++ b/bacula/src/win32/console/console.dsp
@@ -48,8 +48,8 @@ BSC32=bscmake.exe
 # 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  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:console /machine:I386\r
-# ADD 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  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:console /machine:I386\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 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:console /machine:I386\r
+# ADD 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 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:console /machine:I386\r
 \r
 !ELSEIF  "$(CFG)" == "console - Win32 Debug"\r
 \r
@@ -58,21 +58,22 @@ LINK32=link.exe
 # PROP BASE Output_Dir "Debug"\r
 # PROP BASE Intermediate_Dir "Debug"\r
 # PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\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 /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ  /c\r
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ  /c\r
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c\r
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../compat" /I "../.." /I "../../../../depkgs-win32/pthreads" /I "." /D "_DEBUG" /D "_WINMAIN_" /D "PTW32_BUILD" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_WIN32" /D "_AFXDLL" /FR /FD /I /GZ /c\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
-# ADD RSC /l 0x409 /d "_DEBUG"\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  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:console /debug /machine:I386 /pdbtype:sept\r
-# ADD 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  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:console /debug /machine:I386 /pdbtype:sept\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 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:console /debug /machine:I386 /pdbtype:sept\r
+# ADD LINK32 wsock32.lib pthreadVCE.lib /nologo /subsystem:windows /pdb:none /debug /machine:I386 /out:"Debug/bconsole.exe" /libpath:"../../../../depkgs-win32/pthreads"\r
 \r
 !ENDIF \r
 \r
@@ -85,21 +86,205 @@ LINK32=link.exe
 # 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=.\authenticate.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=..\lib\bnet.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=.\console.cpp\r
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\console_conf.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=..\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=..\compat\getopt.c\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\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=..\lib\lex.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=..\lib\rwlock.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\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\smartall.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\StdAfx.cpp\r
 # ADD CPP /Yc"stdafx.h"\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\util.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\lib\watchdog.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\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\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=..\compat\winconfig.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\compat\winhost.h\r
+# End Source File\r
 # End Group\r
 # Begin Group "Resource Files"\r
 \r

diff --git a/bacula/src/win32/console/console_conf.cpp b/bacula/src/win32/console/console_conf.cpp
new file mode 100644 (file)
index 0000000..dc0a34c
--- /dev/null
+++ b/bacula/src/win32/console/console_conf.cpp
@@ -0,0 +1 @@
+#include "../../console/console_conf.c"