diff options
| author | Joshua Judson Rosen | 2014-05-20 01:02:18 -0400 |
|---|---|---|
| committer | Denys Vlasenko | 2014-06-02 03:11:38 +0200 |
| commit | 1b90e031c3a3bd6dc5c2a34193ec6e9727b79a39 (patch) | |
| tree | dbf16a94e27d0ce62985c48417eb3fe732ba1f7f /sysklogd | |
| parent | fd0640e5a12f74b7ab1d918cf884df0c59402c5a (diff) | |
| download | busybox-1b90e031c3a3bd6dc5c2a34193ec6e9727b79a39.zip busybox-1b90e031c3a3bd6dc5c2a34193ec6e9727b79a39.tar.gz | |
syslogd: avoid spurious ftrunctate() calls for "-b 0"
Forgetting to re-set log_file->size after truncating to zero
discards log-data for the next 1 second following an oversize-induced purge,
when we shouldn't necessarily throw that data away.
Signed-off-by: Joshua Judson Rosen <jrosen@harvestai.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'sysklogd')
| -rw-r--r-- | sysklogd/syslogd.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c index a6a4ff2..2c959ff 100644 --- a/sysklogd/syslogd.c +++ b/sysklogd/syslogd.c @@ -663,7 +663,13 @@ static void log_locally(time_t now, char *msg, logFile_t *log_file) close(log_file->fd); goto reopen; } + + /* We don't get here unless G.logFileRotate == 0; + * in which case don't bother unlinking and reopening, + * just truncate and reset size to match: + */ ftruncate(log_file->fd, 0); + log_file->size = 0; } log_file->size += #endif |