mirror of
https://github.com/sheumann/hush.git
synced 2024-11-18 17:10:36 +00:00
a7ccdeef39
function old new delta xfdopen_helper - 40 +40 logdir_open 1163 1184 +21 process_stdin 433 443 +10 xfdopen_for_write - 9 +9 doCommands 2465 2474 +9 patch_main 1214 1222 +8 bbunpack 457 465 +8 xfdopen_for_read - 7 +7 scan_tree 258 262 +4 xstrtoul_range_sfx 230 231 +1 sendmail_main 957 955 -2 passwd_main 1027 1023 -4 parse 969 964 -5 test_main 253 247 -6 sed_main 655 649 -6 dos2unix_main 437 429 -8 fbsplash_main 950 938 -12 handle_dir_common 371 354 -17 expand_vars_to_list 2197 2169 -28 update_passwd 1275 1246 -29 ------------------------------------------------------------------------------ (add/remove: 3/0 grow/shrink: 7/10 up/down: 117/-117) Total: 0 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
1166 lines
30 KiB
C
1166 lines
30 KiB
C
/*
|
|
Copyright (c) 2001-2006, Gerrit Pape
|
|
All rights reserved.
|
|
|
|
Redistribution and use in source and binary forms, with or without
|
|
modification, are permitted provided that the following conditions are met:
|
|
|
|
1. Redistributions of source code must retain the above copyright notice,
|
|
this list of conditions and the following disclaimer.
|
|
2. Redistributions in binary form must reproduce the above copyright
|
|
notice, this list of conditions and the following disclaimer in the
|
|
documentation and/or other materials provided with the distribution.
|
|
3. The name of the author may not be used to endorse or promote products
|
|
derived from this software without specific prior written permission.
|
|
|
|
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
|
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
|
EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
|
OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
|
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
|
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
|
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
/* Busyboxed by Denys Vlasenko <vda.linux@googlemail.com> */
|
|
/* TODO: depends on runit_lib.c - review and reduce/eliminate */
|
|
|
|
/*
|
|
Config files
|
|
|
|
On startup, and after receiving a HUP signal, svlogd checks for each
|
|
log directory log if the configuration file log/config exists,
|
|
and if so, reads the file line by line and adjusts configuration
|
|
for log as follows:
|
|
|
|
If the line is empty, or starts with a #, it is ignored. A line
|
|
of the form
|
|
|
|
ssize
|
|
sets the maximum file size of current when svlogd should rotate
|
|
the current log file to size bytes. Default is 1000000.
|
|
If size is zero, svlogd doesnt rotate log files
|
|
You should set size to at least (2 * len).
|
|
nnum
|
|
sets the number of old log files svlogd should maintain to num.
|
|
If svlogd sees more that num old log files in log after log file
|
|
rotation, it deletes the oldest one. Default is 10.
|
|
If num is zero, svlogd doesnt remove old log files.
|
|
Nmin
|
|
sets the minimum number of old log files svlogd should maintain
|
|
to min. min must be less than num. If min is set, and svlogd
|
|
cannot write to current because the filesystem is full,
|
|
and it sees more than min old log files, it deletes the oldest one.
|
|
ttimeout
|
|
sets the maximum age of the current log file when svlogd should
|
|
rotate the current log file to timeout seconds. If current
|
|
is timeout seconds old, and is not empty, svlogd forces log file rotation.
|
|
!processor
|
|
tells svlogd to feed each recent log file through processor
|
|
(see above) on log file rotation. By default log files are not processed.
|
|
ua.b.c.d[:port]
|
|
tells svlogd to transmit the first len characters of selected
|
|
log messages to the IP address a.b.c.d, port number port.
|
|
If port isnt set, the default port for syslog is used (514).
|
|
len can be set through the -l option, see below. If svlogd
|
|
has trouble sending udp packets, it writes error messages
|
|
to the log directory. Attention: logging through udp is unreliable,
|
|
and should be used in private networks only.
|
|
Ua.b.c.d[:port]
|
|
is the same as the u line above, but the log messages are no longer
|
|
written to the log directory, but transmitted through udp only.
|
|
Error messages from svlogd concerning sending udp packages still go
|
|
to the log directory.
|
|
pprefix
|
|
tells svlogd to prefix each line to be written to the log directory,
|
|
to standard error, or through UDP, with prefix.
|
|
|
|
If a line starts with a -, +, e, or E, svlogd matches the first len characters
|
|
of each log message against pattern and acts accordingly:
|
|
|
|
-pattern
|
|
the log message is deselected.
|
|
+pattern
|
|
the log message is selected.
|
|
epattern
|
|
the log message is selected to be printed to standard error.
|
|
Epattern
|
|
the log message is deselected to be printed to standard error.
|
|
|
|
Initially each line is selected to be written to log/current. Deselected
|
|
log messages are discarded from log. Initially each line is deselected
|
|
to be written to standard err. Log messages selected for standard error
|
|
are written to standard error.
|
|
|
|
Pattern Matching
|
|
|
|
svlogd matches a log message against the string pattern as follows:
|
|
|
|
pattern is applied to the log message one character by one, starting
|
|
with the first. A character not a star (*) and not a plus (+) matches itself.
|
|
A plus matches the next character in pattern in the log message one
|
|
or more times. A star before the end of pattern matches any string
|
|
in the log message that does not include the next character in pattern.
|
|
A star at the end of pattern matches any string.
|
|
|
|
Timestamps optionally added by svlogd are not considered part
|
|
of the log message.
|
|
|
|
An svlogd pattern is not a regular expression. For example consider
|
|
a log message like this
|
|
|
|
2005-12-18_09:13:50.97618 tcpsvd: info: pid 1977 from 10.4.1.14
|
|
|
|
The following pattern doesnt match
|
|
|
|
-*pid*
|
|
|
|
because the first star matches up to the first p in tcpsvd,
|
|
and then the match fails because i is not s. To match this
|
|
log message, you can use a pattern like this instead
|
|
|
|
-*: *: pid *
|
|
*/
|
|
|
|
#include <sys/poll.h>
|
|
#include <sys/file.h>
|
|
#include "libbb.h"
|
|
#include "runit_lib.h"
|
|
|
|
#define LESS(a,b) ((int)((unsigned)(b) - (unsigned)(a)) > 0)
|
|
|
|
#define FMT_PTIME 30
|
|
|
|
struct logdir {
|
|
////char *btmp;
|
|
/* pattern list to match, in "aa\0bb\0\cc\0\0" form */
|
|
char *inst;
|
|
char *processor;
|
|
char *name;
|
|
unsigned size;
|
|
unsigned sizemax;
|
|
unsigned nmax;
|
|
unsigned nmin;
|
|
unsigned rotate_period;
|
|
int ppid;
|
|
int fddir;
|
|
int fdcur;
|
|
FILE* filecur; ////
|
|
int fdlock;
|
|
unsigned next_rotate;
|
|
char fnsave[FMT_PTIME];
|
|
char match;
|
|
char matcherr;
|
|
};
|
|
|
|
|
|
struct globals {
|
|
struct logdir *dir;
|
|
unsigned verbose;
|
|
int linemax;
|
|
////int buflen;
|
|
int linelen;
|
|
|
|
int fdwdir;
|
|
char **fndir;
|
|
int wstat;
|
|
unsigned nearest_rotate;
|
|
|
|
void* (*memRchr)(const void *, int, size_t);
|
|
|
|
smallint exitasap;
|
|
smallint rotateasap;
|
|
smallint reopenasap;
|
|
smallint linecomplete;
|
|
smallint tmaxflag;
|
|
|
|
char repl;
|
|
const char *replace;
|
|
int fl_flag_0;
|
|
unsigned dirn;
|
|
|
|
sigset_t blocked_sigset;
|
|
};
|
|
#define G (*(struct globals*)ptr_to_globals)
|
|
#define dir (G.dir )
|
|
#define verbose (G.verbose )
|
|
#define linemax (G.linemax )
|
|
#define buflen (G.buflen )
|
|
#define linelen (G.linelen )
|
|
#define fndir (G.fndir )
|
|
#define fdwdir (G.fdwdir )
|
|
#define wstat (G.wstat )
|
|
#define memRchr (G.memRchr )
|
|
#define nearest_rotate (G.nearest_rotate)
|
|
#define exitasap (G.exitasap )
|
|
#define rotateasap (G.rotateasap )
|
|
#define reopenasap (G.reopenasap )
|
|
#define linecomplete (G.linecomplete )
|
|
#define tmaxflag (G.tmaxflag )
|
|
#define repl (G.repl )
|
|
#define replace (G.replace )
|
|
#define blocked_sigset (G.blocked_sigset)
|
|
#define fl_flag_0 (G.fl_flag_0 )
|
|
#define dirn (G.dirn )
|
|
#define INIT_G() do { \
|
|
SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
|
|
linemax = 1000; \
|
|
/*buflen = 1024;*/ \
|
|
linecomplete = 1; \
|
|
replace = ""; \
|
|
} while (0)
|
|
|
|
#define line bb_common_bufsiz1
|
|
|
|
|
|
#define FATAL "fatal: "
|
|
#define WARNING "warning: "
|
|
#define PAUSE "pausing: "
|
|
#define INFO "info: "
|
|
|
|
static void fatalx(const char *m0)
|
|
{
|
|
bb_error_msg_and_die(FATAL"%s", m0);
|
|
}
|
|
static void warn(const char *m0)
|
|
{
|
|
bb_perror_msg(WARNING"%s", m0);
|
|
}
|
|
static void warn2(const char *m0, const char *m1)
|
|
{
|
|
bb_perror_msg(WARNING"%s: %s", m0, m1);
|
|
}
|
|
static void warnx(const char *m0, const char *m1)
|
|
{
|
|
bb_error_msg(WARNING"%s: %s", m0, m1);
|
|
}
|
|
static void pause_nomem(void)
|
|
{
|
|
bb_error_msg(PAUSE"out of memory");
|
|
sleep(3);
|
|
}
|
|
static void pause1cannot(const char *m0)
|
|
{
|
|
bb_perror_msg(PAUSE"can't %s", m0);
|
|
sleep(3);
|
|
}
|
|
static void pause2cannot(const char *m0, const char *m1)
|
|
{
|
|
bb_perror_msg(PAUSE"can't %s %s", m0, m1);
|
|
sleep(3);
|
|
}
|
|
|
|
static char* wstrdup(const char *str)
|
|
{
|
|
char *s;
|
|
while (!(s = strdup(str)))
|
|
pause_nomem();
|
|
return s;
|
|
}
|
|
|
|
/*** ex fmt_ptime.[ch] ***/
|
|
|
|
/* NUL terminated */
|
|
static void fmt_time_human_30nul(char *s)
|
|
{
|
|
struct tm *t;
|
|
struct timeval tv;
|
|
|
|
gettimeofday(&tv, NULL);
|
|
t = gmtime(&(tv.tv_sec));
|
|
sprintf(s, "%04u-%02u-%02u_%02u:%02u:%02u.%06u000",
|
|
(unsigned)(1900 + t->tm_year),
|
|
(unsigned)(t->tm_mon + 1),
|
|
(unsigned)(t->tm_mday),
|
|
(unsigned)(t->tm_hour),
|
|
(unsigned)(t->tm_min),
|
|
(unsigned)(t->tm_sec),
|
|
(unsigned)(tv.tv_usec)
|
|
);
|
|
/* 4+1 + 2+1 + 2+1 + 2+1 + 2+1 + 2+1 + 9 = */
|
|
/* 5 + 3 + 3 + 3 + 3 + 3 + 9 = */
|
|
/* 20 (up to '.' inclusive) + 9 (not including '\0') */
|
|
}
|
|
|
|
/* NOT terminated! */
|
|
static void fmt_time_bernstein_25(char *s)
|
|
{
|
|
uint32_t pack[3];
|
|
struct timeval tv;
|
|
unsigned sec_hi;
|
|
|
|
gettimeofday(&tv, NULL);
|
|
sec_hi = (0x400000000000000aULL + tv.tv_sec) >> 32;
|
|
tv.tv_sec = (time_t)(0x400000000000000aULL) + tv.tv_sec;
|
|
tv.tv_usec *= 1000;
|
|
/* Network order is big-endian: most significant byte first.
|
|
* This is exactly what we want here */
|
|
pack[0] = htonl(sec_hi);
|
|
pack[1] = htonl(tv.tv_sec);
|
|
pack[2] = htonl(tv.tv_usec);
|
|
*s++ = '@';
|
|
bin2hex(s, (char*)pack, 12);
|
|
}
|
|
|
|
static void processorstart(struct logdir *ld)
|
|
{
|
|
char sv_ch;
|
|
int pid;
|
|
|
|
if (!ld->processor) return;
|
|
if (ld->ppid) {
|
|
warnx("processor already running", ld->name);
|
|
return;
|
|
}
|
|
|
|
/* vfork'ed child trashes this byte, save... */
|
|
sv_ch = ld->fnsave[26];
|
|
|
|
while ((pid = vfork()) == -1)
|
|
pause2cannot("vfork for processor", ld->name);
|
|
if (!pid) {
|
|
int fd;
|
|
|
|
/* child */
|
|
/* Non-ignored signals revert to SIG_DFL on exec anyway */
|
|
/*bb_signals(0
|
|
+ (1 << SIGTERM)
|
|
+ (1 << SIGALRM)
|
|
+ (1 << SIGHUP)
|
|
, SIG_DFL);*/
|
|
sig_unblock(SIGTERM);
|
|
sig_unblock(SIGALRM);
|
|
sig_unblock(SIGHUP);
|
|
|
|
if (verbose)
|
|
bb_error_msg(INFO"processing: %s/%s", ld->name, ld->fnsave);
|
|
fd = xopen(ld->fnsave, O_RDONLY|O_NDELAY);
|
|
xmove_fd(fd, 0);
|
|
ld->fnsave[26] = 't'; /* <- that's why we need sv_ch! */
|
|
fd = xopen(ld->fnsave, O_WRONLY|O_NDELAY|O_TRUNC|O_CREAT);
|
|
xmove_fd(fd, 1);
|
|
fd = open_read("state");
|
|
if (fd == -1) {
|
|
if (errno != ENOENT)
|
|
bb_perror_msg_and_die(FATAL"can't %s processor %s", "open state for", ld->name);
|
|
close(xopen("state", O_WRONLY|O_NDELAY|O_TRUNC|O_CREAT));
|
|
fd = xopen("state", O_RDONLY|O_NDELAY);
|
|
}
|
|
xmove_fd(fd, 4);
|
|
fd = xopen("newstate", O_WRONLY|O_NDELAY|O_TRUNC|O_CREAT);
|
|
xmove_fd(fd, 5);
|
|
|
|
// getenv("SHELL")?
|
|
execl("/bin/sh", "/bin/sh" + 5, "-c", ld->processor, (char*) NULL);
|
|
bb_perror_msg_and_die(FATAL"can't %s processor %s", "run", ld->name);
|
|
}
|
|
ld->fnsave[26] = sv_ch; /* ...restore */
|
|
ld->ppid = pid;
|
|
}
|
|
|
|
static unsigned processorstop(struct logdir *ld)
|
|
{
|
|
char f[28];
|
|
|
|
if (ld->ppid) {
|
|
sig_unblock(SIGHUP);
|
|
while (safe_waitpid(ld->ppid, &wstat, 0) == -1)
|
|
pause2cannot("wait for processor", ld->name);
|
|
sig_block(SIGHUP);
|
|
ld->ppid = 0;
|
|
}
|
|
if (ld->fddir == -1)
|
|
return 1;
|
|
while (fchdir(ld->fddir) == -1)
|
|
pause2cannot("change directory, want processor", ld->name);
|
|
if (WEXITSTATUS(wstat) != 0) {
|
|
warnx("processor failed, restart", ld->name);
|
|
ld->fnsave[26] = 't';
|
|
unlink(ld->fnsave);
|
|
ld->fnsave[26] = 'u';
|
|
processorstart(ld);
|
|
while (fchdir(fdwdir) == -1)
|
|
pause1cannot("change to initial working directory");
|
|
return ld->processor ? 0 : 1;
|
|
}
|
|
ld->fnsave[26] = 't';
|
|
memcpy(f, ld->fnsave, 26);
|
|
f[26] = 's';
|
|
f[27] = '\0';
|
|
while (rename(ld->fnsave, f) == -1)
|
|
pause2cannot("rename processed", ld->name);
|
|
while (chmod(f, 0744) == -1)
|
|
pause2cannot("set mode of processed", ld->name);
|
|
ld->fnsave[26] = 'u';
|
|
if (unlink(ld->fnsave) == -1)
|
|
bb_error_msg(WARNING"can't unlink: %s/%s", ld->name, ld->fnsave);
|
|
while (rename("newstate", "state") == -1)
|
|
pause2cannot("rename state", ld->name);
|
|
if (verbose)
|
|
bb_error_msg(INFO"processed: %s/%s", ld->name, f);
|
|
while (fchdir(fdwdir) == -1)
|
|
pause1cannot("change to initial working directory");
|
|
return 1;
|
|
}
|
|
|
|
static void rmoldest(struct logdir *ld)
|
|
{
|
|
DIR *d;
|
|
struct dirent *f;
|
|
char oldest[FMT_PTIME];
|
|
int n = 0;
|
|
|
|
oldest[0] = 'A'; oldest[1] = oldest[27] = 0;
|
|
while (!(d = opendir(".")))
|
|
pause2cannot("open directory, want rotate", ld->name);
|
|
errno = 0;
|
|
while ((f = readdir(d))) {
|
|
if ((f->d_name[0] == '@') && (strlen(f->d_name) == 27)) {
|
|
if (f->d_name[26] == 't') {
|
|
if (unlink(f->d_name) == -1)
|
|
warn2("can't unlink processor leftover", f->d_name);
|
|
} else {
|
|
++n;
|
|
if (strcmp(f->d_name, oldest) < 0)
|
|
memcpy(oldest, f->d_name, 27);
|
|
}
|
|
errno = 0;
|
|
}
|
|
}
|
|
if (errno)
|
|
warn2("can't read directory", ld->name);
|
|
closedir(d);
|
|
|
|
if (ld->nmax && (n > ld->nmax)) {
|
|
if (verbose)
|
|
bb_error_msg(INFO"delete: %s/%s", ld->name, oldest);
|
|
if ((*oldest == '@') && (unlink(oldest) == -1))
|
|
warn2("can't unlink oldest logfile", ld->name);
|
|
}
|
|
}
|
|
|
|
static unsigned rotate(struct logdir *ld)
|
|
{
|
|
struct stat st;
|
|
unsigned now;
|
|
|
|
if (ld->fddir == -1) {
|
|
ld->rotate_period = 0;
|
|
return 0;
|
|
}
|
|
if (ld->ppid)
|
|
while (!processorstop(ld))
|
|
continue;
|
|
|
|
while (fchdir(ld->fddir) == -1)
|
|
pause2cannot("change directory, want rotate", ld->name);
|
|
|
|
/* create new filename */
|
|
ld->fnsave[25] = '.';
|
|
ld->fnsave[26] = 's';
|
|
if (ld->processor)
|
|
ld->fnsave[26] = 'u';
|
|
ld->fnsave[27] = '\0';
|
|
do {
|
|
fmt_time_bernstein_25(ld->fnsave);
|
|
errno = 0;
|
|
stat(ld->fnsave, &st);
|
|
} while (errno != ENOENT);
|
|
|
|
now = monotonic_sec();
|
|
if (ld->rotate_period && LESS(ld->next_rotate, now)) {
|
|
ld->next_rotate = now + ld->rotate_period;
|
|
if (LESS(ld->next_rotate, nearest_rotate))
|
|
nearest_rotate = ld->next_rotate;
|
|
}
|
|
|
|
if (ld->size > 0) {
|
|
while (fflush(ld->filecur) || fsync(ld->fdcur) == -1)
|
|
pause2cannot("fsync current logfile", ld->name);
|
|
while (fchmod(ld->fdcur, 0744) == -1)
|
|
pause2cannot("set mode of current", ld->name);
|
|
////close(ld->fdcur);
|
|
fclose(ld->filecur);
|
|
|
|
if (verbose) {
|
|
bb_error_msg(INFO"rename: %s/current %s %u", ld->name,
|
|
ld->fnsave, ld->size);
|
|
}
|
|
while (rename("current", ld->fnsave) == -1)
|
|
pause2cannot("rename current", ld->name);
|
|
while ((ld->fdcur = open("current", O_WRONLY|O_NDELAY|O_APPEND|O_CREAT, 0600)) == -1)
|
|
pause2cannot("create new current", ld->name);
|
|
while ((ld->filecur = fdopen(ld->fdcur, "a")) == NULL) ////
|
|
pause2cannot("create new current", ld->name); /* very unlikely */
|
|
setvbuf(ld->filecur, NULL, _IOFBF, linelen); ////
|
|
close_on_exec_on(ld->fdcur);
|
|
ld->size = 0;
|
|
while (fchmod(ld->fdcur, 0644) == -1)
|
|
pause2cannot("set mode of current", ld->name);
|
|
|
|
rmoldest(ld);
|
|
processorstart(ld);
|
|
}
|
|
|
|
while (fchdir(fdwdir) == -1)
|
|
pause1cannot("change to initial working directory");
|
|
return 1;
|
|
}
|
|
|
|
static int buffer_pwrite(int n, char *s, unsigned len)
|
|
{
|
|
int i;
|
|
struct logdir *ld = &dir[n];
|
|
|
|
if (ld->sizemax) {
|
|
if (ld->size >= ld->sizemax)
|
|
rotate(ld);
|
|
if (len > (ld->sizemax - ld->size))
|
|
len = ld->sizemax - ld->size;
|
|
}
|
|
while (1) {
|
|
////i = full_write(ld->fdcur, s, len);
|
|
////if (i != -1) break;
|
|
i = fwrite(s, 1, len, ld->filecur);
|
|
if (i == len) break;
|
|
|
|
if ((errno == ENOSPC) && (ld->nmin < ld->nmax)) {
|
|
DIR *d;
|
|
struct dirent *f;
|
|
char oldest[FMT_PTIME];
|
|
int j = 0;
|
|
|
|
while (fchdir(ld->fddir) == -1)
|
|
pause2cannot("change directory, want remove old logfile",
|
|
ld->name);
|
|
oldest[0] = 'A';
|
|
oldest[1] = oldest[27] = '\0';
|
|
while (!(d = opendir(".")))
|
|
pause2cannot("open directory, want remove old logfile",
|
|
ld->name);
|
|
errno = 0;
|
|
while ((f = readdir(d)))
|
|
if ((f->d_name[0] == '@') && (strlen(f->d_name) == 27)) {
|
|
++j;
|
|
if (strcmp(f->d_name, oldest) < 0)
|
|
memcpy(oldest, f->d_name, 27);
|
|
}
|
|
if (errno) warn2("can't read directory, want remove old logfile",
|
|
ld->name);
|
|
closedir(d);
|
|
errno = ENOSPC;
|
|
if (j > ld->nmin) {
|
|
if (*oldest == '@') {
|
|
bb_error_msg(WARNING"out of disk space, delete: %s/%s",
|
|
ld->name, oldest);
|
|
errno = 0;
|
|
if (unlink(oldest) == -1) {
|
|
warn2("can't unlink oldest logfile", ld->name);
|
|
errno = ENOSPC;
|
|
}
|
|
while (fchdir(fdwdir) == -1)
|
|
pause1cannot("change to initial working directory");
|
|
}
|
|
}
|
|
}
|
|
if (errno)
|
|
pause2cannot("write to current", ld->name);
|
|
}
|
|
|
|
ld->size += i;
|
|
if (ld->sizemax)
|
|
if (s[i-1] == '\n')
|
|
if (ld->size >= (ld->sizemax - linemax))
|
|
rotate(ld);
|
|
return i;
|
|
}
|
|
|
|
static void logdir_close(struct logdir *ld)
|
|
{
|
|
if (ld->fddir == -1)
|
|
return;
|
|
if (verbose)
|
|
bb_error_msg(INFO"close: %s", ld->name);
|
|
close(ld->fddir);
|
|
ld->fddir = -1;
|
|
if (ld->fdcur == -1)
|
|
return; /* impossible */
|
|
while (fflush(ld->filecur) || fsync(ld->fdcur) == -1)
|
|
pause2cannot("fsync current logfile", ld->name);
|
|
while (fchmod(ld->fdcur, 0744) == -1)
|
|
pause2cannot("set mode of current", ld->name);
|
|
////close(ld->fdcur);
|
|
fclose(ld->filecur);
|
|
ld->fdcur = -1;
|
|
if (ld->fdlock == -1)
|
|
return; /* impossible */
|
|
close(ld->fdlock);
|
|
ld->fdlock = -1;
|
|
free(ld->processor);
|
|
ld->processor = NULL;
|
|
}
|
|
|
|
static NOINLINE unsigned logdir_open(struct logdir *ld, const char *fn)
|
|
{
|
|
char buf[128];
|
|
unsigned now;
|
|
char *new, *s, *np;
|
|
int i;
|
|
struct stat st;
|
|
|
|
now = monotonic_sec();
|
|
|
|
ld->fddir = open(fn, O_RDONLY|O_NDELAY);
|
|
if (ld->fddir == -1) {
|
|
warn2("can't open log directory", (char*)fn);
|
|
return 0;
|
|
}
|
|
close_on_exec_on(ld->fddir);
|
|
if (fchdir(ld->fddir) == -1) {
|
|
logdir_close(ld);
|
|
warn2("can't change directory", (char*)fn);
|
|
return 0;
|
|
}
|
|
ld->fdlock = open("lock", O_WRONLY|O_NDELAY|O_APPEND|O_CREAT, 0600);
|
|
if ((ld->fdlock == -1)
|
|
|| (lock_exnb(ld->fdlock) == -1)
|
|
) {
|
|
logdir_close(ld);
|
|
warn2("can't lock directory", (char*)fn);
|
|
while (fchdir(fdwdir) == -1)
|
|
pause1cannot("change to initial working directory");
|
|
return 0;
|
|
}
|
|
close_on_exec_on(ld->fdlock);
|
|
|
|
ld->size = 0;
|
|
ld->sizemax = 1000000;
|
|
ld->nmax = ld->nmin = 10;
|
|
ld->rotate_period = 0;
|
|
ld->name = (char*)fn;
|
|
ld->ppid = 0;
|
|
ld->match = '+';
|
|
free(ld->inst); ld->inst = NULL;
|
|
free(ld->processor); ld->processor = NULL;
|
|
|
|
/* read config */
|
|
i = open_read_close("config", buf, sizeof(buf) - 1);
|
|
if (i < 0 && errno != ENOENT)
|
|
bb_perror_msg(WARNING"%s/config", ld->name);
|
|
if (i > 0) {
|
|
buf[i] = '\0';
|
|
if (verbose)
|
|
bb_error_msg(INFO"read: %s/config", ld->name);
|
|
s = buf;
|
|
while (s) {
|
|
np = strchr(s, '\n');
|
|
if (np)
|
|
*np++ = '\0';
|
|
switch (s[0]) {
|
|
case '+':
|
|
case '-':
|
|
case 'e':
|
|
case 'E':
|
|
/* Filtering requires one-line buffering,
|
|
* resetting the "find newline" function
|
|
* accordingly */
|
|
memRchr = memchr;
|
|
/* Add '\n'-terminated line to ld->inst */
|
|
while (1) {
|
|
int l = asprintf(&new, "%s%s\n", ld->inst ? ld->inst : "", s);
|
|
if (l >= 0 && new)
|
|
break;
|
|
pause_nomem();
|
|
}
|
|
free(ld->inst);
|
|
ld->inst = new;
|
|
break;
|
|
case 's': {
|
|
static const struct suffix_mult km_suffixes[] = {
|
|
{ "k", 1024 },
|
|
{ "m", 1024*1024 },
|
|
{ "", 0 }
|
|
};
|
|
ld->sizemax = xatou_sfx(&s[1], km_suffixes);
|
|
break;
|
|
}
|
|
case 'n':
|
|
ld->nmax = xatoi_u(&s[1]);
|
|
break;
|
|
case 'N':
|
|
ld->nmin = xatoi_u(&s[1]);
|
|
break;
|
|
case 't': {
|
|
static const struct suffix_mult mh_suffixes[] = {
|
|
{ "m", 60 },
|
|
{ "h", 60*60 },
|
|
/*{ "d", 24*60*60 },*/
|
|
{ "", 0 }
|
|
};
|
|
ld->rotate_period = xatou_sfx(&s[1], mh_suffixes);
|
|
if (ld->rotate_period) {
|
|
ld->next_rotate = now + ld->rotate_period;
|
|
if (!tmaxflag || LESS(ld->next_rotate, nearest_rotate))
|
|
nearest_rotate = ld->next_rotate;
|
|
tmaxflag = 1;
|
|
}
|
|
break;
|
|
}
|
|
case '!':
|
|
if (s[1]) {
|
|
free(ld->processor);
|
|
ld->processor = wstrdup(s);
|
|
}
|
|
break;
|
|
}
|
|
s = np;
|
|
}
|
|
/* Convert "aa\nbb\ncc\n\0" to "aa\0bb\0cc\0\0" */
|
|
s = ld->inst;
|
|
while (s) {
|
|
np = strchr(s, '\n');
|
|
if (np)
|
|
*np++ = '\0';
|
|
s = np;
|
|
}
|
|
}
|
|
|
|
/* open current */
|
|
i = stat("current", &st);
|
|
if (i != -1) {
|
|
if (st.st_size && !(st.st_mode & S_IXUSR)) {
|
|
ld->fnsave[25] = '.';
|
|
ld->fnsave[26] = 'u';
|
|
ld->fnsave[27] = '\0';
|
|
do {
|
|
fmt_time_bernstein_25(ld->fnsave);
|
|
errno = 0;
|
|
stat(ld->fnsave, &st);
|
|
} while (errno != ENOENT);
|
|
while (rename("current", ld->fnsave) == -1)
|
|
pause2cannot("rename current", ld->name);
|
|
rmoldest(ld);
|
|
i = -1;
|
|
} else {
|
|
/* st.st_size can be not just bigger, but WIDER!
|
|
* This code is safe: if st.st_size > 4GB, we select
|
|
* ld->sizemax (because it's "unsigned") */
|
|
ld->size = (st.st_size > ld->sizemax) ? ld->sizemax : st.st_size;
|
|
}
|
|
} else {
|
|
if (errno != ENOENT) {
|
|
logdir_close(ld);
|
|
warn2("can't stat current", ld->name);
|
|
while (fchdir(fdwdir) == -1)
|
|
pause1cannot("change to initial working directory");
|
|
return 0;
|
|
}
|
|
}
|
|
while ((ld->fdcur = open("current", O_WRONLY|O_NDELAY|O_APPEND|O_CREAT, 0600)) == -1)
|
|
pause2cannot("open current", ld->name);
|
|
while ((ld->filecur = fdopen(ld->fdcur, "a")) == NULL)
|
|
pause2cannot("open current", ld->name); ////
|
|
setvbuf(ld->filecur, NULL, _IOFBF, linelen); ////
|
|
|
|
close_on_exec_on(ld->fdcur);
|
|
while (fchmod(ld->fdcur, 0644) == -1)
|
|
pause2cannot("set mode of current", ld->name);
|
|
|
|
if (verbose) {
|
|
if (i == 0) bb_error_msg(INFO"append: %s/current", ld->name);
|
|
else bb_error_msg(INFO"new: %s/current", ld->name);
|
|
}
|
|
|
|
while (fchdir(fdwdir) == -1)
|
|
pause1cannot("change to initial working directory");
|
|
return 1;
|
|
}
|
|
|
|
static void logdirs_reopen(void)
|
|
{
|
|
int l;
|
|
int ok = 0;
|
|
|
|
tmaxflag = 0;
|
|
for (l = 0; l < dirn; ++l) {
|
|
logdir_close(&dir[l]);
|
|
if (logdir_open(&dir[l], fndir[l]))
|
|
ok = 1;
|
|
}
|
|
if (!ok)
|
|
fatalx("no functional log directories");
|
|
}
|
|
|
|
/* Will look good in libbb one day */
|
|
static ssize_t ndelay_read(int fd, void *buf, size_t count)
|
|
{
|
|
if (!(fl_flag_0 & O_NONBLOCK))
|
|
fcntl(fd, F_SETFL, fl_flag_0 | O_NONBLOCK);
|
|
count = safe_read(fd, buf, count);
|
|
if (!(fl_flag_0 & O_NONBLOCK))
|
|
fcntl(fd, F_SETFL, fl_flag_0);
|
|
return count;
|
|
}
|
|
|
|
/* Used for reading stdin */
|
|
static int buffer_pread(/*int fd, */char *s, unsigned len)
|
|
{
|
|
unsigned now;
|
|
struct pollfd input;
|
|
int i;
|
|
|
|
input.fd = STDIN_FILENO;
|
|
input.events = POLLIN;
|
|
|
|
do {
|
|
if (rotateasap) {
|
|
for (i = 0; i < dirn; ++i)
|
|
rotate(dir + i);
|
|
rotateasap = 0;
|
|
}
|
|
if (exitasap) {
|
|
if (linecomplete)
|
|
return 0;
|
|
len = 1;
|
|
}
|
|
if (reopenasap) {
|
|
logdirs_reopen();
|
|
reopenasap = 0;
|
|
}
|
|
now = monotonic_sec();
|
|
nearest_rotate = now + (45 * 60 + 45);
|
|
for (i = 0; i < dirn; ++i) {
|
|
if (dir[i].rotate_period) {
|
|
if (LESS(dir[i].next_rotate, now))
|
|
rotate(dir + i);
|
|
if (LESS(dir[i].next_rotate, nearest_rotate))
|
|
nearest_rotate = dir[i].next_rotate;
|
|
}
|
|
}
|
|
|
|
sigprocmask(SIG_UNBLOCK, &blocked_sigset, NULL);
|
|
i = nearest_rotate - now;
|
|
if (i > 1000000)
|
|
i = 1000000;
|
|
if (i <= 0)
|
|
i = 1;
|
|
poll(&input, 1, i * 1000);
|
|
sigprocmask(SIG_BLOCK, &blocked_sigset, NULL);
|
|
|
|
i = ndelay_read(STDIN_FILENO, s, len);
|
|
if (i >= 0)
|
|
break;
|
|
if (errno == EINTR)
|
|
continue;
|
|
if (errno != EAGAIN) {
|
|
warn("can't read standard input");
|
|
break;
|
|
}
|
|
/* else: EAGAIN - normal, repeat silently */
|
|
} while (!exitasap);
|
|
|
|
if (i > 0) {
|
|
int cnt;
|
|
linecomplete = (s[i-1] == '\n');
|
|
if (!repl)
|
|
return i;
|
|
|
|
cnt = i;
|
|
while (--cnt >= 0) {
|
|
char ch = *s;
|
|
if (ch != '\n') {
|
|
if (ch < 32 || ch > 126)
|
|
*s = repl;
|
|
else {
|
|
int j;
|
|
for (j = 0; replace[j]; ++j) {
|
|
if (ch == replace[j]) {
|
|
*s = repl;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
s++;
|
|
}
|
|
}
|
|
return i;
|
|
}
|
|
|
|
static void sig_term_handler(int sig_no UNUSED_PARAM)
|
|
{
|
|
if (verbose)
|
|
bb_error_msg(INFO"sig%s received", "term");
|
|
exitasap = 1;
|
|
}
|
|
|
|
static void sig_child_handler(int sig_no UNUSED_PARAM)
|
|
{
|
|
pid_t pid;
|
|
int l;
|
|
|
|
if (verbose)
|
|
bb_error_msg(INFO"sig%s received", "child");
|
|
while ((pid = wait_any_nohang(&wstat)) > 0) {
|
|
for (l = 0; l < dirn; ++l) {
|
|
if (dir[l].ppid == pid) {
|
|
dir[l].ppid = 0;
|
|
processorstop(&dir[l]);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
static void sig_alarm_handler(int sig_no UNUSED_PARAM)
|
|
{
|
|
if (verbose)
|
|
bb_error_msg(INFO"sig%s received", "alarm");
|
|
rotateasap = 1;
|
|
}
|
|
|
|
static void sig_hangup_handler(int sig_no UNUSED_PARAM)
|
|
{
|
|
if (verbose)
|
|
bb_error_msg(INFO"sig%s received", "hangup");
|
|
reopenasap = 1;
|
|
}
|
|
|
|
static void logmatch(struct logdir *ld)
|
|
{
|
|
char *s;
|
|
|
|
ld->match = '+';
|
|
ld->matcherr = 'E';
|
|
s = ld->inst;
|
|
while (s && s[0]) {
|
|
switch (s[0]) {
|
|
case '+':
|
|
case '-':
|
|
if (pmatch(s+1, line, linelen))
|
|
ld->match = s[0];
|
|
break;
|
|
case 'e':
|
|
case 'E':
|
|
if (pmatch(s+1, line, linelen))
|
|
ld->matcherr = s[0];
|
|
break;
|
|
}
|
|
s += strlen(s) + 1;
|
|
}
|
|
}
|
|
|
|
int svlogd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int svlogd_main(int argc, char **argv)
|
|
{
|
|
char *r, *l, *b;
|
|
ssize_t stdin_cnt = 0;
|
|
int i;
|
|
unsigned opt;
|
|
unsigned timestamp = 0;
|
|
|
|
INIT_G();
|
|
|
|
opt_complementary = "tt:vv";
|
|
opt = getopt32(argv, "r:R:l:b:tv",
|
|
&r, &replace, &l, &b, ×tamp, &verbose);
|
|
if (opt & 1) { // -r
|
|
repl = r[0];
|
|
if (!repl || r[1])
|
|
bb_show_usage();
|
|
}
|
|
if (opt & 2) if (!repl) repl = '_'; // -R
|
|
if (opt & 4) { // -l
|
|
linemax = xatou_range(l, 0, BUFSIZ-26);
|
|
if (linemax == 0)
|
|
linemax = BUFSIZ-26;
|
|
if (linemax < 256)
|
|
linemax = 256;
|
|
}
|
|
////if (opt & 8) { // -b
|
|
//// buflen = xatoi_u(b);
|
|
//// if (buflen == 0) buflen = 1024;
|
|
////}
|
|
//if (opt & 0x10) timestamp++; // -t
|
|
//if (opt & 0x20) verbose++; // -v
|
|
//if (timestamp > 2) timestamp = 2;
|
|
argv += optind;
|
|
argc -= optind;
|
|
|
|
dirn = argc;
|
|
if (dirn <= 0)
|
|
bb_show_usage();
|
|
////if (buflen <= linemax) bb_show_usage();
|
|
fdwdir = xopen(".", O_RDONLY|O_NDELAY);
|
|
close_on_exec_on(fdwdir);
|
|
dir = xzalloc(dirn * sizeof(dir[0]));
|
|
for (i = 0; i < dirn; ++i) {
|
|
dir[i].fddir = -1;
|
|
dir[i].fdcur = -1;
|
|
////dir[i].btmp = xmalloc(buflen);
|
|
/*dir[i].ppid = 0;*/
|
|
}
|
|
/* line = xmalloc(linemax + (timestamp ? 26 : 0)); */
|
|
fndir = argv;
|
|
/* We cannot set NONBLOCK on fd #0 permanently - this setting
|
|
* _isn't_ per-process! It is shared among all other processes
|
|
* with the same stdin */
|
|
fl_flag_0 = fcntl(0, F_GETFL);
|
|
|
|
sigemptyset(&blocked_sigset);
|
|
sigaddset(&blocked_sigset, SIGTERM);
|
|
sigaddset(&blocked_sigset, SIGCHLD);
|
|
sigaddset(&blocked_sigset, SIGALRM);
|
|
sigaddset(&blocked_sigset, SIGHUP);
|
|
sigprocmask(SIG_BLOCK, &blocked_sigset, NULL);
|
|
bb_signals_recursive_norestart(1 << SIGTERM, sig_term_handler);
|
|
bb_signals_recursive_norestart(1 << SIGCHLD, sig_child_handler);
|
|
bb_signals_recursive_norestart(1 << SIGALRM, sig_alarm_handler);
|
|
bb_signals_recursive_norestart(1 << SIGHUP, sig_hangup_handler);
|
|
|
|
/* Without timestamps, we don't have to print each line
|
|
* separately, so we can look for _last_ newline, not first,
|
|
* thus batching writes. If filtering is enabled in config,
|
|
* logdirs_reopen resets it to memchr.
|
|
*/
|
|
memRchr = (timestamp ? memchr : memrchr);
|
|
|
|
logdirs_reopen();
|
|
|
|
setvbuf(stderr, NULL, _IOFBF, linelen);
|
|
|
|
/* Each iteration processes one or more lines */
|
|
while (1) {
|
|
char stamp[FMT_PTIME];
|
|
char *lineptr;
|
|
char *printptr;
|
|
char *np;
|
|
int printlen;
|
|
char ch;
|
|
|
|
lineptr = line;
|
|
if (timestamp)
|
|
lineptr += 26;
|
|
|
|
/* lineptr[0..linemax-1] - buffer for stdin */
|
|
/* (possibly has some unprocessed data from prev loop) */
|
|
|
|
/* Refill the buffer if needed */
|
|
np = memRchr(lineptr, '\n', stdin_cnt);
|
|
if (!np && !exitasap) {
|
|
i = linemax - stdin_cnt; /* avail. bytes at tail */
|
|
if (i >= 128) {
|
|
i = buffer_pread(/*0, */lineptr + stdin_cnt, i);
|
|
if (i <= 0) /* EOF or error on stdin */
|
|
exitasap = 1;
|
|
else {
|
|
np = memRchr(lineptr + stdin_cnt, '\n', i);
|
|
stdin_cnt += i;
|
|
}
|
|
}
|
|
}
|
|
if (stdin_cnt <= 0 && exitasap)
|
|
break;
|
|
|
|
/* Search for '\n' (in fact, np already holds the result) */
|
|
linelen = stdin_cnt;
|
|
if (np) {
|
|
print_to_nl: /* NB: starting from here lineptr may point
|
|
* farther out into line[] */
|
|
linelen = np - lineptr + 1;
|
|
}
|
|
/* linelen == no of chars incl. '\n' (or == stdin_cnt) */
|
|
ch = lineptr[linelen-1];
|
|
|
|
/* Biggest performance hit was coming from the fact
|
|
* that we did not buffer writes. We were reading many lines
|
|
* in one read() above, but wrote one line per write().
|
|
* We are using stdio to fix that */
|
|
|
|
/* write out lineptr[0..linelen-1] to each log destination
|
|
* (or lineptr[-26..linelen-1] if timestamping) */
|
|
printlen = linelen;
|
|
printptr = lineptr;
|
|
if (timestamp) {
|
|
if (timestamp == 1)
|
|
fmt_time_bernstein_25(stamp);
|
|
else /* 2: */
|
|
fmt_time_human_30nul(stamp);
|
|
printlen += 26;
|
|
printptr -= 26;
|
|
memcpy(printptr, stamp, 25);
|
|
printptr[25] = ' ';
|
|
}
|
|
for (i = 0; i < dirn; ++i) {
|
|
struct logdir *ld = &dir[i];
|
|
if (ld->fddir == -1)
|
|
continue;
|
|
if (ld->inst)
|
|
logmatch(ld);
|
|
if (ld->matcherr == 'e') {
|
|
/* runit-1.8.0 compat: if timestamping, do it on stderr too */
|
|
////full_write(STDERR_FILENO, printptr, printlen);
|
|
fwrite(printptr, 1, printlen, stderr);
|
|
}
|
|
if (ld->match != '+')
|
|
continue;
|
|
buffer_pwrite(i, printptr, printlen);
|
|
}
|
|
|
|
/* If we didn't see '\n' (long input line), */
|
|
/* read/write repeatedly until we see it */
|
|
while (ch != '\n') {
|
|
/* lineptr is emptied now, safe to use as buffer */
|
|
stdin_cnt = exitasap ? -1 : buffer_pread(/*0, */lineptr, linemax);
|
|
if (stdin_cnt <= 0) { /* EOF or error on stdin */
|
|
exitasap = 1;
|
|
lineptr[0] = ch = '\n';
|
|
linelen = 1;
|
|
stdin_cnt = 1;
|
|
} else {
|
|
linelen = stdin_cnt;
|
|
np = memRchr(lineptr, '\n', stdin_cnt);
|
|
if (np)
|
|
linelen = np - lineptr + 1;
|
|
ch = lineptr[linelen-1];
|
|
}
|
|
/* linelen == no of chars incl. '\n' (or == stdin_cnt) */
|
|
for (i = 0; i < dirn; ++i) {
|
|
if (dir[i].fddir == -1)
|
|
continue;
|
|
if (dir[i].matcherr == 'e') {
|
|
////full_write(STDERR_FILENO, lineptr, linelen);
|
|
fwrite(lineptr, 1, linelen, stderr);
|
|
}
|
|
if (dir[i].match != '+')
|
|
continue;
|
|
buffer_pwrite(i, lineptr, linelen);
|
|
}
|
|
}
|
|
|
|
stdin_cnt -= linelen;
|
|
if (stdin_cnt > 0) {
|
|
lineptr += linelen;
|
|
/* If we see another '\n', we don't need to read
|
|
* next piece of input: can print what we have */
|
|
np = memRchr(lineptr, '\n', stdin_cnt);
|
|
if (np)
|
|
goto print_to_nl;
|
|
/* Move unprocessed data to the front of line */
|
|
memmove((timestamp ? line+26 : line), lineptr, stdin_cnt);
|
|
}
|
|
fflush_all();////
|
|
}
|
|
|
|
for (i = 0; i < dirn; ++i) {
|
|
if (dir[i].ppid)
|
|
while (!processorstop(&dir[i]))
|
|
continue;
|
|
logdir_close(&dir[i]);
|
|
}
|
|
return 0;
|
|
}
|