summaryrefslogtreecommitdiffstats
path: root/contrib/ntp/libntp/msyslog.c
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/ntp/libntp/msyslog.c')
-rw-r--r--contrib/ntp/libntp/msyslog.c24
1 files changed, 18 insertions, 6 deletions
diff --git a/contrib/ntp/libntp/msyslog.c b/contrib/ntp/libntp/msyslog.c
index 283414d..cc8868f 100644
--- a/contrib/ntp/libntp/msyslog.c
+++ b/contrib/ntp/libntp/msyslog.c
@@ -38,7 +38,7 @@ char * syslog_abs_fname;
#define INIT_NTP_SYSLOGMASK ~(u_int32)0
u_int32 ntp_syslogmask = INIT_NTP_SYSLOGMASK;
-extern char * progname;
+extern char const * progname;
/* Declare the local functions */
void addto_syslog (int, const char *);
@@ -145,8 +145,8 @@ addto_syslog(
const char * msg
)
{
- static char * prevcall_progname;
- static char * prog;
+ static char const * prevcall_progname;
+ static char const * prog;
const char nl[] = "\n";
const char empty[] = "";
FILE * term_file;
@@ -357,6 +357,18 @@ msyslog(
addto_syslog(level, buf);
}
+void
+mvsyslog(
+ int level,
+ const char * fmt,
+ va_list ap
+ )
+{
+ char buf[1024];
+ mvsnprintf(buf, sizeof(buf), fmt, ap);
+ addto_syslog(level, buf);
+}
+
/*
* Initialize the logging
@@ -371,7 +383,7 @@ init_logging(
)
{
static int was_daemon;
- const char * cp;
+ char * cp;
const char * pname;
/*
@@ -402,7 +414,7 @@ init_logging(
#ifdef SYS_WINNT /* strip ".exe" */
cp = strrchr(progname, '.');
if (NULL != cp && !strcasecmp(cp, ".exe"))
- progname[cp - progname] = '\0';
+ *cp = '\0';
#endif
#if !defined(VMS)
@@ -454,7 +466,7 @@ change_logfile(
size_t octets;
#endif /* POSIX */
- NTP_REQUIRE(fname != NULL);
+ REQUIRE(fname != NULL);
log_fname = fname;
/*
OpenPOWER on IntegriCloud