From: Kern Sibbald <kern@sibbald.com>
Date: Sun, 26 Oct 2003 15:08:31 +0000 (+0000)
Subject: Fix truncated status msg, scroll only on writing text in Gnome2 console
X-Git-Tag: Release-7.0.0~9930
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=513524e2dbf50e9d0e3ec4176e265f866b52a501;p=bacula%2Fbacula

Fix truncated status msg, scroll only on writing text in Gnome2 console


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@787 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/ChangeLog b/bacula/ChangeLog
index 5223b9be36..98bb658ab8 100644
--- a/bacula/ChangeLog
+++ b/bacula/ChangeLog
@@ -1,5 +1,12 @@
 
-2003-10-24 Version 1.32c 26Oct03 Beta
+2003-10-26 Version 1.32c 26Oct03
+26Oct03
+- More doc fixes.
+- Make message buffer longer for a status message that was    
+  truncated.        
+- Put termination on varargs calls in gnome2-console.
+- Scroll only if text sent and not for status update.
+- Add all possible Status codes the jobstatus_to_ascii()
 25Oct03
 - Add new spec file and cats patch from Scott.
 - Optimize tree.c a bit -- turn off debug code, keep node fname
diff --git a/bacula/src/dird/inc_conf.c b/bacula/src/dird/inc_conf.c
index 1e9c69c694..2f22866902 100644
--- a/bacula/src/dird/inc_conf.c
+++ b/bacula/src/dird/inc_conf.c
@@ -293,24 +293,24 @@ void store_inc(LEX *lc, struct res_items *item, int index, int pass)
        */
       while ((token = lex_get_token(lc, T_ALL)) != T_EOB) {
 	 switch (token) {
-	    case T_COMMA:
-	    case T_EOL:
-	       continue;
-
-	    case T_IDENTIFIER:
-	    case T_UNQUOTED_STRING:
-	    case T_QUOTED_STRING:
-	       if (res_all.res_fs.have_MD5) {
-		  MD5Update(&res_all.res_fs.md5c, (unsigned char *)lc->str, lc->str_len);
-	       }
-	       if (incexe->name_list.size() == 0) {
-		  incexe->name_list.init(10, true);
-	       }
-	       incexe->name_list.append(bstrdup(lc->str));
-               Dmsg1(200, "Add to name_list %s\n", lc->str);
-	       break;
-	    default:
-               scan_err1(lc, "Expected a filename, got: %s", lc->str);
+	 case T_COMMA:
+	 case T_EOL:
+	    continue;
+
+	 case T_IDENTIFIER:
+	 case T_UNQUOTED_STRING:
+	 case T_QUOTED_STRING:
+	    if (res_all.res_fs.have_MD5) {
+	       MD5Update(&res_all.res_fs.md5c, (unsigned char *)lc->str, lc->str_len);
+	    }
+	    if (incexe->name_list.size() == 0) {
+	       incexe->name_list.init(10, true);
+	    }
+	    incexe->name_list.append(bstrdup(lc->str));
+            Dmsg1(200, "Add to name_list %s\n", lc->str);
+	    break;
+	 default:
+            scan_err1(lc, "Expected a filename, got: %s", lc->str);
 	 }				   
       }
       /* Note, MD5Final is done in backup.c */
diff --git a/bacula/src/dird/ua_status.c b/bacula/src/dird/ua_status.c
index 53942dae9b..9a041a5ab7 100644
--- a/bacula/src/dird/ua_status.c
+++ b/bacula/src/dird/ua_status.c
@@ -202,7 +202,7 @@ static void do_director_status(UAContext *ua, char *cmd)
    bsendmsg(ua, _("Daemon started %s, %d Job%s run.\n"), dt, last_job.NumJobs,
         last_job.NumJobs == 1 ? "" : "s");
    if (last_job.NumJobs > 0) {
-      char termstat[30];
+      char termstat[50];
 
       bstrftime(dt, sizeof(dt), last_job.end_time);
       bsendmsg(ua, _("Last Job %s finished at %s\n"), last_job.Job, dt);
diff --git a/bacula/src/lib/util.c b/bacula/src/lib/util.c
index 30c5a39cd1..69341ecc19 100644
--- a/bacula/src/lib/util.c
+++ b/bacula/src/lib/util.c
@@ -145,36 +145,76 @@ int pm_strcpy(POOLMEM **pm, char *str)
  */
 void jobstatus_to_ascii(int JobStatus, char *msg, int maxlen)
 {
-   char *termstat;
+   char *jobstat;
    char buf[100];
 
    switch (JobStatus) {
-      case JS_Terminated:
-         termstat = _("OK");
-	 break;
-     case JS_FatalError:
-     case JS_ErrorTerminated:
-         termstat = _("Error");
-	 break;
-     case JS_Error:
-         termstat = _("Non-fatal error");
-	 break;
-     case JS_Canceled:
-         termstat = _("Canceled");
-	 break;
-     case JS_Differences:
-         termstat = _("Verify differences");
-	 break;
-     default:
-	 if (JobStatus == 0) {
-	    buf[0] = 0;
-	 } else {
-            bsnprintf(buf, sizeof(buf), _("Unknown Job termination status=%d"), JobStatus);
-	 }
-	 termstat = buf;
-	 break;
+   case JS_Created:
+      jobstat = _("Created");
+      break;
+   case JS_Running:
+      jobstat = _("Running");
+      break;
+   case JS_Blocked:
+      jobstat = _("Blocked");
+      break;
+   case JS_Terminated:
+      jobstat = _("OK");
+      break;
+   case JS_FatalError:
+   case JS_ErrorTerminated:
+      jobstat = _("Error");
+      break;
+   case JS_Error:
+      jobstat = _("Non-fatal error");
+      break;
+   case JS_Canceled:
+      jobstat = _("Canceled");
+      break;
+   case JS_Differences:
+      jobstat = _("Verify differences");
+      break;
+   case JS_WaitFD:
+      jobstat = _("Waiting on FD");
+      break;
+   case JS_WaitSD:
+      jobstat = _("Wait on SD");
+      break;
+   case JS_WaitMedia:
+      jobstat = _("Wait for new Volume");
+      break;
+   case JS_WaitMount:
+      jobstat = _("Waiting for mount");
+      break;
+   case JS_WaitStoreRes:
+      jobstat = _("Waiting for Storage resource");
+      break;
+   case JS_WaitJobRes:
+      jobstat = _("Waiting for Job resource");
+      break;
+   case JS_WaitClientRes:
+      jobstat = _("Waiting for Client resource");
+      break;
+   case JS_WaitMaxJobs:
+      jobstat = _("Waiting on Max Jobs");
+      break;
+   case JS_WaitStartTime:
+      jobstat = _("Waiting for Start Time");
+      break;
+   case JS_WaitPriority:
+      jobstat = _("Waiting on Priority");
+      break;
+
+   default:
+      if (JobStatus == 0) {
+	 buf[0] = 0;
+      } else {
+         bsnprintf(buf, sizeof(buf), _("Unknown Job termination status=%d"), JobStatus);
+      }
+      jobstat = buf;
+      break;
    }
-   bstrncpy(msg, termstat, maxlen);
+   bstrncpy(msg, jobstat, maxlen);
 }
 
 /*