--- rotatelogs.c.org	Wed Mar 29 14:12:21 2000
+++ rotatelogs.c	Sat Apr  1 13:45:46 2000
@@ -11,9 +11,15 @@
 #define MAX_PATH	1024
 
 #include "ap_config.h"
+#include <sys/types.h>
+#include <unistd.h>
 #include <time.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <signal.h>
+
+void
+fork_and_compress(int, char *[], char *);
 
 int main (int argc, char **argv)
 {
@@ -21,12 +27,14 @@
     time_t tLogEnd = 0;
     time_t tRotation;
     int nLogFD = -1;
-    int nRead;
+    int nRead, nLog = 0;
     char *szLogRoot;
+    struct sigaction sChild;
 
-    if (argc != 3) {
+    if (argc < 3 || argc > 5) {
 	fprintf(stderr,
-		"%s <logfile> <rotation time in seconds>\n\n",
+		"%s <logfile> <rotation time in seconds> [<path to compressor>"
+		"\n     [<option for compressor>]]\n\n",
 		argv[0]);
 #ifdef OS2
 	fprintf(stderr,
@@ -38,14 +46,28 @@
 		argv[0]);
 #endif
 	fprintf(stderr,
-		"to httpd.conf. The generated name will be /some/where.nnnn "
-		"where nnnn is the\nsystem time at which the log nominally "
-		"starts (N.B. this time will always be a\nmultiple of the "
-		"rotation time, so you can synchronize cron scripts with it).\n"
-		"At the end of each rotation time a new log is started.\n");
+		"to httpd.conf. The generated name will be "
+		"/some/where.yyyyMMdd_hhmmss where\n"
+		"yyyyMMdd_hhmmss is the system time at which the log "
+		"nominally starts.\nyyyyyy is the 4-digit year, MM is "
+		"the 2-digit month, dd is the 2-digit day,\n"
+		"hh is the 2-digit hour (24h clock), mm is the 2-digit "
+		"minute and ss is the\n2-digit second.\n"
+		"At the end of each rotation time a new log is started and"
+		"the old log is\ncompressed with the specified compress "
+		"programm (gzip like program).\n");
 	exit(1);
     }
 
+    sChild.sa_handler = SIG_DFL;
+    sChild.sa_sigaction = NULL;
+#if 0
+    sChild.sa_mask.__bits = 0;
+#endif
+    sChild.sa_flags = SA_NOCLDSTOP | SA_NOCLDWAIT;
+
+    (void)sigaction(SIGCHLD, &sChild, NULL);
+
     szLogRoot = argv[1];
     tRotation = atoi(argv[2]);
     if (tRotation <= 0) {
@@ -55,28 +77,68 @@
 
     for (;;) {
 	nRead = read(0, buf, sizeof buf);
-	if (nRead == 0)
+	if (nRead == 0) {
+	    if (argc >= 4 && nLog == 1) {
+	        fork_and_compress(argc, argv, buf2);
+	    }
 	    exit(3);
+	}
 	if (nRead < 0)
-	    if (errno != EINTR)
+	    if (errno != EINTR) {
+	        if (argc >= 4 && nLog == 1) {
+		    fork_and_compress(argc, argv, buf2);
+		}
 		exit(4);
+	    }
 	if (nLogFD >= 0 && (time(NULL) >= tLogEnd || nRead < 0)) {
 	    close(nLogFD);
 	    nLogFD = -1;
+	    if (argc >= 4 && nLog == 1) {
+	        fork_and_compress(argc, argv, buf2);
+	    }
 	}
 	if (nLogFD < 0) {
-	    time_t tLogStart = (time(NULL) / tRotation) * tRotation;
-	    sprintf(buf2, "%s.%010d", szLogRoot, (int) tLogStart);
+	    time_t tLogStart = time(NULL);
+	    struct tm *tmLogStart = localtime(&tLogStart);
+	    snprintf(buf2, MAX_PATH, "%s.%04d%02d%02d_%02d%02d%02d", szLogRoot,
+		     tmLogStart->tm_year + 1900,
+		     tmLogStart->tm_mon + 1,
+		     tmLogStart->tm_mday,
+		     tmLogStart->tm_hour,
+		     tmLogStart->tm_min,
+		     tmLogStart->tm_sec);
 	    tLogEnd = tLogStart + tRotation;
-	    nLogFD = open(buf2, O_WRONLY | O_CREAT | O_APPEND, 0666);
+	    nLogFD = open(buf2, O_WRONLY | O_CREAT | O_APPEND | O_EXCL, 0660);
 	    if (nLogFD < 0) {
 		perror(buf2);
 		exit(2);
 	    }
+	    nLog = 1;
 	}
 	if (write(nLogFD, buf, nRead) != nRead) {
 	    perror(buf2);
 	    exit(5);
 	}
+    }
+}
+
+void
+fork_and_compress(int argc, char *argv[], char *buf2)
+{
+    pid_t who = fork();
+
+    if (who < 0) {
+        perror("fork failed, unable to compress");
+    } else {
+      if (who != 0) /* do nothing */;
+      else {
+	  execl(argv[3], argv[3],
+		(argc == 5 ? argv[4] : buf2),
+		(argc == 5 ? buf2 : NULL),
+		NULL);
+	  perror("exec of compressor");
+	  /* point of no return */
+	  exit(100);
+      }
     }
 }