From da97307141afadedc5de78e675c40ec23dff54bb Mon Sep 17 00:00:00 2001 From: Tomas Valla Date: Tue, 23 Dec 2003 00:18:53 +0000 Subject: [PATCH] Allow modules to change the log title, second attempt. --- lib/lib.h | 2 ++ lib/log.c | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/lib.h b/lib/lib.h index 518ce195..de3c21c1 100644 --- a/lib/lib.h +++ b/lib/lib.h @@ -48,6 +48,8 @@ #define L_ERROR_R 'e' #define L_FATAL '!' /* die() */ +extern char *log_title; /* NULL - print no title, default is log_progname */ + void log_msg(unsigned int cat, const char *msg, ...) __attribute__((format(printf,2,3))); #define log log_msg void die(byte *, ...) NONRET; diff --git a/lib/log.c b/lib/log.c index ae8648c2..5d132da4 100644 --- a/lib/log.c +++ b/lib/log.c @@ -18,8 +18,8 @@ #include #include -char log_progname[32]; -static char *log_name_patt, *log_name; +static char log_progname[32], *log_name_patt, *log_name; +char *log_title = log_progname; static pid_t log_pid; static int log_params; static int log_name_size; @@ -73,12 +73,12 @@ vlog(unsigned int cat, const char *msg, va_list args) p = buf = alloca(buflen); *p++ = cat; p += strftime(p, buflen, " %Y-%m-%d %H:%M:%S ", tm); - if (log_progname[0]) + if (log_title) { if (log_pid) - p += sprintf(p, "[%s (%d)] ", log_progname, log_pid); + p += sprintf(p, "[%s (%d)] ", log_title, log_pid); else - p += sprintf(p, "[%s] ", log_progname); + p += sprintf(p, "[%s] ", log_title); } else { -- 2.39.2