d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use strtol to parse the <%d> tags in printline() and printsys().

Browse Source 
Sort local variables declarations in these functions.

Submitted by:	bde
This commit is contained in:
iedowse 2004-01-31 17:44:27 +00:00
parent 4f70d4609f
commit 3a3407567f
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
usr.sbin/syslogd/syslogd.c
View File

@ -645,18 +645,21 @@ usage(void)
static void
printline(const char *hname, char *msg)
{
char *p, *q;
long n;
int c, pri;
char *p, *q, line[MAXLINE + 1];
char line[MAXLINE + 1];
/* test for special codes */
pri = DEFUPRI;
p = msg;
pri = DEFUPRI;
if (*p == '<') {
pri = 0;
while (isdigit(*++p))
pri = 10 * pri + (*p - '0');
if (*p == '>')
++p;
errno = 0;
n = strtol(p + 1, &q, 10);
if (*q == '>' && n >= 0 && n < INT_MAX && errno == 0) {
p = q + 1;
pri = n;
}
}
if (pri &~ (LOG_FACMASK|LOG_PRIMASK))
pri = DEFUPRI;
@ -736,24 +739,21 @@ readklog(void)
static void
printsys(char *msg)
{
char *p;
int flags, isprintf, n, pri;
char *p, *q;
long n;
int flags, isprintf, pri;
flags = ISKERNEL | SYNC_FILE | ADDDATE; /* fsync after write */
pri = DEFSPRI;
p = msg;
pri = DEFSPRI;
isprintf = 1;
if (*p == '<') {
n = 0;
while (isdigit(*++p))
n = 10 * n + (*p - '0');
if (*p == '>') {
++p;
errno = 0;
n = strtol(p + 1, &q, 10);
if (*q == '>' && n >= 0 && n < INT_MAX && errno == 0) {
p = q + 1;
pri = n;
isprintf = 0;
} else {
/* It wasn't actually a syslog message. */
p = msg;
}
}
/*