#endif
#endif
-char *host_os = HOST_OS;
-char *distname = DISTNAME;
-char *distver = DISTVER;
+const char *host_os = HOST_OS;
+const char *distname = DISTNAME;
+const char *distver = DISTVER;
/* Forward referenced functions */
* argv is NULL to avoid doing the path code twice.
*/
#define BTRACE_EXTRA 20
-void my_name_is(int argc, char *argv[], char *name)
+void my_name_is(int argc, char *argv[], const char *name)
{
char *l, *p, *q;
char cpath[400], npath[400];
l++;
} else {
l = argv[0];
-#ifdef HAVE_CYGWIN
+#if defined(HAVE_CYGWIN) || defined(HAVE_WIN32)
/* On Windows allow c: junk */
if (l[1] == ':') {
l += 2;
init_msg(JCR *jcr, MSGS *msg)
{
DEST *d, *dnew, *temp_chain = NULL;
- int i, fd;
+ int i;
if (jcr == NULL && msg == NULL) {
init_last_jobs_list();
}
+#ifndef HAVE_WIN32
/*
* Make sure we have fd's 0, 1, 2 open
* If we don't do this one of our sockets may open
* send total garbage to our socket.
*
*/
+ int fd;
fd = open("/dev/null", O_RDONLY, 0644);
if (fd > 2) {
close(fd);
}
}
-
+#endif
/*
* If msg is NULL, initialize global chain for STDOUT and syslog
*/
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:
/* 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);
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;
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;
}
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;
}
* are not printed.
*/
void
-d_msg(char *file, int line, int level, char *fmt,...)
+d_msg(const char *file, int line, int level, const char *fmt,...)
{
char buf[5000];
int len;
}
if (level <= debug_level) {
+#ifdef HAVE_WIN32
+#define SEND_DMSG_TO_FILE
+#endif
#ifdef SEND_DMSG_TO_FILE
if (!trace_fd) {
- bsnprintf(buf, sizeof(buf), "%s/bacula.trace", working_directory);
+ bsnprintf(buf, sizeof(buf), "%s/bacula.trace", working_directory ? working_directory : ".");
trace_fd = fopen(buf, "a+");
- if (!trace_fd) {
- Emsg2(M_ABORT, 0, _("Cannot open %s: ERR=%s\n"),
- buf, strerror(errno));
- }
}
#endif
#ifdef FULL_LOCATION
if (details) {
- len = sprintf(buf, "%s: %s:%d ", my_name, file, line);
+ /* visual studio passes the whole path to the file as well
+ * which makes for very long lines
+ */
+ char *f = strrchr(file, '\\');
+ if (f) file = f + 1;
+ len = bsnprintf(buf, sizeof(buf), "%s: %s:%d ", my_name, file, line);
} else {
len = 0;
}
va_end(arg_ptr);
#ifdef SEND_DMSG_TO_FILE
- fputs(buf, trace_fd);
- fflush(trace_fd);
+ if (trace_fd) {
+ fputs(buf, trace_fd);
+ fflush(trace_fd);
+ }
#else
fputs(buf, stdout);
#endif
* are not printed.
*/
void
-p_msg(char *file, int line, int level, char *fmt,...)
+p_msg(const char *file, int line, int level, const char *fmt,...)
{
char buf[5000];
int len;
#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;
}
* are not printed.
*/
void
-t_msg(char *file, int line, int level, char *fmt,...)
+t_msg(const char *file, int line, int level, const char *fmt,...)
{
char buf[5000];
int len;
if (!trace_fd) {
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"),
- 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;
}
va_start(arg_ptr, fmt);
bvsnprintf(buf+len, sizeof(buf)-len, (char *)fmt, arg_ptr);
va_end(arg_ptr);
-
- fputs(buf, trace_fd);
- fflush(trace_fd);
- }
+ if (trace_fd != NULL) {
+ fputs(buf, trace_fd);
+ fflush(trace_fd);
+ }
+ }
}
*
*/
void
-e_msg(char *file, int line, int type, int level, char *fmt,...)
+e_msg(const char *file, int line, int type, int level, const char *fmt,...)
{
char buf[5000];
va_list arg_ptr;
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;
+ case M_SECURITY:
+ len = bsnprintf(buf, sizeof(buf), "%s: Security violation: ", my_name);
+ break;
+ default:
+ len = bsnprintf(buf, sizeof(buf), "%s: ", my_name);
+ break;
}
va_start(arg_ptr, fmt);
p[0] = 0; /* generate segmentation violation */
}
if (type == M_ERROR_TERM) {
- _exit(1);
+ exit(1);
}
}
*
*/
void
-Jmsg(JCR *jcr, int type, int level, char *fmt,...)
+Jmsg(JCR *jcr, int type, int level, const char *fmt,...)
{
char rbuf[5000];
va_list arg_ptr;
}
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;
+ case M_SECURITY:
+ len = bsnprintf(rbuf, sizeof(rbuf), "%s: %s Security violation: ", my_name, job);
break;
default:
- len = sprintf(rbuf, "%s: ", my_name);
+ len = bsnprintf(rbuf, sizeof(rbuf), "%s: ", my_name);
break;
}
p[0] = 0; /* generate segmentation violation */
}
if (type == M_ERROR_TERM) {
- _exit(1);
+ exit(1);
}
}
+/*
+ * If we come here, prefix the message with the file:line-number,
+ * then pass it on to the normal Jmsg routine.
+ */
+void j_msg(const char *file, int line, JCR *jcr, int type, int level, const char *fmt,...)
+{
+ va_list arg_ptr;
+ int i, len, maxlen;
+ POOLMEM *pool_buf;
+
+ pool_buf = get_pool_memory(PM_EMSG);
+ i = Mmsg(&pool_buf, "%s:%d ", file, line);
+
+again:
+ maxlen = sizeof_pool_memory(pool_buf) - i - 1;
+ va_start(arg_ptr, fmt);
+ 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 + maxlen/2);
+ goto again;
+ }
+
+ Jmsg(jcr, type, level, "%s", pool_buf);
+ free_memory(pool_buf);
+}
+
+
/*
* Edit a message into a Pool memory buffer, with file:lineno
*/
-int m_msg(char *file, int line, POOLMEM **pool_buf, char *fmt, ...)
+int m_msg(const char *file, int line, POOLMEM **pool_buf, const char *fmt, ...)
{
va_list arg_ptr;
int i, len, maxlen;
* Edit a message into a Pool Memory buffer NO file:lineno
* Returns: string length of what was edited.
*/
-int Mmsg(POOLMEM **pool_buf, char *fmt, ...)
+int Mmsg(POOLMEM **pool_buf, const char *fmt, ...)
{
va_list arg_ptr;
int len, maxlen;
return len;
}
+static pthread_mutex_t msg_queue_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+/*
+ * We queue messages rather than print them directly. This
+ * is generally used in low level routines (msg handler, bnet)
+ * to prevent recursion.
+ */
+void Qmsg(JCR *jcr, int type, int level, const char *fmt,...)
+{
+ va_list arg_ptr;
+ int len, maxlen;
+ POOLMEM *pool_buf;
+ MQUEUE_ITEM *item;
+
+ if (jcr->dequeuing) { /* do not allow recursion */
+ return;
+ }
+ pool_buf = get_pool_memory(PM_EMSG);
+
+again:
+ maxlen = sizeof_pool_memory(pool_buf) - 1;
+ va_start(arg_ptr, fmt);
+ 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 + maxlen/2);
+ goto again;
+ }
+ P(msg_queue_mutex);
+ item = (MQUEUE_ITEM *)malloc(sizeof(MQUEUE_ITEM) + strlen(pool_buf) + 1);
+ item->type = type;
+ item->level = level;
+ strcpy(item->msg, pool_buf);
+ jcr->msg_queue->append(item);
+ V(msg_queue_mutex);
+ free_memory(pool_buf);
+}
+
+/*
+ * Dequeue messages
+ */
+void dequeue_messages(JCR *jcr)
+{
+ MQUEUE_ITEM *item;
+ P(msg_queue_mutex);
+ jcr->dequeuing = true;
+ foreach_dlist(item, jcr->msg_queue) {
+ Jmsg(jcr, item->type, item->level, "%s", item->msg);
+ }
+ jcr->msg_queue->destroy();
+ jcr->dequeuing = false;
+ V(msg_queue_mutex);
+}
+
/*
* If we come here, prefix the message with the file:line-number,
- * then pass it on to the normal Jmsg routine.
+ * then pass it on to the normal Qmsg routine.
*/
-void j_msg(char *file, int line, JCR *jcr, int type, int level, char *fmt,...)
+void q_msg(const char *file, int line, JCR *jcr, int type, int level, const char *fmt,...)
{
va_list arg_ptr;
int i, len, maxlen;
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;
goto again;
}
- Jmsg(jcr, type, level, "%s", pool_buf);
+ Qmsg(jcr, type, level, "%s", pool_buf);
free_memory(pool_buf);
}
projects / bacula / bacula / blobdiff