Use the command line utility dropdb instead of the psql command

[bacula/bacula] / bacula / src / lib / message.c

diff --git a/bacula/src/lib/message.c b/bacula/src/lib/message.c
index 3ceb90402205e0d65507dc24bc12a3803bd51bb8..0993165bcca5c8939f676e5da2419ab261820a88 100755 (executable)
--- a/bacula/src/lib/message.c
+++ b/bacula/src/lib/message.c
@@ -51,6 +51,9 @@ FILE *con_fd = NULL;                /* Console file descriptor */
 brwlock_t con_lock;                  /* Console lock structure */
 FILE *trace_fd = NULL;
 
+#ifdef HAVE_POSTGRESQL
+char catalog_db[] = "PostgreSQL";
+#else
 #ifdef HAVE_MYSQL
 char catalog_db[] = "MySQL";
 #else 
@@ -60,7 +63,11 @@ char catalog_db[] = "SQLite";
 char catalog_db[] = "Internal";
 #endif
 #endif
+#endif
 
+char *host_os = HOST_OS;
+char *distname = DISTNAME;
+char *distver = DISTVER;
 
 /* Forward referenced functions */
 
@@ -155,12 +162,33 @@ void
 init_msg(JCR *jcr, MSGS *msg)
 {
    DEST *d, *dnew, *temp_chain = NULL;
+   int i, fd;
+
+   if (jcr == NULL && msg == NULL) {
+      init_last_jobs_list();
+   }
+
+   /*
+    * Make sure we have fd's 0, 1, 2 open
+    *  If we don't do this one of our sockets may open
+    *  there and if we then use stdout, it could
+    *  send total garbage to our socket.
+    *
+    */
+   fd = open("/dev/null", O_RDONLY, 0644);
+   if (fd > 2) {
+      close(fd);
+   } else {
+      for(i=1; fd + i <= 2; i++) {
+        dup2(fd, fd+i);
+      }
+   }
+
 
    /*
     * If msg is NULL, initialize global chain for STDOUT and syslog
     */
    if (msg == NULL) {
-      int i;
       daemon_msgs = (MSGS *)malloc(sizeof(MSGS));
       memset(daemon_msgs, 0, sizeof(MSGS));
       for (i=1; i<=M_MAX; i++) {
@@ -420,7 +448,7 @@ void close_msg(JCR *jcr)
            }
            
            if (!(bpipe=open_mail_pipe(jcr, &cmd, d))) {
-               Dmsg0(000, "open mail pipe failed.\n");
+               Pmsg0(000, "open mail pipe failed.\n");
               goto rem_temp_file;
            }
             Dmsg0(150, "Opened mail pipe\n");
@@ -431,7 +459,7 @@ void close_msg(JCR *jcr)
               fputs(line, bpipe->wfd);
            }
            if (!close_wpipe(bpipe)) {       /* close write pipe sending mail */
-               Dmsg1(000, "close error: ERR=%s\n", strerror(errno));
+               Pmsg1(000, "close error: ERR=%s\n", strerror(errno));
            }
 
            /*
@@ -449,8 +477,9 @@ void close_msg(JCR *jcr)
            stat = close_bpipe(bpipe);
            if (stat != 0 && msgs != daemon_msgs) {
                Dmsg1(150, "Calling emsg. CMD=%s\n", cmd);
-               Jmsg2(jcr, M_ERROR, 0, _("Mail program terminated in error. stat=%d\n"
-                                        "CMD=%s\n"), stat, cmd);
+               Jmsg3(jcr, M_ERROR, 0, _("Mail program terminated in error. stat=%d\n"
+                                        "CMD=%s\n"
+                                        "ERR=%s\n"), stat, cmd, strerror(stat));
            }
            free_memory(line);
 rem_temp_file:
@@ -531,6 +560,7 @@ void term_msg()
       fclose(trace_fd);
       trace_fd = NULL;
    }
+   term_last_jobs_list();
 }
 
 
@@ -607,8 +637,9 @@ void dispatch_message(JCR *jcr, int type, int level, char *msg)
                   /* Messages to the operator go one at a time */
                   stat = close_bpipe(bpipe);
                   if (stat != 0) {
-                      Emsg1(M_ERROR, 0, _("Operator mail program terminated in error.\nCMD=%s\n"),
-                        mcmd);
+                      Jmsg2(jcr, M_ERROR, 0, _("Operator mail program terminated in error.\n"
+                            "CMD=%s\n"
+                            "ERR=%s\n"), mcmd, strerror(stat));
                   }
                }
                free_pool_memory(mcmd);
@@ -622,7 +653,7 @@ void dispatch_message(JCR *jcr, int type, int level, char *msg)
                    d->fd = fopen(mp_chr(name), "w+");
                   if (!d->fd) {
                      d->fd = stdout;
-                      Emsg2(M_ERROR, 0, "fopen %s failed: ERR=%s\n", name, strerror(errno));
+                      Jmsg2(jcr, M_ERROR, 0, "fopen %s failed: ERR=%s\n", name, strerror(errno));
                      d->fd = NULL;
                      free_pool_memory(name);
                      break;
@@ -641,7 +672,7 @@ void dispatch_message(JCR *jcr, int type, int level, char *msg)
                    d->fd = fopen(d->where, "w+");
                   if (!d->fd) {
                      d->fd = stdout;
-                      Emsg2(M_ERROR, 0, "fopen %s failed: ERR=%s\n", d->where, strerror(errno));
+                      Jmsg2(jcr, M_ERROR, 0, "fopen %s failed: ERR=%s\n", d->where, strerror(errno));
                      d->fd = NULL;
                      break;
                   }
@@ -654,7 +685,7 @@ void dispatch_message(JCR *jcr, int type, int level, char *msg)
                    d->fd = fopen(d->where, "a");
                   if (!d->fd) {
                      d->fd = stdout;
-                      Emsg2(M_ERROR, 0, "fopen %s failed: ERR=%s\n", d->where, strerror(errno));
+                      Jmsg2(jcr, M_ERROR, 0, "fopen %s failed: ERR=%s\n", d->where, strerror(errno));
                      d->fd = NULL;
                      break;
                   }
@@ -664,11 +695,8 @@ void dispatch_message(JCR *jcr, int type, int level, char *msg)
             case MD_DIRECTOR:
                 Dmsg1(800, "DIRECTOR for following msg: %s", msg);
                if (jcr && jcr->dir_bsock && !jcr->dir_bsock->errors) {
-
-                  jcr->dir_bsock->msglen = Mmsg(&(jcr->dir_bsock->msg),
-                        "Jmsg Job=%s type=%d level=%d %s", jcr->Job,
-                        type, level, msg) + 1;
-                  bnet_send(jcr->dir_bsock);
+                   bnet_fsend(jcr->dir_bsock, "Jmsg Job=%s type=%d level=%d %s", 
+                     jcr->Job, type, level, msg);
                }
                break;
             case MD_STDOUT:
@@ -718,14 +746,14 @@ d_msg(char *file, int line, int level, char *fmt,...)
           bsnprintf(buf, sizeof(buf), "%s/bacula.trace", working_directory);
           trace_fd = fopen(buf, "a+");
          if (!trace_fd) {
-             Emsg2(M_ABORT, 0, _("Cannot open %s: ERR=%s\n"),
+             Emsg2(M_ABORT, 0, _("Cannot open trace file \"%s\": ERR=%s\n"),
                  buf, strerror(errno));
          }
        }
 #endif
 #ifdef FULL_LOCATION
        if (details) {
-          len = sprintf(buf, "%s: %s:%d ", my_name, file, line);
+          len = bsnprintf(buf, sizeof(buf), "%s: %s:%d ", my_name, file, line);
        } else {
          len = 0;
        }
@@ -762,7 +790,7 @@ p_msg(char *file, int line, int level, char *fmt,...)
 
 #ifdef FULL_LOCATION
     if (level >= 0) {
-       len = sprintf(buf, "%s: %s:%d ", my_name, file, line);
+       len = bsnprintf(buf, sizeof(buf), "%s: %s:%d ", my_name, file, line);
     } else {
        len = 0;
     }
@@ -804,14 +832,14 @@ t_msg(char *file, int line, int level, char *fmt,...)
           bsnprintf(buf, sizeof(buf), "%s/bacula.trace", working_directory);
           trace_fd = fopen(buf, "a+");
          if (!trace_fd) {
-             Emsg2(M_ABORT, 0, _("Cannot open %s: ERR=%s\n"),
+             Emsg2(M_ABORT, 0, _("Cannot open trace file \"%s\": ERR=%s\n"),
                  buf, strerror(errno));
          }
        }
     
 #ifdef FULL_LOCATION
        if (details) {
-          len = sprintf(buf, "%s: %s:%d ", my_name, file, line);
+          len = bsnprintf(buf, sizeof(buf), "%s: %s:%d ", my_name, file, line);
        } else {
          len = 0;
        }
@@ -850,32 +878,32 @@ e_msg(char *file, int line, int type, int level, char *fmt,...)
        return;                       /* no destination */
     }
     switch (type) {
-       case M_ABORT:
-          len = sprintf(buf, "%s: ABORTING due to ERROR in %s:%d\n", 
-                 my_name, file, line);
-         break;
-       case M_ERROR_TERM:
-          len = sprintf(buf, "%s: ERROR TERMINATION at %s:%d\n", 
-                 my_name, file, line);
-         break;
-       case M_FATAL:
-         if (level == -1)            /* skip details */
-             len = sprintf(buf, "%s: Fatal Error because: ", my_name);
-         else
-             len = sprintf(buf, "%s: Fatal Error at %s:%d because:\n", my_name, file, line);
-         break;
-       case M_ERROR:
-         if (level == -1)            /* skip details */
-             len = sprintf(buf, "%s: Error: ", my_name);
-         else
-             len = sprintf(buf, "%s: Error in %s:%d ", my_name, file, line);
-         break;
-       case M_WARNING:
-          len = sprintf(buf, "%s: Warning: ", my_name);
-         break;
-       default:
-          len = sprintf(buf, "%s: ", my_name);
-         break;
+    case M_ABORT:
+       len = bsnprintf(buf, sizeof(buf), "%s: ABORTING due to ERROR in %s:%d\n", 
+              my_name, file, line);
+       break;
+    case M_ERROR_TERM:
+       len = bsnprintf(buf, sizeof(buf), "%s: ERROR TERMINATION at %s:%d\n", 
+              my_name, file, line);
+       break;
+    case M_FATAL:
+       if (level == -1)           /* skip details */
+          len = bsnprintf(buf, sizeof(buf), "%s: Fatal Error because: ", my_name);
+       else
+          len = bsnprintf(buf, sizeof(buf), "%s: Fatal Error at %s:%d because:\n", my_name, file, line);
+       break;
+    case M_ERROR:
+       if (level == -1)           /* skip details */
+          len = bsnprintf(buf, sizeof(buf), "%s: Error: ", my_name);
+       else
+          len = bsnprintf(buf, sizeof(buf), "%s: Error in %s:%d ", my_name, file, line);
+       break;
+    case M_WARNING:
+       len = bsnprintf(buf, sizeof(buf), "%s: Warning: ", my_name);
+       break;
+    default:
+       len = bsnprintf(buf, sizeof(buf), "%s: ", my_name);
+       break;
     }
 
     va_start(arg_ptr, fmt);
@@ -889,7 +917,7 @@ e_msg(char *file, int line, int type, int level, char *fmt,...)
        p[0] = 0;                     /* generate segmentation violation */
     }
     if (type == M_ERROR_TERM) {
-       _exit(1);
+       exit(1);
     }
 }
 
@@ -947,28 +975,28 @@ Jmsg(JCR *jcr, int type, int level, char *fmt,...)
     }
     switch (type) {
     case M_ABORT:
-       len = sprintf(rbuf, "%s ABORTING due to ERROR\n", my_name);
+       len = bsnprintf(rbuf, sizeof(rbuf), "%s ABORTING due to ERROR\n", my_name);
        break;
     case M_ERROR_TERM:
-       len = sprintf(rbuf, "%s ERROR TERMINATION\n", my_name);
+       len = bsnprintf(rbuf, sizeof(rbuf), "%s ERROR TERMINATION\n", my_name);
        break;
     case M_FATAL:
-       len = sprintf(rbuf, "%s: %s Fatal error: ", my_name, job);
+       len = bsnprintf(rbuf, sizeof(rbuf), "%s: %s Fatal error: ", my_name, job);
        if (jcr) {
          set_jcr_job_status(jcr, JS_FatalError);
        }
        break;
     case M_ERROR:
-       len = sprintf(rbuf, "%s: %s Error: ", my_name, job);
+       len = bsnprintf(rbuf, sizeof(rbuf), "%s: %s Error: ", my_name, job);
        if (jcr) {
          jcr->Errors++;
        }
        break;
     case M_WARNING:
-       len = sprintf(rbuf, "%s: %s Warning: ", my_name, job);
+       len = bsnprintf(rbuf, sizeof(rbuf), "%s: %s Warning: ", my_name, job);
        break;
     default:
-       len = sprintf(rbuf, "%s: ", my_name);
+       len = bsnprintf(rbuf, sizeof(rbuf), "%s: ", my_name);
        break;
     }
 
@@ -983,7 +1011,7 @@ Jmsg(JCR *jcr, int type, int level, char *fmt,...)
        p[0] = 0;                     /* generate segmentation violation */
     }
     if (type == M_ERROR_TERM) {
-       _exit(1);
+       exit(1);
     }
 }
 
@@ -1003,7 +1031,7 @@ again:
    len = bvsnprintf(*pool_buf+i, maxlen, fmt, arg_ptr);
    va_end(arg_ptr);
    if (len < 0 || len >= maxlen) {
-      *pool_buf = realloc_pool_memory(*pool_buf, maxlen + i + 200);
+      *pool_buf = realloc_pool_memory(*pool_buf, maxlen + i + maxlen/2);
       goto again;
    }
    return len;
@@ -1024,7 +1052,7 @@ again:
    len = bvsnprintf(*pool_buf, maxlen, fmt, arg_ptr);
    va_end(arg_ptr);
    if (len < 0 || len >= maxlen) {
-      *pool_buf = realloc_pool_memory(*pool_buf, maxlen + 200);
+      *pool_buf = realloc_pool_memory(*pool_buf, maxlen + maxlen/2);
       goto again;
    }
    return len;
@@ -1042,7 +1070,7 @@ void j_msg(char *file, int line, JCR *jcr, int type, int level, char *fmt,...)
    POOLMEM *pool_buf;
 
    pool_buf = get_pool_memory(PM_EMSG);
-   i = sprintf(pool_buf, "%s:%d ", file, line);
+   i = Mmsg(&pool_buf, "%s:%d ", file, line);
 
 again:
    maxlen = sizeof_pool_memory(pool_buf) - i - 1; 
@@ -1050,7 +1078,7 @@ again:
    len = bvsnprintf(pool_buf+i, maxlen, fmt, arg_ptr);
    va_end(arg_ptr);
    if (len < 0 || len >= maxlen) {
-      pool_buf = realloc_pool_memory(pool_buf, maxlen + i + 200);
+      pool_buf = realloc_pool_memory(pool_buf, maxlen + i + maxlen/2);
       goto again;
    }