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 ffc431dade5e24a69bc940f56783649357f7900f..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,6 +63,7 @@ char catalog_db[] = "SQLite";
 char catalog_db[] = "Internal";
 #endif
 #endif
+#endif
 
 char *host_os = HOST_OS;
 char *distname = DISTNAME;
@@ -473,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:
@@ -632,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);
@@ -647,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;
@@ -666,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;
                   }
@@ -679,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;
                   }
@@ -740,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;
        }
@@ -784,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;
     }
@@ -826,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;
        }
@@ -872,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);
@@ -911,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);
     }
 }
 
@@ -969,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;
     }
 
@@ -1005,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);
     }
 }
 
@@ -1064,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;