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

klogd: do not log partial lines

Browse Source 
function                                             old     new   delta
overlapping_strcpy                                    15      18      +3
klogd_main                                           438     436      -2

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-10-19 23:07:49 +02:00
parent ef6c6d8cfe
commit 0016bcee37
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libbb/safe_strncpy.c
View File

@ -20,8 +20,13 @@ char* FAST_FUNC safe_strncpy(char *dst, const char *src, size_t size)
/* Like strcpy but can copy overlapping strings. */ /* Like strcpy but can copy overlapping strings. */
void FAST_FUNC overlapping_strcpy(char *dst, const char *src) void FAST_FUNC overlapping_strcpy(char *dst, const char *src)
{ {
while ((*dst = *src) != '\0') { /* Cheap optimization for dst == src case -
dst++; * better to have it here than in many callers.
src++; */
if (dst != src) {
while ((*dst = *src) != '\0') {
dst++;
src++;
}
} }
} }

19
sysklogd/klogd.c
View File

@ -132,7 +132,7 @@ int klogd_main(int argc UNUSED_PARAM, char **argv)
int i = 0; int i = 0;
char *opt_c; char *opt_c;
int opt; int opt;
int used = 0; int used;
opt = getopt32(argv, "c:n", &opt_c); opt = getopt32(argv, "c:n", &opt_c);
if (opt & OPT_LEVEL) { if (opt & OPT_LEVEL) {
@ -159,6 +159,7 @@ int klogd_main(int argc UNUSED_PARAM, char **argv)
syslog(LOG_NOTICE, "klogd started: %s", bb_banner); syslog(LOG_NOTICE, "klogd started: %s", bb_banner);
used = 0;
while (!bb_got_signal) { while (!bb_got_signal) {
int n; int n;
int priority; int priority;
@ -175,22 +176,22 @@ int klogd_main(int argc UNUSED_PARAM, char **argv)
} }
start[n] = '\0'; start[n] = '\0';
/* klogctl buffer parsing modelled after code in dmesg.c */
/* Process each newline-terminated line in the buffer */ /* Process each newline-terminated line in the buffer */
start = log_buffer; start = log_buffer;
while (1) { while (1) {
char *newline = strchrnul(start, '\n'); char *newline = strchrnul(start, '\n');
if (*newline == '\0') { if (*newline == '\0') {
/* This line is incomplete... */ /* This line is incomplete */
if (start != log_buffer) {
/* move it to the front of the buffer */ /* move it to the front of the buffer */
overlapping_strcpy(log_buffer, start); overlapping_strcpy(log_buffer, start);
used = newline - start; used = newline - start;
/* don't log it yet */ if (used < KLOGD_LOGBUF_SIZE-1) {
/* buffer isn't full */
break; break;
} }
/* ...but if buffer is full, log it anyway */ /* buffer is full, log it anyway */
used = 0; used = 0;
newline = NULL; newline = NULL;
} else { } else {