Use dcr more in SD + int to bool conversions

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

diff --git a/bacula/src/filed/status.c b/bacula/src/filed/status.c
index 0c16b08460bd2ae1ff401b9e9d8cdf998e7de28b..bcb896db6aea26c40b4307a390a5f20b818b14e2 100755 (executable)
--- a/bacula/src/filed/status.c
+++ b/bacula/src/filed/status.c
@@ -7,7 +7,7 @@
  *
  */
 /*
-   Copyright (C) 2000-2003 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 as
@@ -49,7 +49,7 @@ static int privs = 0;
 static void do_status(void sendit(const char *msg, int len, void *sarg), void *arg) 
 {
    int sec, bps;
-   char *msg, b1[32], b2[32], b3[32];
+   char *msg, b1[32], b2[32], b3[32], b4[32];
    int found, len;
    JCR *njcr;
    char dt[MAX_TIME_LENGTH];
@@ -69,7 +69,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?"":"!",
@@ -80,6 +80,19 @@ static void do_status(void sendit(const char *msg, int len, void *sarg), void *a
       sendit(msg, len, arg);
    }
 #endif
+   if (debug_level > 0) {
+      len = Mmsg(&msg, _(" Heap: bytes=%s max_bytes=%s bufs=%s max_bufs=%s\n"),
+           edit_uint64_with_commas(sm_bytes, b1),
+           edit_uint64_with_commas(sm_max_bytes, b2),
+           edit_uint64_with_commas(sm_buffers, b3),
+           edit_uint64_with_commas(sm_max_buffers, b4));
+       sendit(msg, len, arg);
+    }
+   if (debug_level > 0) {
+      len = Mmsg(&msg, _(" Sizeof: off_t=%d size_t=%d\n"), sizeof(off_t),
+           sizeof(size_t));
+      sendit(msg, len, arg);
+   }
 
    list_terminated_jobs(sendit, arg);
 
@@ -377,11 +390,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;
       }
@@ -390,7 +404,7 @@ char *bac_status(char *buf, int buf_len)
 done:
    bacstat = stat;
    if (buf) {
-      bstrncpy(buf, termstat, sizeof(buf));
+      bstrncpy(buf, termstat, buf_len);
    }
    return buf;
 }