chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
00ca7f0
)
stdout-syslog-bridge: properly handle overly long log lines
author
Lennart Poettering
<lennart@poettering.net>
Tue, 20 Sep 2011 00:46:04 +0000
(
02:46
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 20 Sep 2011 00:46:04 +0000
(
02:46
+0200)
src/stdout-syslog-bridge.c
patch
|
blob
|
history
diff --git
a/src/stdout-syslog-bridge.c
b/src/stdout-syslog-bridge.c
index 7358a42f70f855c58542ce152ac1f1b4367ef3e4..9a0408819ec964a1626cadcd2090268065c8323f 100644
(file)
--- a/
src/stdout-syslog-bridge.c
+++ b/
src/stdout-syslog-bridge.c
@@
-88,7
+88,7
@@
struct Stream {
bool prefix:1;
bool tee_console:1;
bool prefix:1;
bool tee_console:1;
- char buffer[LINE_MAX];
+ char buffer[LINE_MAX
+1
];
size_t length;
LIST_FIELDS(Stream, stream);
size_t length;
LIST_FIELDS(Stream, stream);
@@
-321,16
+321,25
@@
static int stream_scan(Stream *s, usec_t ts) {
p = s->buffer;
remaining = s->length;
for (;;) {
p = s->buffer;
remaining = s->length;
for (;;) {
- char *newline;
-
- if (!(newline = memchr(p, '\n', remaining)))
- break;
+ char *end;
+ size_t skip;
+
+ end = memchr(p, '\n', remaining);
+ if (!end) {
+ if (remaining >= LINE_MAX) {
+ end = p + LINE_MAX;
+ skip = LINE_MAX;
+ } else
+ break;
+ } else
+ skip = end - p + 1;
- *
newline
= 0;
+ *
end
= 0;
- if ((r = stream_line(s, p, ts)) >= 0) {
- remaining -= newline-p+1;
- p = newline+1;
+ r = stream_line(s, p, ts);
+ if (r >= 0) {
+ remaining -= skip;
+ p += skip;
}
}
}
}
@@
-347,7
+356,8
@@
static int stream_process(Stream *s, usec_t ts) {
int r;
assert(s);
int r;
assert(s);
- if ((l = read(s->fd, s->buffer+s->length, LINE_MAX-s->length)) < 0) {
+ l = read(s->fd, s->buffer+s->length, LINE_MAX-s->length);
+ if (l < 0) {
if (errno == EAGAIN)
return 0;
if (errno == EAGAIN)
return 0;