httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@locus.apache.org
Subject cvs commit: apache-1.3/src/support rotatelogs.c
Date Fri, 17 Nov 2000 14:55:39 GMT
wrowe       00/11/17 06:55:39

  Modified:    src/support rotatelogs.c
  Log:
    Cleanup formatting to the style guide prior to real changes.
  
  Submitted by:	Victor J. Orlikowski [v.j.orlikowski@gte.net]
  Reviewed by:	William Rowe
  
  Revision  Changes    Path
  1.13      +44 -44    apache-1.3/src/support/rotatelogs.c
  
  Index: rotatelogs.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/support/rotatelogs.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- rotatelogs.c	2000/06/21 22:54:45	1.12
  +++ rotatelogs.c	2000/11/17 14:55:39	1.13
  @@ -12,9 +12,9 @@
   #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)
  @@ -27,59 +27,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);
  +        }
       }
       /* We never get here, but surpress the compile warning */
       return (0);
  
  
  

Mime
View raw message