*
*/
/*
- Copyright (C) 2001-2005 Kern Sibbald
+ Copyright (C) 2001-2006 Kern Sibbald
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
static int privs = 0;
#endif
#ifdef WIN32_VSS
+#include "vss.h"
#define VSS " VSS"
+extern VSSClient *g_pVSSClient;
#else
#define VSS ""
#endif
msg = (char *)get_pool_memory(PM_MESSAGE);
found = 0;
- len = Mmsg(msg, "%s Version: " VERSION " (" BDATE ")" VSS " %s %s %s\n",
- my_name, HOST_OS, DISTNAME, DISTVER);
+ len = Mmsg(msg, _("%s Version: %s (%s) %s %s %s %s\n"),
+ my_name, VERSION, BDATE, VSS, HOST_OS, DISTNAME, DISTVER);
sendit(msg, len, arg);
bstrftime_nc(dt, sizeof(dt), daemon_start_time);
len = Mmsg(msg, _("Daemon started %s, %d Job%s run since started.\n"),
dt, num_jobs_run, num_jobs_run == 1 ? "" : "s");
sendit(msg, len, arg);
#if defined(HAVE_CYGWIN) || defined(HAVE_WIN32)
- if (/*debug_level > 0*/ true) {
+ if (debug_level > 0) {
if (!privs) {
privs = enable_backup_privileges(NULL, 1);
}
- len = Mmsg(msg,
- _(" Priv 0x%x\n APIs=%sOPT,%sATP,%sLPV,%sCFA,%sCFW,\n"
- " %sWUL,%sWMKD,%sWOP,%sGFAA,%sGFAW,%sGFAEA,%sGFAEW,%sSFAA,%sSFAW,%sBR,%sBW,%sSPSP,\n"
- " %sWC2MB,%sMB2WC,%sFFFA,%sFFFW,%sFNFA,%sFNFW,%sSCDA,%sSCDW,\n"
- " %sGCDA,%sGCDW\n"),
- privs,
- p_OpenProcessToken?"":"!",
- p_AdjustTokenPrivileges?"":"!",
- p_LookupPrivilegeValue?"":"!",
-
- p_CreateFileA?"":"!",
- p_CreateFileW?"":"!",
-
- p_wunlink?"":"!",
- p_wmkdir?"":"!",
- p_wopen?"":"!",
-
- p_GetFileAttributesA?"":"!",
- p_GetFileAttributesW?"":"!",
-
- p_GetFileAttributesExA?"":"!",
- p_GetFileAttributesExW?"":"!",
-
- p_SetFileAttributesA?"":"!",
- p_SetFileAttributesW?"":"!",
- p_BackupRead?"":"!",
- p_BackupWrite?"":"!",
- p_SetProcessShutdownParameters?"":"!",
-
- p_WideCharToMultiByte?"":"!",
- p_MultiByteToWideChar?"":"!",
-
- p_FindFirstFileA?"":"!",
- p_FindFirstFileW?"":"!",
-
- p_FindNextFileA?"":"!",
- p_FindNextFileW?"":"!",
-
- p_SetCurrentDirectoryA?"":"!",
- p_SetCurrentDirectoryW?"":"!",
-
- p_GetCurrentDirectoryA?"":"!",
- p_GetCurrentDirectoryW?"":"!");
+ len = Mmsg(msg, "Priv 0x%x\n", privs);
sendit(msg, len, arg);
+ len = Mmsg(msg, "APIs=%sOPT,%sATP,%sLPV,%sCFA,%sCFW,\n",
+ p_OpenProcessToken?"":"!",
+ p_AdjustTokenPrivileges?"":"!",
+ p_LookupPrivilegeValue?"":"!",
+ p_CreateFileA?"":"!",
+ p_CreateFileW?"":"!");
+ sendit(msg, len, arg);
+ len = Mmsg(msg, " %sWUL,%sWMKD,%sWOP,%sGFAA,%sGFAW,%sGFAEA,%sGFAEW,%sSFAA,%sSFAW,%sBR,%sBW,%sSPSP,\n",
+ p_wunlink?"":"!",
+ p_wmkdir?"":"!",
+ p_wopen?"":"!",
+ p_GetFileAttributesA?"":"!",
+ p_GetFileAttributesW?"":"!",
+ p_GetFileAttributesExA?"":"!",
+ p_GetFileAttributesExW?"":"!",
+ p_SetFileAttributesA?"":"!",
+ p_SetFileAttributesW?"":"!",
+ p_BackupRead?"":"!",
+ p_BackupWrite?"":"!",
+ p_SetProcessShutdownParameters?"":"!");
+ sendit(msg, len, arg);
+ len = Mmsg(msg, " %sWC2MB,%sMB2WC,%sFFFA,%sFFFW,%sFNFA,%sFNFW,%sSCDA,%sSCDW,\n",
+ p_WideCharToMultiByte?"":"!",
+ p_MultiByteToWideChar?"":"!",
+ p_FindFirstFileA?"":"!",
+ p_FindFirstFileW?"":"!",
+ p_FindNextFileA?"":"!",
+ p_FindNextFileW?"":"!",
+ p_SetCurrentDirectoryA?"":"!",
+ p_SetCurrentDirectoryW?"":"!");
+ sendit(msg, len, arg);
+ len = Mmsg(msg, " %sGCDA,%sGCDW,%sGVPNW,%sGVNFVMPW\n",
+ p_GetCurrentDirectoryA?"":"!",
+ p_GetCurrentDirectoryW?"":"!",
+ p_GetVolumePathNameW?"":"!",
+ p_GetVolumeNameForVolumeMountPointW?"":"!");
+ sendit(msg, len, arg);
}
#endif
if (debug_level > 0) {
Dmsg0(1000, "Begin status jcr loop.\n");
len = Mmsg(msg, _("Running Jobs:\n"));
sendit(msg, len, arg);
+ char *vss = "";
+#ifdef WIN32_VSS
+ if (g_pVSSClient && g_pVSSClient->IsInitialized()) {
+ vss = "VSS ";
+ }
+#endif
foreach_jcr(njcr) {
bstrftime_nc(dt, sizeof(dt), njcr->start_time);
if (njcr->JobId == 0) {
len = Mmsg(msg, _("JobId %d Job %s is running.\n"),
njcr->JobId, njcr->Job);
sendit(msg, len, arg);
- len = Mmsg(msg, _(" %s Job started: %s\n"),
- job_type_to_str(njcr->JobType), dt);
+ len = Mmsg(msg, _(" %s%s Job started: %s\n"),
+ vss, job_type_to_str(njcr->JobType), dt);
}
sendit(msg, len, arg);
if (njcr->JobId == 0) {
- free_jcr(njcr);
continue;
}
sec = time(NULL) - njcr->start_time;
edit_uint64_with_commas(njcr->num_files_examined, b1));
sendit(msg, len, arg);
if (njcr->JobFiles > 0) {
- P(njcr->mutex);
+ njcr->lock();
len = Mmsg(msg, _(" Processing file: %s\n"), njcr->last_fname);
- V(njcr->mutex);
+ njcr->unlock();
sendit(msg, len, arg);
}
len = Mmsg(msg, _(" SDSocket closed.\n"));
sendit(msg, len, arg);
}
- free_jcr(njcr);
}
+ endeach_jcr(njcr);
+
Dmsg0(1000, "Begin status jcr loop.\n");
if (!found) {
len = Mmsg(msg, _("No Jobs running.\n"));
}
switch (je->JobStatus) {
case JS_Created:
- termstat = "Created";
+ termstat = _("Created");
break;
case JS_FatalError:
case JS_ErrorTerminated:
- termstat = "Error";
+ termstat = _("Error");
break;
case JS_Differences:
- termstat = "Diffs";
+ termstat = _("Diffs");
break;
case JS_Canceled:
- termstat = "Cancel";
+ termstat = _("Cancel");
break;
case JS_Terminated:
- termstat = "OK";
+ termstat = _("OK");
break;
default:
- termstat = "Other";
+ termstat = _("Other");
break;
}
bstrncpy(JobName, je->Job, sizeof(JobName));
dt, JobName);
sendit(buf, strlen(buf), arg);
}
- sendit("====\n", 5, arg);
+ sendit(_("====\n"), 5, arg);
unlock_last_jobs_list();
}
if (sscanf(dir->msg, qstatus, time) != 1) {
pm_strcpy(&jcr->errmsg, dir->msg);
Jmsg1(jcr, M_FATAL, 0, _("Bad .status command: %s\n"), jcr->errmsg);
- bnet_fsend(dir, "2900 Bad .status command, missing argument.\n");
+ bnet_fsend(dir, _("2900 Bad .status command, missing argument.\n"));
bnet_sig(dir, BNET_EOD);
free_memory(time);
return 0;
if (njcr->JobId != 0) {
bnet_fsend(dir, DotStatusJob, njcr->JobId, njcr->JobStatus, njcr->JobErrors);
}
- free_jcr(njcr);
}
- }
- else if (strcmp(time, "last") == 0) {
+ endeach_jcr(njcr);
+ } else if (strcmp(time, "last") == 0) {
bnet_fsend(dir, OKqstatus, time);
if ((last_jobs) && (last_jobs->size() > 0)) {
job = (s_last_job*)last_jobs->last();
bnet_fsend(dir, DotStatusJob, job->JobId, job->JobStatus, job->Errors);
}
- }
- else {
+ } else {
pm_strcpy(&jcr->errmsg, dir->msg);
Jmsg1(jcr, M_FATAL, 0, _("Bad .status command: %s\n"), jcr->errmsg);
- bnet_fsend(dir, "2900 Bad .status command, wrong argument.\n");
+ bnet_fsend(dir, _("2900 Bad .status command, wrong argument.\n"));
bnet_sig(dir, BNET_EOD);
free_memory(time);
return 0;
if (njcr->JobId != 0) {
stat = JS_Running;
termstat = _("Bacula Running");
- free_jcr(njcr);
break;
}
- free_jcr(njcr);
}
+ endeach_jcr(njcr);
+
if (stat != 0) {
goto done;
}
projects / bacula / bacula / blobdiff