emo/sysklogd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

logger: Add NetBSD -i option for LOG_PID

Browse Source 
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson 2019-11-07 21:25:32 +01:00
parent d3461fd6a3
commit 0aa57978ee
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
man/logger.1
View File

@ -32,7 +32,7 @@
.Nd Send messages to system log, or a log file .Nd Send messages to system log, or a log file
.Sh SYNOPSIS .Sh SYNOPSIS
.Nm .Nm
.Op Fl chsv .Op Fl chisv
.Op Fl f Ar FILE .Op Fl f Ar FILE
.Op Fl p Ar PRIO .Op Fl p Ar PRIO
.Op Fl r Ar SIZE:NUM .Op Fl r Ar SIZE:NUM
@ -65,8 +65,9 @@ accepts
.Fl f- .Fl f-
as an alias for as an alias for
.Ar stdout . .Ar stdout .
.It Fl h .It Fl i
Show program help. Log the process id of the logger process with each line
.Ql ( LOG_PID ) .
.It Fl p Ar PRIO .It Fl p Ar PRIO
Priority, numeric or Priority, numeric or
.Ar facility.severity .Ar facility.severity

9
src/logger.c
View File

@ -183,6 +183,7 @@ static int usage(int code)
"Write MESSAGE (or line-by-line stdin) to syslog, or file (with logrotate).\n" "Write MESSAGE (or line-by-line stdin) to syslog, or file (with logrotate).\n"
"\n" "\n"
" -c Log to console (LOG_CONS) on failure\n" " -c Log to console (LOG_CONS) on failure\n"
" -i Log the process ID of the logger process with each line (LOG_PID)\n"
" -p PRIO Log message priority (numeric or facility.severity pair)\n" " -p PRIO Log message priority (numeric or facility.severity pair)\n"
" -t TAG Log using the specified tag (defaults to user name)\n" " -t TAG Log using the specified tag (defaults to user name)\n"
" -s Log to stderr as well as the system log\n" " -s Log to stderr as well as the system log\n"
@ -206,14 +207,14 @@ int main(int argc, char *argv[])
int c, num = 5; int c, num = 5;
int facility = LOG_USER; int facility = LOG_USER;
int severity = LOG_INFO; int severity = LOG_INFO;
int log_opts = LOG_NDELAY | LOG_PID; int log_opts = LOG_NDELAY;
int rotate = 0; int rotate = 0;
off_t size = 200 * 1024; off_t size = 200 * 1024;
char *ident = NULL, *logfile = NULL; char *ident = NULL, *logfile = NULL;
char *sockpath = NULL; char *sockpath = NULL;
char buf[512] = ""; char buf[512] = "";
while ((c = getopt(argc, argv, "?cf:p:r:st:u:v")) != EOF) { while ((c = getopt(argc, argv, "?cf:ip:r:st:u:v")) != EOF) {
switch (c) { switch (c) {
case 'c': case 'c':
log_opts |= LOG_CONS; log_opts |= LOG_CONS;
@ -223,6 +224,10 @@ int main(int argc, char *argv[])
logfile = optarg; logfile = optarg;
break; break;
case 'i':
log_opts |= LOG_PID;
break;
case 'p': case 'p':
if (parse_prio(optarg, &facility, &severity)) if (parse_prio(optarg, &facility, &severity))
return usage(1); return usage(1);