More minor Win32 fixes

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

diff --git a/bacula/src/filed/status.c b/bacula/src/filed/status.c
index 95cc5f3c70ee64a209b337446049692ce24f16a8..6cc5fc7efb8a637734eaf7159ea65302fd617f8c 100755 (executable)
--- a/bacula/src/filed/status.c
+++ b/bacula/src/filed/status.c
@@ -75,7 +75,7 @@ static void do_status(void sendit(const char *msg, int len, void *sarg), void *a
         privs = enable_backup_privileges(NULL, 1);
       }
       len = Mmsg(&msg, 
-         _("Priv 0x%x APIs=%sOPT,%sATP,%sLPV,%sGFAE,%sBR,%sBW,%sSPSP\n"), privs,
+         _(" Priv 0x%x APIs=%sOPT,%sATP,%sLPV,%sGFAE,%sBR,%sBW,%sSPSP\n"), privs,
          p_OpenProcessToken?"":"!",
          p_AdjustTokenPrivileges?"":"!",
          p_LookupPrivilegeValue?"":"!",
@@ -97,7 +97,7 @@ static void do_status(void sendit(const char *msg, int len, void *sarg), void *a
     }
 #endif
    if (debug_level > 0) {
-      len = Mmsg(&msg, _("Sizeof: off_t=%d size_t=%d\n"), sizeof(off_t),
+      len = Mmsg(&msg, _(" Sizeof: off_t=%d size_t=%d\n"), sizeof(off_t),
            sizeof(size_t));
       sendit(msg, len, arg);
    }
@@ -398,11 +398,12 @@ char *bac_status(char *buf, int buf_len)
          termstat = _("Last Job Canceled");
         break;
       case JS_ErrorTerminated:
+      case JS_FatalError:  
          termstat = _("Last Job Failed");
         break;
       default:
         if (job->Errors) {
-            termstat = _("Last Job had Errors");
+            termstat = _("Last Job had Warnings");
         }
         break;
       }

diff --git a/bacula/src/win32/compat/compat.cpp b/bacula/src/win32/compat/compat.cpp
index b128e98953753d833abda69ced970498c79f63b9..cf4ef4ab64b68428feaf0a871db79e3e8ee937bc 100644 (file)
--- a/bacula/src/win32/compat/compat.cpp
+++ b/bacula/src/win32/compat/compat.cpp
@@ -792,9 +792,7 @@ getArgv0(const char *cmdline)
 {
 
     int inquote = 0;
-
-    const char *cp = cmdline;
-    for (; *cp; cp++)
+    for (const char *cp = cmdline; *cp; cp++)
     {
         if (*cp == '"') {
             inquote = !inquote;
@@ -1161,33 +1159,36 @@ open(const char *file, int flags, int 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)
 {
-    int rval = _close(fd);
-    if (rval == -1)
-        rval = closesocket(fd);
-    return rval;
+    return _close(fd);
 }
 
 #ifndef HAVE_WXCONSOLE
 ssize_t
-read(int fd, void *buf, size_t len)
+read(int fd, void *buf, ssize_t len)
 {
-    return _read(fd, buf, len);
+    return _read(fd, buf, (size_t)len);
 }
 
 ssize_t
-write(int fd, const void *buf, size_t len)
+write(int fd, const void *buf, ssize_t len)
 {
-    return _write(fd, buf, len);
+    return _write(fd, buf, (size_t)len);
 }
 #endif
 
 off_t
 lseek(int fd, off_t offset, int whence)
 {
-    return (off_t)_lseeki64(fd, offset, whence);
+    return _lseeki64(fd, offset, whence);
 }
 
 int
@@ -1243,7 +1244,7 @@ close(int fd)
 }
 
 ssize_t
-write(int fd, const void *data, size_t len)
+write(int fd, const void *data, ssize_t len)
 {
     BOOL status;
     DWORD bwrite;
@@ -1254,7 +1255,7 @@ write(int fd, const void *data, size_t len)
 
 
 ssize_t
-read(int fd, void *data, size_t len)
+read(int fd, void *data, ssize_t len)
 {
     BOOL status;
     DWORD bread;

diff --git a/bacula/src/win32/compat/compat.h b/bacula/src/win32/compat/compat.h
index 9c30771b583d816e47e9f000a2ba10abeb8222cb..604403fe604106680949154a28a5b7196bce693a 100644 (file)
--- a/bacula/src/win32/compat/compat.h
+++ b/bacula/src/win32/compat/compat.h
@@ -265,8 +265,8 @@ int __snprintf(char *str, size_t count, const char *fmt, ...);
 int __sprintf(char *str, const char *fmt, ...);
 
 #ifndef HAVE_WXCONSOLE
-ssize_t read(int fd, void *, size_t nbytes);
-ssize_t write(int fd, const void *, size_t nbytes);
+ssize_t read(int fd, void *, ssize_t nbytes);
+ssize_t write(int fd, const void *, ssize_t nbytes);
 #endif
 
 int close(int fd);

diff --git a/bacula/src/win32/wx-console/Makefile b/bacula/src/win32/wx-console/Makefile
new file mode 100755 (executable)
index 0000000..d9f4c38
--- /dev/null
+++ b/bacula/src/win32/wx-console/Makefile
@@ -0,0 +1,17 @@
+#
+# Makefile to build the native Win32 console
+# VC++ and tools must be on your path
+#
+#     Kern Sibbald, June 2004
+#
+
+NMAKE=nmake
+
+first_rule: all
+
+dummy:
+
+clean:
+       rm -rf Debug/*.obj Release/*.obj
+
+distclean: clean