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

Minor, refactor in preparation for checking kmesg seqno

Browse Source 
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg 2021-02-21 12:51:29 +01:00
parent 0901310226
commit d00c9dac74
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/syslogd.c
View File

@ -59,6 +59,7 @@ static char sccsid[] __attribute__((unused)) =
#include <setjmp.h> #include <setjmp.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
@ -1098,6 +1099,7 @@ void printsys(char *msg)
{ {
struct buf_msg buffer; struct buf_msg buffer;
char line[MAXLINE + 1]; char line[MAXLINE + 1];
uint64_t seqno = 0;
char *lp, *p, *q; char *lp, *p, *q;
int c; int c;
@ -1120,19 +1122,26 @@ void printsys(char *msg)
/* Linux /dev/kmsg: "pri,seq#,msec,flag[,..];msg" */ /* Linux /dev/kmsg: "pri,seq#,msec,flag[,..];msg" */
time_t now = boot_time; time_t now = boot_time;
/* pri */
buffer.pri = 0; buffer.pri = 0;
while (isdigit(*p)) while (isdigit(*p))
buffer.pri = 10 * buffer.pri + (*p++ - '0'); buffer.pri = 10 * buffer.pri + (*p++ - '0');
++p;
/* skip sequence number for now */ p++; /* skip ',' */
while (isdigit(*++p))
; /* seq# */
++p; while (isdigit(*p))
seqno = 10 * seqno + (*p++ - '0');
p++; /* skip ',' */
/* timestamp */
while (isdigit(*p)) while (isdigit(*p))
buffer.timestamp.usec = 10 * buffer.timestamp.usec + (*p++ - '0'); buffer.timestamp.usec = 10 * buffer.timestamp.usec + (*p++ - '0');
now += buffer.timestamp.usec / 1000000; now += buffer.timestamp.usec / 1000000;
buffer.timestamp.usec = buffer.timestamp.usec % 1000000; buffer.timestamp.usec = buffer.timestamp.usec % 1000000;
localtime_r(&now, &buffer.timestamp.tm); localtime_r(&now, &buffer.timestamp.tm);
/* skip flags for now */ /* skip flags for now */
q = strchr(p, ';'); q = strchr(p, ';');
if (q) if (q)