View | Details | Raw Unified | Return to bug 2464 | Differences between
and this patch

Collapse All | Expand All

(-)a/log.c (-1 / +10 lines)
Lines 46-51 Link Here
46
#include <syslog.h>
46
#include <syslog.h>
47
#include <unistd.h>
47
#include <unistd.h>
48
#include <errno.h>
48
#include <errno.h>
49
#include <sys/timeb.h>
49
#if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) && !defined(BROKEN_STRNVIS)
50
#if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) && !defined(BROKEN_STRNVIS)
50
# include <vis.h>
51
# include <vis.h>
51
#endif
52
#endif
Lines 443-449 do_log(LogLevel level, const char *fmt, va_list args) Link Here
443
		tmp_handler(level, fmtbuf, log_handler_ctx);
444
		tmp_handler(level, fmtbuf, log_handler_ctx);
444
		log_handler = tmp_handler;
445
		log_handler = tmp_handler;
445
	} else if (log_on_stderr) {
446
	} else if (log_on_stderr) {
446
		snprintf(msgbuf, sizeof msgbuf, "%s\r\n", fmtbuf);
447
		struct timeb tb;
448
		struct tm tm;
449
		char *p= msgbuf;
450
451
		ftime (&tb);
452
		localtime_r (&tb.time, &tm);
453
		p += strftime (p, 16, "%Y%m%d.%H%M%S", &tm);
454
		p += sprintf (p, ".%03d ", tb.millitm);
455
		snprintf(p, (msgbuf + sizeof msgbuf - p), "%s\r\n", fmtbuf);
447
		(void)write(log_stderr_fd, msgbuf, strlen(msgbuf));
456
		(void)write(log_stderr_fd, msgbuf, strlen(msgbuf));
448
	} else {
457
	} else {
449
#if defined(HAVE_OPENLOG_R) && defined(SYSLOG_DATA_INIT)
458
#if defined(HAVE_OPENLOG_R) && defined(SYSLOG_DATA_INIT)

Return to bug 2464