Tweak TRU64 xattr code.

[bacula/bacula] / bacula / src / filed / status.c

diff --git a/bacula/src/filed/status.c b/bacula/src/filed/status.c
index 7b646476e677342a33f563bedc1d410d00bb46fd..aa515c9552c51c2393cd000f94ebb42f6db07089 100644 (file)
--- a/bacula/src/filed/status.c
+++ b/bacula/src/filed/status.c
@@ -1,12 +1,12 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2001-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2001-2010 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
    This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version two of the GNU General Public
+   modify it under the terms of version three of the GNU Affero General Public
    License as published by the Free Software Foundation and included
    in the file LICENSE.
 
@@ -15,7 +15,7 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Affero General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
@@ -30,8 +30,6 @@
  *
  *    Kern Sibbald, August MMI
  *
- *   Version $Id$
- *
  */
 
 #include "bacula.h"
@@ -85,8 +83,8 @@ static void  list_status_header(STATUS_PKT *sp)
               my_name, VERSION, BDATE, VSS, HOST_OS, DISTNAME, DISTVER);
    sendit(msg.c_str(), len, sp);
    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");
+   len = Mmsg(msg, _("Daemon started %s. Jobs: run=%d running=%d.\n"),
+        dt, num_jobs_run, job_count());
    sendit(msg.c_str(), len, sp);
 #if defined(HAVE_WIN32)
    if (debug_level > 0) {
@@ -146,7 +144,7 @@ static void  list_status_header(STATUS_PKT *sp)
    if (debug_level > 0 && plugin_list->size() > 0) {
       Plugin *plugin;
       int len;
-      pm_strcpy(msg, "Plugin=");
+      pm_strcpy(msg, "Plugin: ");
       foreach_alist(plugin, plugin_list) {
          len = pm_strcat(msg, plugin->file);
          if (len > 80) {
@@ -191,8 +189,9 @@ static void  list_running_jobs(STATUS_PKT *sp)
          len = Mmsg(msg, _("JobId %d Job %s is running.\n"),
                     njcr->JobId, njcr->Job);
          sendit(msg.c_str(), len, sp);
-         len = Mmsg(msg, _("    %s%s Job started: %s\n"),
-                    vss, job_type_to_str(njcr->get_JobType()), dt);
+         len = Mmsg(msg, _("    %s%s %s Job started: %s\n"),
+                    vss, level_to_str(njcr->getJobLevel()), 
+                    job_type_to_str(njcr->getJobType()), dt);
       }
       sendit(msg.c_str(), len, sp);
       if (njcr->JobId == 0) {