git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1450
91ce42f0-d328-0410-95d8-
f526ca767f89
privs = enable_backup_privileges(NULL, 1);
}
len = Mmsg(&msg,
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?"":"!",
p_OpenProcessToken?"":"!",
p_AdjustTokenPrivileges?"":"!",
p_LookupPrivilegeValue?"":"!",
}
#endif
if (debug_level > 0) {
}
#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);
}
sizeof(size_t));
sendit(msg, len, arg);
}
termstat = _("Last Job Canceled");
break;
case JS_ErrorTerminated:
termstat = _("Last Job Canceled");
break;
case JS_ErrorTerminated:
termstat = _("Last Job Failed");
break;
default:
if (job->Errors) {
termstat = _("Last Job Failed");
break;
default:
if (job->Errors) {
- termstat = _("Last Job had Errors");
+ termstat = _("Last Job had Warnings");
-
- const char *cp = cmdline;
- for (; *cp; cp++)
+ for (const char *cp = cmdline; *cp; cp++)
{
if (*cp == '"') {
inquote = !inquote;
{
if (*cp == '"') {
inquote = !inquote;
+/*
+ * 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 rval = _close(fd);
- if (rval == -1)
- rval = closesocket(fd);
- return rval;
}
#ifndef HAVE_WXCONSOLE
ssize_t
}
#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);
-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)
{
}
#endif
off_t
lseek(int fd, off_t offset, int whence)
{
- return (off_t)_lseeki64(fd, offset, whence);
+ return _lseeki64(fd, offset, whence);
-write(int fd, const void *data, size_t len)
+write(int fd, const void *data, ssize_t len)
{
BOOL status;
DWORD bwrite;
{
BOOL status;
DWORD bwrite;
-read(int fd, void *data, size_t len)
+read(int fd, void *data, ssize_t len)
{
BOOL status;
DWORD bread;
{
BOOL status;
DWORD bread;
int __sprintf(char *str, const char *fmt, ...);
#ifndef HAVE_WXCONSOLE
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);
#endif
int close(int fd);
--- /dev/null
+#
+# 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