Windows tweaks

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

diff --git a/bacula/src/filed/status.c b/bacula/src/filed/status.c
index a245511e66e2945ced4efc7b927f66c31238baa8..6bc287862b521818e094979e0bf11658cd94ed39 100755 (executable)
--- a/bacula/src/filed/status.c
+++ b/bacula/src/filed/status.c
@@ -7,7 +7,7 @@
  *
  */
 /*
-   Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker
+   Copyright (C) 2000-2003 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
@@ -46,7 +46,7 @@ static void do_status(void sendit(char *msg, int len, void *sarg), void *arg)
 
    msg = (char *)get_pool_memory(PM_MESSAGE);
    found = 0;
-   len = Mmsg(&msg, "%s Version: " VERSION " (" DATE ")\n", my_name);
+   len = Mmsg(&msg, "%s Version: " VERSION " (" BDATE ")\n", my_name);
    sendit(msg, len, arg);
    bstrftime(dt, sizeof(dt), daemon_start_time);
    len = Mmsg(&msg, _("Daemon started %s, %d Job%s run.\n"), dt, last_job.NumJobs,
@@ -72,9 +72,11 @@ static void do_status(void sendit(char *msg, int len, void *sarg), void *arg)
       if (njcr->JobId == 0) {
          len = Mmsg(&msg, _("Director connected at: %s\n"), dt);
       } else {
-         len = Mmsg(&msg, _("JobId %d Job %s is running.\n    %s %s started: %s\n"), 
-            job_type_to_str(njcr->JobType), job_level_to_str(njcr->JobLevel),
-            njcr->JobId, njcr->Job, dt);
+         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);
       }
       sendit(msg, len, arg);
       if (njcr->JobId == 0) {
@@ -95,7 +97,9 @@ static void do_status(void sendit(char *msg, int len, void *sarg), void *arg)
           edit_uint64_with_commas(njcr->num_files_examined, b1));
       sendit(msg, len, arg);
       if (njcr->JobFiles > 0) {
+        P(njcr->mutex);
          len = Mmsg(&msg, _("    Processing file: %s\n"), njcr->last_fname);
+        V(njcr->mutex);
         sendit(msg, len, arg);
       }
 
@@ -141,7 +145,7 @@ int status_cmd(JCR *jcr)
    do_status(sendit, (void *)user);
    bnet_fsend(user, "====\n");
 
-   bnet_sig(user, BNET_EOF);
+   bnet_sig(user, BNET_EOD);
    return 1;
 }