Add const for Solaris' C++ compiler

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

diff --git a/bacula/src/filed/status.c b/bacula/src/filed/status.c
index ff6f835354fda5a7eee447589d441ac5fa13ed43..4b668191a4b4abe46acf9f5adf6800aea8823b71 100755 (executable)
--- a/bacula/src/filed/status.c
+++ b/bacula/src/filed/status.c
@@ -34,19 +34,19 @@ extern struct s_last_job last_job;
 extern time_t daemon_start_time;
 
 /* Forward referenced functions */
-static void list_terminated_jobs(void *arg);
-static void sendit(char *msg, int len, void *arg);
+static void  list_terminated_jobs(void sendit(const char *msg, int len, void *sarg), void *arg);
+static void bsock_sendit(const char *msg, int len, void *arg);
 static char *level_to_str(int level);
 
 
-#ifdef HAVE_CYGWIN
+#if defined(HAVE_CYGWIN) || defined(HAVE_WIN32)
 static int privs = 0;
 #endif
 
 /*
  * General status generator
  */
-static void do_status(void sendit(char *msg, int len, void *sarg), void *arg) 
+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];
@@ -59,12 +59,11 @@ static void do_status(void sendit(char *msg, int len, void *sarg), void *arg)
    len = Mmsg(&msg, "%s Version: " VERSION " (" BDATE ") %s %s %s\n", my_name,
              HOST_OS, DISTNAME, DISTVER);
    sendit(msg, len, arg);
-   bstrftime(dt, sizeof(dt), daemon_start_time);
-   strcpy(dt+7, dt+9);               /* cut century */
+   bstrftime_nc(dt, sizeof(dt), daemon_start_time);
    len = Mmsg(&msg, _("Daemon started %s, %d Job%s run.\n"), dt, last_job.NumJobs,
         last_job.NumJobs == 1 ? "" : "s");
    sendit(msg, len, arg);
-#ifdef HAVE_CYGWIN
+#if defined(HAVE_CYGWIN) || defined(HAVE_WIN32)
    if (debug_level > 0) {
       if (!privs) {
         privs = enable_backup_privileges(NULL, 1);
@@ -82,15 +81,14 @@ static void do_status(void sendit(char *msg, int len, void *sarg), void *arg)
    }
 #endif
 
-   list_terminated_jobs(arg);
+   list_terminated_jobs(sendit, arg);
 
 #ifdef xxx
       char termstat[30];
       struct s_last_job *je;
       lock_last_jobs_list();
       for (je=NULL; (je=(s_last_job *)last_jobs->next(je)); ) {
-        bstrftime(dt, sizeof(dt), je->end_time);
-        strcpy(dt+7, dt+9);            /* cut century */
+        bstrftime_nc(dt, sizeof(dt), je->end_time);
          len = Mmsg(&msg, _("Last Job %s finished at %s\n"), je->Job, dt);
         sendit(msg, len, arg);
 
@@ -110,8 +108,7 @@ static void do_status(void sendit(char *msg, int len, void *sarg), void *arg)
    Dmsg0(200, "Begin status jcr loop.\n");
    lock_jcr_chain();
    for (njcr=NULL; (njcr=get_next_jcr(njcr)); ) {
-      bstrftime(dt, sizeof(dt), njcr->start_time);
-      strcpy(dt+7, dt+9);            /* cut century */
+      bstrftime_nc(dt, sizeof(dt), njcr->start_time);
       if (njcr->JobId == 0) {
          len = Mmsg(&msg, _("Director connected at: %s\n"), dt);
       } else {
@@ -166,12 +163,12 @@ static void do_status(void sendit(char *msg, int len, void *sarg), void *arg)
    free_pool_memory(msg);
 }
 
-static void list_terminated_jobs(void *arg)
+static void  list_terminated_jobs(void sendit(const char *msg, int len, void *sarg), void *arg) 
 {
    char dt[MAX_TIME_LENGTH], b1[30], b2[30];
    char level[10];
    struct s_last_job *je;
-   char *msg;
+   const char *msg;
 
    if (last_job.NumJobs == 0) {
       msg = _("No Terminated Jobs.\n"); 
@@ -179,7 +176,8 @@ static void list_terminated_jobs(void *arg)
       return;
    }
    lock_last_jobs_list();
-   msg =  _("\nTerminated Jobs:\n"); 
+   sendit("\n", 1, arg);               /* send separately */
+   msg =  _("Terminated Jobs:\n"); 
    sendit(msg, strlen(msg), arg);
    msg =  _(" JobId  Level   Files          Bytes Status   Finished        Name \n");
    sendit(msg, strlen(msg), arg);
@@ -190,8 +188,7 @@ static void list_terminated_jobs(void *arg)
       char *termstat;
       char buf[1000];
 
-      bstrftime(dt, sizeof(dt), je->end_time);
-      strcpy(dt+7, dt+9);     /* cut century */
+      bstrftime_nc(dt, sizeof(dt), je->end_time);
       switch (je->JobType) {
       case JT_ADMIN:
       case JT_RESTORE:
@@ -246,12 +243,13 @@ static void list_terminated_jobs(void *arg)
 
 
 /*
- * Send to Director 
+ * Send to bsock (Director or Console)
  */
-static void sendit(char *msg, int len, void *arg)
+static void bsock_sendit(const char *msg, int len, void *arg)
 {
    BSOCK *user = (BSOCK *)arg;
 
+   user->msg = check_pool_memory_size(user->msg, len+1);
    memcpy(user->msg, msg, len+1);
    user->msglen = len+1;
    bnet_send(user);
@@ -265,7 +263,7 @@ int status_cmd(JCR *jcr)
    BSOCK *user = jcr->dir_bsock;
 
    bnet_fsend(user, "\n");
-   do_status(sendit, (void *)user);
+   do_status(bsock_sendit, (void *)user);
    bnet_fsend(user, "====\n");
 
    bnet_sig(user, BNET_EOD);
@@ -321,7 +319,7 @@ static char *level_to_str(int level)
 }
 
 
-#ifdef HAVE_CYGWIN
+#if defined(HAVE_CYGWIN) || defined(HAVE_WIN32)
 #include <windows.h>
 
 static char buf[100];
@@ -335,12 +333,17 @@ struct s_win32_arg {
 /*
  * Put message in Window List Box
  */
-static void win32_sendit(char *msg, int len, void *marg)
+static void win32_sendit(const char *msg, int len, void *marg)
 {
    struct s_win32_arg *arg = (struct s_win32_arg *)marg;
 
-   if (len > 0) {
-      msg[len-1] = 0;                /* eliminate newline */
+   if (len > 0 && msg[len-1] == '\n') {
+       // when compiling with visual studio some strings are read-only 
+       // and cause access violations. So we creat a tmp copy.
+       char *_msg = (char *)alloca(len);
+       strncpy(_msg, msg, len-1);
+       _msg[len-1] = 0;
+       msg = _msg;
    }
    SendDlgItemMessage(arg->hwnd, arg->idlist, LB_ADDSTRING, 0, (LONG)msg);
    
@@ -367,12 +370,16 @@ char *bac_status(int stat)
    bacstat = 0;
    if (last_job.NumJobs > 0) {
       switch (last_job.JobStatus) {
-       case JS_ErrorTerminated:
-           bacstat = -1;
-            termstat = _("Last Job Erred");
-           break;
-       default:
-           break;
+      case JS_Canceled:
+        bacstat = -1;
+         termstat = _("Last Job Canceled");
+        break;
+      case JS_ErrorTerminated:
+        bacstat = -1;
+         termstat = _("Last Job Failed");
+        break;
+      default:
+        break;
       }
    }
    Dmsg0(200, "Begin bac_status jcr loop.\n");
@@ -388,7 +395,7 @@ char *bac_status(int stat)
    }
    unlock_jcr_chain();
    Dmsg0(200, "End bac_status jcr loop.\n");
-   strcpy(buf, termstat);
+   bstrncpy(buf, termstat, sizeof(buf));
    return buf;
 }