X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=runit%2Fsvlogd.c;h=25799f6be556a3208135a448df9b67f3c9f4ae8b;hb=4fc5ec56f912b858ee7d64a2af2cbd24f2111b34;hp=c91f85fe18b2e07e192bd095b0086780a70445e6;hpb=bf0a201008671f81c107de72c026b1b84967561d;p=oweals%2Fbusybox.git

diff --git a/runit/svlogd.c b/runit/svlogd.c
index c91f85fe1..25799f6be 100644
--- a/runit/svlogd.c
+++ b/runit/svlogd.c
@@ -25,37 +25,20 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-/* Busyboxed by Denis Vlasenko <vda.linux@googlemail.com> */
+/* Busyboxed by Denys Vlasenko <vda.linux@googlemail.com> */
 /* TODO: depends on runit_lib.c - review and reduce/eliminate */
 
 #include <sys/poll.h>
 #include <sys/file.h>
-#include "busybox.h"
+#include "libbb.h"
 #include "runit_lib.h"
 
-static unsigned verbose;
-static int linemax = 1000;
-static int buflen = 1024;
-static int linelen;
-
-static char **fndir;
-static int fdwdir;
-static int wstat;
-static struct taia trotate;
-
-static char *line;
-static unsigned exitasap;
-static unsigned rotateasap;
-static unsigned reopenasap;
-static unsigned linecomplete = 1;
-static unsigned tmaxflag;
-static iopause_fd in;
-
-static const char *replace = "";
-static char repl;
-
-static struct logdir {
-	char *btmp;
+#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;
@@ -64,18 +47,74 @@ static struct logdir {
 	unsigned sizemax;
 	unsigned nmax;
 	unsigned nmin;
-	/* int (not long) because of taia_uint() usage: */
-	unsigned tmax;
+	unsigned rotate_period;
 	int ppid;
 	int fddir;
 	int fdcur;
+	FILE* filecur; ////
 	int fdlock;
-	struct taia trotate;
+	unsigned next_rotate;
 	char fnsave[FMT_PTIME];
 	char match;
 	char matcherr;
-} *dir;
-static unsigned dirn = 0;
+};
+
+
+struct globals {
+	struct logdir *dir;
+	unsigned verbose;
+	int linemax;
+	////int buflen;
+	int linelen;
+
+	int fdwdir;
+	char **fndir;
+	int wstat;
+	unsigned nearest_rotate;
+
+	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 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: "
@@ -83,96 +122,149 @@ static unsigned dirn = 0;
 #define INFO "info: "
 
 #define usage() bb_show_usage()
-static void fatalx(char *m0)
+static void fatalx(const char *m0)
 {
 	bb_error_msg_and_die(FATAL"%s", m0);
 }
-static void warn(char *m0) {
+static void warn(const char *m0)
+{
 	bb_perror_msg(WARNING"%s", m0);
 }
-static void warn2(char *m0, char *m1)
+static void warn2(const char *m0, const char *m1)
 {
 	bb_perror_msg(WARNING"%s: %s", m0, m1);
 }
-static void warnx(char *m0, char *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);
+	bb_error_msg(PAUSE"out of memory");
+	sleep(3);
 }
-static void pause1cannot(char *m0)
+static void pause1cannot(const char *m0)
 {
-	bb_perror_msg(PAUSE"cannot %s", m0); sleep(3);
+	bb_perror_msg(PAUSE"can't %s", m0);
+	sleep(3);
 }
-static void pause2cannot(char *m0, char *m1)
+static void pause2cannot(const char *m0, const char *m1)
 {
-	bb_perror_msg(PAUSE"cannot %s %s", m0, 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();
+	while (!(s = strdup(str)))
+		pause_nomem();
 	return s;
 }
 
-static unsigned processorstart(struct logdir *ld)
+/*** 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 0;
+	if (!ld->processor) return;
 	if (ld->ppid) {
 		warnx("processor already running", ld->name);
-		return 0;
+		return;
 	}
-	while ((pid = fork()) == -1)
-		pause2cannot("fork for processor", ld->name);
+
+	/* vfork'ed child trashes this byte, save... */
+	sv_ch = ld->fnsave[26];
+
+	while ((pid = vfork()) == -1)
+		pause2cannot("vfork for processor", ld->name);
 	if (!pid) {
 		char *prog[4];
 		int fd;
 
 		/* child */
-		sig_uncatch(sig_term);
-		sig_uncatch(sig_alarm);
-		sig_uncatch(sig_hangup);
-		sig_unblock(sig_term);
-		sig_unblock(sig_alarm);
-		sig_unblock(sig_hangup);
-		
+		/* 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);
-		if (fd_move(0, fd) == -1)
-			bb_perror_msg_and_die(FATAL"cannot %s processor %s", "move filedescriptor for", ld->name);
-		ld->fnsave[26] = 't';
+		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);
-		if (fd_move(1, fd) == -1)
-			bb_perror_msg_and_die(FATAL"cannot %s processor %s", "move filedescriptor for", ld->name);
+		xmove_fd(fd, 1);
 		fd = open_read("state");
 		if (fd == -1) {
 			if (errno != ENOENT)
-				bb_perror_msg_and_die(FATAL"cannot %s processor %s", "open state for", ld->name);
+				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);
 		}
-		if (fd_move(4, fd) == -1)
-			bb_perror_msg_and_die(FATAL"cannot %s processor %s", "move filedescriptor for", ld->name);
+		xmove_fd(fd, 4);
 		fd = xopen("newstate", O_WRONLY|O_NDELAY|O_TRUNC|O_CREAT);
-		if (fd_move(5, fd) == -1)
-			bb_perror_msg_and_die(FATAL"cannot %s processor %s", "move filedescriptor for", ld->name);
+		xmove_fd(fd, 5);
 
-		prog[0] = "sh";
-		prog[1] = "-c";
+// getenv("SHELL")?
+		prog[0] = (char*)"sh";
+		prog[1] = (char*)"-c";
 		prog[2] = ld->processor;
-		prog[3] = '\0';
-		execve("/bin/sh", prog, environ);
-		bb_perror_msg_and_die(FATAL"cannot %s processor %s", "run", ld->name);
+		prog[3] = NULL;
+		execv("/bin/sh", prog);
+		bb_perror_msg_and_die(FATAL"can't %s processor %s", "run", ld->name);
 	}
+	ld->fnsave[26] = sv_ch; /* ...restore */
 	ld->ppid = pid;
-	return 1;
 }
 
 static unsigned processorstop(struct logdir *ld)
@@ -180,16 +272,16 @@ static unsigned processorstop(struct logdir *ld)
 	char f[28];
 
 	if (ld->ppid) {
-		sig_unblock(sig_hangup);
-		while (wait_pid(&wstat, ld->ppid) == -1)
+		sig_unblock(SIGHUP);
+		while (safe_waitpid(ld->ppid, &wstat, 0) == -1)
 			pause2cannot("wait for processor", ld->name);
-		sig_block(sig_hangup);
+		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 (wait_exitcode(wstat) != 0) {
+	if (WEXITSTATUS(wstat) != 0) {
 		warnx("processor failed, restart", ld->name);
 		ld->fnsave[26] = 't';
 		unlink(ld->fnsave);
@@ -209,10 +301,11 @@ static unsigned processorstop(struct logdir *ld)
 		pause2cannot("set mode of processed", ld->name);
 	ld->fnsave[26] = 'u';
 	if (unlink(ld->fnsave) == -1)
-		bb_error_msg(WARNING"cannot unlink: %s/%s", ld->name, ld->fnsave);
+		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);
+	if (verbose)
+		bb_error_msg(INFO"processed: %s/%s", ld->name, f);
 	while (fchdir(fdwdir) == -1)
 		pause1cannot("change to initial working directory");
 	return 1;
@@ -233,7 +326,7 @@ static void rmoldest(struct logdir *ld)
 		if ((f->d_name[0] == '@') && (strlen(f->d_name) == 27)) {
 			if (f->d_name[26] == 't') {
 				if (unlink(f->d_name) == -1)
-					warn2("cannot unlink processor leftover", f->d_name);
+					warn2("can't unlink processor leftover", f->d_name);
 			} else {
 				++n;
 				if (strcmp(f->d_name, oldest) < 0)
@@ -242,28 +335,30 @@ static void rmoldest(struct logdir *ld)
 			errno = 0;
 		}
 	}
-	if (errno) warn2("cannot read directory", ld->name);
+	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 (verbose)
+			bb_error_msg(INFO"delete: %s/%s", ld->name, oldest);
 		if ((*oldest == '@') && (unlink(oldest) == -1))
-			warn2("cannot unlink oldest logfile", ld->name);
+			warn2("can't unlink oldest logfile", ld->name);
 	}
 }
 
 static unsigned rotate(struct logdir *ld)
 {
 	struct stat st;
-	struct taia now;
+	unsigned now;
 
 	if (ld->fddir == -1) {
-		ld->tmax = 0;
+		ld->rotate_period = 0;
 		return 0;
 	}
 	if (ld->ppid)
 		while (!processorstop(ld))
-			/* wait */;
+			continue;
 
 	while (fchdir(ld->fddir) == -1)
 		pause2cannot("change directory, want rotate", ld->name);
@@ -275,24 +370,26 @@ static unsigned rotate(struct logdir *ld)
 		ld->fnsave[26] = 'u';
 	ld->fnsave[27] = '\0';
 	do {
-		taia_now(&now);
-		fmt_taia(ld->fnsave, &now);
+		fmt_time_bernstein_25(ld->fnsave);
 		errno = 0;
-	} while ((stat(ld->fnsave, &st) != -1) || (errno != ENOENT));
-
-	if (ld->tmax && taia_less(&ld->trotate, &now)) {
-		taia_uint(&ld->trotate, ld->tmax);
-		taia_add(&ld->trotate, &now, &ld->trotate);
-		if (taia_less(&ld->trotate, &trotate))
-			trotate = ld->trotate;
+		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 (fsync(ld->fdcur) == -1)
+		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);
+		////close(ld->fdcur);
+		fclose(ld->filecur);
+
 		if (verbose) {
 			bb_error_msg(INFO"rename: %s/current %s %u", ld->name,
 					ld->fnsave, ld->size);
@@ -301,7 +398,10 @@ static unsigned rotate(struct logdir *ld)
 			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);
-		coe(ld->fdcur);
+		/* we presume this cannot fail */
+		ld->filecur = fdopen(ld->fdcur, "a"); ////
+		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);
@@ -325,7 +425,12 @@ static int buffer_pwrite(int n, char *s, unsigned len)
 		if (len > (ld->sizemax - ld->size))
 			len = ld->sizemax - ld->size;
 	}
-	while ((i = write(ld->fdcur, s, len)) == -1) {
+	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;
@@ -347,7 +452,7 @@ static int buffer_pwrite(int n, char *s, unsigned len)
 					if (strcmp(f->d_name, oldest) < 0)
 						memcpy(oldest, f->d_name, 27);
 				}
-			if (errno) warn2("cannot read directory, want remove old logfile",
+			if (errno) warn2("can't read directory, want remove old logfile",
 					ld->name);
 			closedir(d);
 			errno = ENOSPC;
@@ -357,7 +462,7 @@ static int buffer_pwrite(int n, char *s, unsigned len)
 							ld->name, oldest);
 					errno = 0;
 					if (unlink(oldest) == -1) {
-						warn2("cannot unlink oldest logfile", ld->name);
+						warn2("can't unlink oldest logfile", ld->name);
 						errno = ENOSPC;
 					}
 					while (fchdir(fdwdir) == -1)
@@ -365,7 +470,8 @@ static int buffer_pwrite(int n, char *s, unsigned len)
 				}
 			}
 		}
-		if (errno) pause2cannot("write to current", ld->name);
+		if (errno)
+			pause2cannot("write to current", ld->name);
 	}
 
 	ld->size += i;
@@ -386,11 +492,12 @@ static void logdir_close(struct logdir *ld)
 	ld->fddir = -1;
 	if (ld->fdcur == -1)
 		return; /* impossible */
-	while (fsync(ld->fdcur) == -1)
+	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);
+	////close(ld->fdcur);
+	fclose(ld->filecur);
 	ld->fdcur = -1;
 	if (ld->fdlock == -1)
 		return; /* impossible */
@@ -403,20 +510,22 @@ static void logdir_close(struct logdir *ld)
 static unsigned logdir_open(struct logdir *ld, const char *fn)
 {
 	char buf[128];
-	struct taia now;
+	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("cannot open log directory", (char*)fn);
+		warn2("can't open log directory", (char*)fn);
 		return 0;
 	}
-	coe(ld->fddir);
+	close_on_exec_on(ld->fddir);
 	if (fchdir(ld->fddir) == -1) {
 		logdir_close(ld);
-		warn2("cannot change directory", (char*)fn);
+		warn2("can't change directory", (char*)fn);
 		return 0;
 	}
 	ld->fdlock = open("lock", O_WRONLY|O_NDELAY|O_APPEND|O_CREAT, 0600);
@@ -424,17 +533,17 @@ static unsigned logdir_open(struct logdir *ld, const char *fn)
 	 || (lock_exnb(ld->fdlock) == -1)
 	) {
 		logdir_close(ld);
-		warn2("cannot lock directory", (char*)fn);
+		warn2("can't lock directory", (char*)fn);
 		while (fchdir(fdwdir) == -1)
 			pause1cannot("change to initial working directory");
 		return 0;
 	}
-	coe(ld->fdlock);
+	close_on_exec_on(ld->fdlock);
 
 	ld->size = 0;
 	ld->sizemax = 1000000;
 	ld->nmax = ld->nmin = 10;
-	ld->tmax = 0;
+	ld->rotate_period = 0;
 	ld->name = (char*)fn;
 	ld->ppid = 0;
 	ld->match = '+';
@@ -443,22 +552,26 @@ static unsigned logdir_open(struct logdir *ld, const char *fn)
 
 	/* read config */
 	i = open_read_close("config", buf, sizeof(buf));
-	if (i < 0)
-		warn2("cannot read config", ld->name);
+	if (i < 0 && errno != ENOENT)
+		bb_perror_msg(WARNING"%s/config", ld->name);
 	if (i > 0) {
-		if (verbose) bb_error_msg(INFO"read: %s/config", ld->name);
+		if (verbose)
+			bb_error_msg(INFO"read: %s/config", ld->name);
 		s = buf;
 		while (s) {
 			np = strchr(s, '\n');
-			if (np) *np++ = '\0';
+			if (np)
+				*np++ = '\0';
 			switch (s[0]) {
 			case '+':
 			case '-':
 			case 'e':
 			case 'E':
+				/* Add '\n'-terminated line to ld->inst */
 				while (1) {
-					int l = asprintf(&new, "%s%s\n", ld->inst?:"", s);
-					if (l >= 0 && new) break;
+					int l = asprintf(&new, "%s%s\n", ld->inst ? : "", s);
+					if (l >= 0 && new)
+						break;
 					pause_nomem();
 				}
 				free(ld->inst);
@@ -466,9 +579,9 @@ static unsigned logdir_open(struct logdir *ld, const char *fn)
 				break;
 			case 's': {
 				static const struct suffix_mult km_suffixes[] = {
-						{ "k", 1024 },
-						{ "m", 1024*1024 },
-						{ NULL, 0 }
+					{ "k", 1024 },
+					{ "m", 1024*1024 },
+					{ }
 				};
 				ld->sizemax = xatou_sfx(&s[1], km_suffixes);
 				break;
@@ -481,17 +594,16 @@ static unsigned logdir_open(struct logdir *ld, const char *fn)
 				break;
 			case 't': {
 				static const struct suffix_mult mh_suffixes[] = {
-						{ "m", 60 },
-						{ "h", 60*60 },
-						/*{ "d", 24*60*60 },*/
-						{ NULL, 0 }
+					{ "m", 60 },
+					{ "h", 60*60 },
+					/*{ "d", 24*60*60 },*/
+					{ }
 				};
-				ld->tmax = xatou_sfx(&s[1], mh_suffixes);
-				if (ld->tmax) {
-					taia_uint(&ld->trotate, ld->tmax);
-					taia_add(&ld->trotate, &now, &ld->trotate);
-					if (!tmaxflag || taia_less(&ld->trotate, &trotate))
-						trotate = ld->trotate;
+				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;
@@ -509,7 +621,8 @@ static unsigned logdir_open(struct logdir *ld, const char *fn)
 		s = ld->inst;
 		while (s) {
 			np = strchr(s, '\n');
-			if (np) *np++ = '\0';
+			if (np)
+				*np++ = '\0';
 			s = np;
 		}
 	}
@@ -517,28 +630,29 @@ static unsigned logdir_open(struct logdir *ld, const char *fn)
 	/* open current */
 	i = stat("current", &st);
 	if (i != -1) {
-		if (st.st_size && ! (st.st_mode & S_IXUSR)) {
+		if (st.st_size && !(st.st_mode & S_IXUSR)) {
 			ld->fnsave[25] = '.';
 			ld->fnsave[26] = 'u';
 			ld->fnsave[27] = '\0';
 			do {
-				taia_now(&now);
-				fmt_taia(ld->fnsave, &now);
+				fmt_time_bernstein_25(ld->fnsave);
 				errno = 0;
-			} while ((stat(ld->fnsave, &st) != -1) || (errno != ENOENT));
+				stat(ld->fnsave, &st);
+			} while (errno != ENOENT);
 			while (rename("current", ld->fnsave) == -1)
 				pause2cannot("rename current", ld->name);
 			rmoldest(ld);
 			i = -1;
 		} else {
-			/* Be paranoid: st.st_size can be not just bigger, but WIDER! */
-			/* (bug in original svlogd. remove this comment when fixed there) */
+			/* 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("cannot stat current", ld->name);
+			warn2("can't stat current", ld->name);
 			while (fchdir(fdwdir) == -1)
 				pause1cannot("change to initial working directory");
 			return 0;
@@ -546,15 +660,19 @@ static unsigned logdir_open(struct logdir *ld, const char *fn)
 	}
 	while ((ld->fdcur = open("current", O_WRONLY|O_NDELAY|O_APPEND|O_CREAT, 0600)) == -1)
 		pause2cannot("open current", ld->name);
-	coe(ld->fdcur);
+	/* we presume this cannot fail */
+	ld->filecur = fdopen(ld->fdcur, "a"); ////
+	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;
@@ -562,74 +680,92 @@ static unsigned logdir_open(struct logdir *ld, const char *fn)
 
 static void logdirs_reopen(void)
 {
-	struct taia now;
 	int l;
 	int ok = 0;
 
 	tmaxflag = 0;
-	taia_now(&now);
 	for (l = 0; l < dirn; ++l) {
-		logdir_close(&dir[l]);    
-		if (logdir_open(&dir[l], fndir[l])) ok = 1;
+		logdir_close(&dir[l]);
+		if (logdir_open(&dir[l], fndir[l]))
+			ok = 1;
 	}
-	if (!ok) fatalx("no functional log directories");
+	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)
+static int buffer_pread(/*int fd, */char *s, unsigned len)
 {
-	struct taia now;
+	unsigned now;
+	struct pollfd input;
 	int i;
 
-	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;
-	}
-	taia_now(&now);
-	taia_uint(&trotate, 2744);
-	taia_add(&trotate, &now, &trotate);
-	for (i = 0; i < dirn; ++i)
-		if (dir[i].tmax) {
-			if (taia_less(&dir[i].trotate, &now))
-				rotate(dir+i);
-			if (taia_less(&dir[i].trotate, &trotate))
-				trotate = dir[i].trotate;
+	input.fd = 0;
+	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;
+			}
 		}
 
-	while (1) {
-		/* Comment? */
-		sig_unblock(sig_term);
-		sig_unblock(sig_child);
-		sig_unblock(sig_alarm);
-		sig_unblock(sig_hangup);
-		iopause(&in, 1, &trotate, &now);
-		sig_block(sig_term);
-		sig_block(sig_child);
-		sig_block(sig_alarm);
-		sig_block(sig_hangup);
-		i = safe_read(fd, s, len);
-		if (i >= 0) break;
+		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("cannot read standard input");
+			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;
+		if (!repl)
+			return i;
 
 		cnt = i;
 		while (--cnt >= 0) {
@@ -653,37 +789,39 @@ static int buffer_pread(int fd, char *s, unsigned len)
 	return i;
 }
 
-
-static void sig_term_handler(int sig_no)
+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)
+static void sig_child_handler(int sig_no UNUSED_PARAM)
 {
-	int pid, l;
+	pid_t pid;
+	int l;
 
 	if (verbose)
 		bb_error_msg(INFO"sig%s received", "child");
-	while ((pid = wait_nohang(&wstat)) > 0)
-		for (l = 0; l < dirn; ++l)
+	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)
+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)
+static void sig_hangup_handler(int sig_no UNUSED_PARAM)
 {
 	if (verbose)
 		bb_error_msg(INFO"sig%s received", "hangup");
@@ -714,17 +852,20 @@ static void logmatch(struct logdir *ld)
 	}
 }
 
+int svlogd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int svlogd_main(int argc, char **argv)
 {
-	struct taia now;
 	char *r,*l,*b;
 	ssize_t stdin_cnt = 0;
 	int i;
 	unsigned opt;
 	unsigned timestamp = 0;
+	void* (*memRchr)(const void *, int, size_t) = memchr;
+
+	INIT_G();
 
 	opt_complementary = "tt:vv";
-	opt = getopt32(argc, argv, "r:R:l:b:tv",
+	opt = getopt32(argv, "r:R:l:b:tv",
 			&r, &replace, &l, &b, &timestamp, &verbose);
 	if (opt & 1) { // -r
 		repl = r[0];
@@ -732,86 +873,88 @@ int svlogd_main(int argc, char **argv)
 	}
 	if (opt & 2) if (!repl) repl = '_'; // -R
 	if (opt & 4) { // -l
-		linemax = xatou_range(l, 0, 1000);
-		if (linemax == 0) linemax = 1000;
+		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 & 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;
+	//if (timestamp > 2) timestamp = 2;
 	argv += optind;
 	argc -= optind;
 
 	dirn = argc;
 	if (dirn <= 0) usage();
-	if (buflen <= linemax) usage();
+	////if (buflen <= linemax) usage();
 	fdwdir = xopen(".", O_RDONLY|O_NDELAY);
-	coe(fdwdir);
-	dir = xmalloc(dirn * sizeof(struct logdir));
+	close_on_exec_on(fdwdir);
+	dir = xzalloc(dirn * sizeof(struct logdir));
 	for (i = 0; i < dirn; ++i) {
 		dir[i].fddir = -1;
 		dir[i].fdcur = -1;
-		dir[i].btmp = xmalloc(buflen);
-		dir[i].ppid = 0;
+		////dir[i].btmp = xmalloc(buflen);
+		/*dir[i].ppid = 0;*/
 	}
-	line = xmalloc(linemax + (timestamp ? 26 : 0));
+	/* line = xmalloc(linemax + (timestamp ? 26 : 0)); */
 	fndir = argv;
-	in.fd = 0;
-	in.events = IOPAUSE_READ;
-	ndelay_on(in.fd);
-
-	sig_block(sig_term);
-	sig_block(sig_child);
-	sig_block(sig_alarm);
-	sig_block(sig_hangup);
-	sig_catch(sig_term, sig_term_handler);
-	sig_catch(sig_child, sig_child_handler);
-	sig_catch(sig_alarm, sig_alarm_handler);
-	sig_catch(sig_hangup, sig_hangup_handler);
+	/* 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);
 
 	logdirs_reopen();
 
-	/* Each iteration processes one line */
+	/* Without timestamps, we don't have to print each line
+	 * separately, so we can look for _last_ newline, not first,
+	 * thus batching writes */
+	if (!timestamp)
+		memRchr = memrchr;
+
+	setvbuf(stderr, NULL, _IOFBF, linelen);
+
+	/* Each iteration processes one or more lines */
 	while (1) {
-		int printlen;
-		char *lineptr = line;
+		char stamp[FMT_PTIME];
+		char *lineptr;
+		char *printptr;
 		char *np;
+		int printlen;
 		char ch;
 
-		/* Prepare timestamp if needed */
-		if (timestamp) {
-			char stamp[FMT_PTIME];
-			taia_now(&now);
-			switch (timestamp) {
-			case 1:
-				fmt_taia(stamp, &now);
-				break;
-			default: /* case 2: */
-				fmt_ptime(stamp, &now);
-				break;
-			}
-			memcpy(line, stamp, 25);
-			line[25] = ' ';
+		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 = memchr(lineptr, '\n', stdin_cnt);
-		i = linemax - stdin_cnt; /* avail. bytes at tail */
-		if (i >= 128 && !exitasap && !np) {
-			int sz = buffer_pread(0, lineptr + stdin_cnt, i);
-			if (sz <= 0) /* EOF or error on stdin */
-				exitasap = 1;
-			else {
-				stdin_cnt += sz;
-				np = memchr(lineptr, '\n', stdin_cnt);
+		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)
@@ -819,53 +962,88 @@ int svlogd_main(int argc, char **argv)
 
 		/* Search for '\n' (in fact, np already holds the result) */
 		linelen = stdin_cnt;
-		if (np) linelen = np - lineptr + 1;
+		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];
 
-		printlen = linelen + (timestamp ? 26 : 0);
-		/* write out line[0..printlen-1] to each log destination */
+		/* 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')
-				full_write(2, line, printlen);
+			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, line, printlen);
+			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);
+			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;
-				exitasap = 1;
 				stdin_cnt = 1;
 			} else {
 				linelen = stdin_cnt;
-				np = memchr(lineptr, '\n', stdin_cnt);
-				if (np) linelen = np - lineptr + 1;
+				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(2, lineptr, linelen);
+				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);
 			}
 		}
 
-		/* Move unprocessed data to the front of line */
 		stdin_cnt -= linelen;
-		if (stdin_cnt > 0) /* TODO: slow if buffer is big */
-			memmove(lineptr, &lineptr[linelen], stdin_cnt);
+		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(NULL);////
 	}
 
 	for (i = 0; i < dirn; ++i) {
@@ -874,5 +1052,5 @@ int svlogd_main(int argc, char **argv)
 				/* repeat */;
 		logdir_close(&dir[i]);
 	}
-	_exit(0);
+	return 0;
 }