You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@locus.apache.org on 2000/11/17 20:26:16 UTC
cvs commit: apache-2.0/src/support rotatelogs.c
wrowe 00/11/17 11:26:15
Modified: src/support rotatelogs.c
Log:
Just style nits before someone goes and does something significant.
Submitted by: Victor J. Orlikowski [v.j.orlikowski@gte.net]
Reviewed by: William Rowe
Revision Changes Path
1.10 +44 -44 apache-2.0/src/support/rotatelogs.c
Index: rotatelogs.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/support/rotatelogs.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rotatelogs.c 2000/06/12 23:03:05 1.9
+++ rotatelogs.c 2000/11/17 19:26:15 1.10
@@ -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;