/*
Bacula® - The Network Backup Solution
- Copyright (C) 2000-2006 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2007 Free Software Foundation Europe e.V.
The main author of Bacula is Kern Sibbald, with contributions from
many others, a complete list can be found in the file AUTHORS.
(FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
Switzerland, email:ftf@fsfeurope.org.
*/
+/*
+ * Bacula message handling routines
+ *
+ * Kern Sibbald, April 2000
+ *
+ * Version $Id$
+ *
+ */
#include "bacula.h"
if (argc>0 && argv && argv[0]) {
/* strip trailing filename and save exepath */
for (l=p=argv[0]; *p; p++) {
- if (*p == '/') {
+ if (IsPathSeparator(*p)) {
l = p; /* set pos of last slash */
}
}
- if (*l == '/') {
+ if (IsPathSeparator(*l)) {
l++;
} else {
l = argv[0];
*q++ = *p++;
}
*q = 0;
- if (strchr(exepath, '.') || exepath[0] != '/') {
+ if (strchr(exepath, '.') || !IsPathSeparator(exepath[0])) {
if (getcwd(cpath, sizeof(cpath))) {
free(exepath);
exepath = (char *)malloc(strlen(cpath) + 1 + len);
case MD_APPEND:
if (d->fd) {
fclose(d->fd); /* close open file descriptor */
+ d->fd = NULL;
}
break;
case MD_MAIL:
rem_temp_file:
/* Remove temp file */
fclose(d->fd);
+ d->fd = NULL;
unlink(d->mail_filename);
free_pool_memory(d->mail_filename);
d->mail_filename = NULL;
esc_msg = check_pool_memory_size(esc_msg, len*2+1);
p_sql_escape(esc_msg, msg, len);
- bstrftimes(dt, sizeof(dt), mtime);
+ bstrutime(dt, sizeof(dt), mtime);
Mmsg(cmd, "INSERT INTO Log (JobId, Time, LogText) VALUES (%s,'%s','%s')",
edit_int64(jcr->JobId, ed1), dt, esc_msg);
p_sql_query(jcr, cmd);
/* On error, we close and reopen to handle log rotation */
if (ferror(d->fd)) {
fclose(d->fd);
+ d->fd = NULL;
if (open_dest_file(jcr, d, mode)) {
fputs(dt, d->fd);
fputs(msg, d->fd);
if (type != M_ABORT && type != M_ERROR_TERM) { /* already printed */
fputs(dt, stdout);
fputs(msg, stdout);
+ fflush(stdout);
}
break;
case MD_STDERR:
Dmsg1(850, "STDERR for following msg: %s", msg);
fputs(dt, stderr);
fputs(msg, stderr);
+ fflush(stdout);
break;
default:
break;
}
} else { /* not tracing */
fputs(buf, stdout);
+ fflush(stdout);
}
}
}
bvsnprintf(buf+len, sizeof(buf)-len, (char *)fmt, arg_ptr);
va_end(arg_ptr);
fputs(buf, stdout);
+ fflush(stdout);
}