Added wx-console.exe and .conf.

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

diff --git a/bacula/src/filed/status.c b/bacula/src/filed/status.c
index b588282485342ede313694685c5cb3c0b255fa16..5393df16a1f0916bd72458111ea2943dcdf6e883 100755 (executable)
--- a/bacula/src/filed/status.c
+++ b/bacula/src/filed/status.c
@@ -87,6 +87,8 @@ static void do_status(void sendit(const char *msg, int len, void *sarg), void *a
     * List running jobs  
     */
    Dmsg0(1000, "Begin status jcr loop.\n");
+   len = Mmsg(&msg, _("Running Jobs:\n"));
+   sendit(msg, len, arg);
    lock_jcr_chain();
    foreach_jcr(njcr) {
       bstrftime_nc(dt, sizeof(dt), njcr->start_time);
@@ -138,9 +140,11 @@ static void do_status(void sendit(const char *msg, int len, void *sarg), void *a
    unlock_jcr_chain();
    Dmsg0(1000, "Begin status jcr loop.\n");
    if (!found) {
-      len = Mmsg(&msg, _("No jobs running.\n"));
+      len = Mmsg(&msg, _("No Jobs running.\n"));
       sendit(msg, len, arg);
    }
+   len = Mmsg(&msg, _("====\n"));
+   sendit(msg, len, arg);
    free_pool_memory(msg);
 }
 
@@ -218,7 +222,7 @@ static void  list_terminated_jobs(void sendit(const char *msg, int len, void *sa
         dt, JobName);
       sendit(buf, strlen(buf), arg);
    }
-   sendit("\n", 1, arg);
+   sendit("====\n", 5, arg);
    unlock_last_jobs_list();
 }
 
@@ -245,7 +249,6 @@ int status_cmd(JCR *jcr)
 
    bnet_fsend(user, "\n");
    do_status(bsock_sendit, (void *)user);
-   bnet_fsend(user, "====\n");
 
    bnet_sig(user, BNET_EOD);
    return 1;
@@ -350,6 +353,9 @@ char *bac_status(int stat)
    struct s_last_job *job;
 
    bacstat = 0;
+   if (!last_jobs) {
+      return _("Bacula Terminated");
+   }
    if (last_jobs->size() > 0) {
       job = (struct s_last_job *)last_jobs->first();
       switch (job->JobStatus) {