httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Victor J. Orlikowski" <v.j.orlikow...@gte.net>
Subject [PATCH] 2.0 rotatelogs style patch
Date Fri, 17 Nov 2000 18:40:54 GMT
The corresponding 2.0 style patch for rotatelogs.

Index: src/support/rotatelogs.c
===================================================================
RCS file: /cvs/apache/apache-2.0/src/support/rotatelogs.c,v
retrieving revision 1.9
diff -u -d -r1.9 rotatelogs.c
--- rotatelogs.c	2000/06/12 23:03:05	1.9
+++ rotatelogs.c	2000/11/17 18:41:25
@@ -71,10 +71,10 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#define BUFSIZE		65536
+#define BUFSIZE         65536
 
 #ifndef MAX_PATH
-#define MAX_PATH	1024
+#define MAX_PATH        1024
 #endif
 
 int main (int argc, char *argv[])
@@ -87,59 +87,59 @@
     char *szLogRoot;
 
     if (argc != 3) {
-	fprintf(stderr,
-		"%s <logfile> <rotation time in seconds>\n\n",
-		argv[0]);
+        fprintf(stderr,
+                "%s <logfile> <rotation time in seconds>\n\n",
+                argv[0]);
 #ifdef OS2
-	fprintf(stderr,
-		"Add this:\n\nTransferLog \"|%s.exe /some/where 86400\"\n\n",
-		argv[0]);
+        fprintf(stderr,
+                "Add this:\n\nTransferLog \"|%s.exe /some/where 86400\"\n\n",
+                argv[0]);
 #else
-	fprintf(stderr,
-		"Add this:\n\nTransferLog \"|%s /some/where 86400\"\n\n",
-		argv[0]);
+        fprintf(stderr,
+                "Add this:\n\nTransferLog \"|%s /some/where 86400\"\n\n",
+                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");
-	exit(1);
+        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");
+        exit(1);
     }
 
     szLogRoot = argv[1];
     tRotation = atoi(argv[2]);
     if (tRotation <= 0) {
-	fprintf(stderr, "Rotation time must be > 0\n");
-	exit(6);
+        fprintf(stderr, "Rotation time must be > 0\n");
+        exit(6);
     }
 
     for (;;) {
-	nRead = read(0, buf, sizeof buf);
-	if (nRead == 0)
-	    exit(3);
-	if (nRead < 0)
-	    if (errno != EINTR)
-		exit(4);
-	if (nLogFD >= 0 && (time(NULL) >= tLogEnd || nRead < 0)) {
-	    close(nLogFD);
-	    nLogFD = -1;
-	}
-	if (nLogFD < 0) {
-	    time_t tLogStart = (time(NULL) / tRotation) * tRotation;
-	    sprintf(buf2, "%s.%010d", szLogRoot, (int) tLogStart);
-	    tLogEnd = tLogStart + tRotation;
-	    nLogFD = open(buf2, O_WRONLY | O_CREAT | O_APPEND, 0666);
-	    if (nLogFD < 0) {
-		perror(buf2);
-		exit(2);
-	    }
-	}
-	if (write(nLogFD, buf, nRead) != nRead) {
-	    perror(buf2);
-	    exit(5);
-	}
+        nRead = read(0, buf, sizeof buf);
+        if (nRead == 0)
+            exit(3);
+        if (nRead < 0)
+            if (errno != EINTR)
+                exit(4);
+        if (nLogFD >= 0 && (time(NULL) >= tLogEnd || nRead < 0)) {
+            close(nLogFD);
+            nLogFD = -1;
+        }
+        if (nLogFD < 0) {
+            time_t tLogStart = (time(NULL) / tRotation) * tRotation;
+            sprintf(buf2, "%s.%010d", szLogRoot, (int) tLogStart);
+            tLogEnd = tLogStart + tRotation;
+            nLogFD = open(buf2, O_WRONLY | O_CREAT | O_APPEND, 0666);
+            if (nLogFD < 0) {
+                perror(buf2);
+                exit(2);
+            }
+        }
+        if (write(nLogFD, buf, nRead) != nRead) {
+            perror(buf2);
+            exit(5);
+        }
     }
     /* Of course we never, but prevent compiler warnings */
     return 0;

Victor
-- 
Victor J. Orlikowski
======================
v.j.orlikowski@gte.net
vjo@raleigh.ibm.com
vjo@us.ibm.com


Mime
View raw message