httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aa...@apache.org
Subject cvs commit: httpd-2.0/server log.c
Date Tue, 18 Dec 2001 19:42:20 GMT
aaron       01/12/18 11:42:20

  Modified:    server   log.c
  Log:
  Style and formatting changes only. Removed tabs, reduced long lines,
  aligned parameters, added braces around some single-statement basic
  blocks.
  
  Revision  Changes    Path
  1.100     +236 -217  httpd-2.0/server/log.c
  
  Index: log.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/log.c,v
  retrieving revision 1.99
  retrieving revision 1.100
  diff -u -r1.99 -r1.100
  --- log.c	2001/10/29 22:56:42	1.99
  +++ log.c	2001/12/18 19:42:20	1.100
  @@ -92,8 +92,8 @@
   #include "http_main.h"
   
   typedef struct {
  -	char	*t_name;
  -	int	t_val;
  +    char    *t_name;
  +    int      t_val;
   } TRANS;
   
   APR_HOOK_STRUCT(
  @@ -103,78 +103,78 @@
   #ifdef HAVE_SYSLOG
   
   static const TRANS facilities[] = {
  -    {"auth",	LOG_AUTH},
  +    {"auth",    LOG_AUTH},
   #ifdef LOG_AUTHPRIV
       {"authpriv",LOG_AUTHPRIV},
   #endif
   #ifdef LOG_CRON
  -    {"cron", 	LOG_CRON},
  +    {"cron",    LOG_CRON},
   #endif
   #ifdef LOG_DAEMON
  -    {"daemon",	LOG_DAEMON},
  +    {"daemon",  LOG_DAEMON},
   #endif
   #ifdef LOG_FTP
  -    {"ftp",	LOG_FTP},
  +    {"ftp", LOG_FTP},
   #endif
   #ifdef LOG_KERN
  -    {"kern",	LOG_KERN},
  +    {"kern",    LOG_KERN},
   #endif
   #ifdef LOG_LPR
  -    {"lpr",	LOG_LPR},
  +    {"lpr", LOG_LPR},
   #endif
   #ifdef LOG_MAIL
  -    {"mail",	LOG_MAIL},
  +    {"mail",    LOG_MAIL},
   #endif
   #ifdef LOG_NEWS
  -    {"news",	LOG_NEWS},
  +    {"news",    LOG_NEWS},
   #endif
   #ifdef LOG_SYSLOG
  -    {"syslog",	LOG_SYSLOG},
  +    {"syslog",  LOG_SYSLOG},
   #endif
   #ifdef LOG_USER
  -    {"user",	LOG_USER},
  +    {"user",    LOG_USER},
   #endif
   #ifdef LOG_UUCP
  -    {"uucp",	LOG_UUCP},
  +    {"uucp",    LOG_UUCP},
   #endif
   #ifdef LOG_LOCAL0
  -    {"local0",	LOG_LOCAL0},
  +    {"local0",  LOG_LOCAL0},
   #endif
   #ifdef LOG_LOCAL1
  -    {"local1",	LOG_LOCAL1},
  +    {"local1",  LOG_LOCAL1},
   #endif
   #ifdef LOG_LOCAL2
  -    {"local2",	LOG_LOCAL2},
  +    {"local2",  LOG_LOCAL2},
   #endif
   #ifdef LOG_LOCAL3
  -    {"local3",	LOG_LOCAL3},
  +    {"local3",  LOG_LOCAL3},
   #endif
   #ifdef LOG_LOCAL4
  -    {"local4",	LOG_LOCAL4},
  +    {"local4",  LOG_LOCAL4},
   #endif
   #ifdef LOG_LOCAL5
  -    {"local5",	LOG_LOCAL5},
  +    {"local5",  LOG_LOCAL5},
   #endif
   #ifdef LOG_LOCAL6
  -    {"local6",	LOG_LOCAL6},
  +    {"local6",  LOG_LOCAL6},
   #endif
   #ifdef LOG_LOCAL7
  -    {"local7",	LOG_LOCAL7},
  +    {"local7",  LOG_LOCAL7},
   #endif
  -    {NULL,		-1},
  +    {NULL,      -1},
   };
   #endif
   
   static const TRANS priorities[] = {
  -    {"emerg",	APLOG_EMERG},
  -    {"alert",	APLOG_ALERT},
  -    {"crit",	APLOG_CRIT},
  -    {"error",	APLOG_ERR},
  -    {"warn",	APLOG_WARNING},
  -    {"notice",	APLOG_NOTICE},
  -    {"info",	APLOG_INFO},
  -    {"debug",	APLOG_DEBUG},
  -    {NULL,	-1},
  +    {"emerg",   APLOG_EMERG},
  +    {"alert",   APLOG_ALERT},
  +    {"crit",    APLOG_CRIT},
  +    {"error",   APLOG_ERR},
  +    {"warn",    APLOG_WARNING},
  +    {"notice",  APLOG_NOTICE},
  +    {"info",    APLOG_INFO},
  +    {"debug",   APLOG_DEBUG},
  +    {NULL,      -1},
   };
   
   static apr_file_t *stderr_log;
  @@ -202,17 +202,17 @@
   
       if (((rc = apr_procattr_create(&procattr, p)) == APR_SUCCESS) &&
           ((rc = apr_procattr_io_set(procattr,
  -                                  APR_FULL_BLOCK,
  -                                  APR_NO_PIPE,
  -                                  APR_NO_PIPE)) == APR_SUCCESS)) {
  +                                   APR_FULL_BLOCK,
  +                                   APR_NO_PIPE,
  +                                   APR_NO_PIPE)) == APR_SUCCESS)) {
           char **args;
           const char *pname;
           
           apr_tokenize_to_argv(progname, &args, p);
           pname = apr_pstrdup(p, args[0]);
  -        procnew = (apr_proc_t *) apr_pcalloc(p, sizeof(*procnew));
  +        procnew = (apr_proc_t *)apr_pcalloc(p, sizeof(*procnew));
           rc = apr_proc_create(procnew, pname, (const char * const *)args,
  -                                NULL, procattr, p);
  +                             NULL, procattr, p);
       
           if (rc == APR_SUCCESS) {
               apr_pool_note_subprocess(p, procnew, kill_after_timeout);
  @@ -220,7 +220,7 @@
           }
       }
   
  -    return(rc);
  +    return rc;
   }
   
   static void open_error_log(server_rec *s, apr_pool_t *p)
  @@ -229,51 +229,52 @@
       int rc;
   
       if (*s->error_fname == '|') {
  -	apr_file_t *dummy = NULL;
  +        apr_file_t *dummy = NULL;
   
           /* This starts a new process... */
  -        rc = log_child (p, s->error_fname+1, &dummy);
  +        rc = log_child (p, s->error_fname + 1, &dummy);
           if (rc != APR_SUCCESS) {
  -	    ap_log_error(APLOG_MARK, APLOG_STARTUP, rc, NULL, 
  +            ap_log_error(APLOG_MARK, APLOG_STARTUP, rc, NULL, 
                            "Couldn't start ErrorLog process");
               exit(1);
  -	}
  +        }
   
           s->error_log = dummy;
       }
   
   #ifdef HAVE_SYSLOG
       else if (!strncasecmp(s->error_fname, "syslog", 6)) {
  -	if ((fname = strchr(s->error_fname, ':'))) {
  -	    const TRANS *fac;
  +        if ((fname = strchr(s->error_fname, ':'))) {
  +            const TRANS *fac;
   
  -	    fname++;
  -	    for (fac = facilities; fac->t_name; fac++) {
  -		if (!strcasecmp(fname, fac->t_name)) {
  -		    openlog(ap_server_argv0, LOG_NDELAY|LOG_CONS|LOG_PID,
  -			    fac->t_val);
  -		    s->error_log = NULL;
  -		    return;
  -		}
  -	    }
  -	}
  -	else
  -	    openlog(ap_server_argv0, LOG_NDELAY|LOG_CONS|LOG_PID, LOG_LOCAL7);
  +            fname++;
  +            for (fac = facilities; fac->t_name; fac++) {
  +                if (!strcasecmp(fname, fac->t_name)) {
  +                    openlog(ap_server_argv0, LOG_NDELAY|LOG_CONS|LOG_PID,
  +                            fac->t_val);
  +                    s->error_log = NULL;
  +                    return;
  +                }
  +            }
  +        }
  +        else {
  +            openlog(ap_server_argv0, LOG_NDELAY|LOG_CONS|LOG_PID, LOG_LOCAL7);
  +        }
   
  -	s->error_log = NULL;
  +        s->error_log = NULL;
       }
   #endif
       else {
  -	fname = ap_server_root_relative(p, s->error_fname);
  +        fname = ap_server_root_relative(p, s->error_fname);
           rc = apr_file_open(&s->error_log, fname, 
  -                      APR_APPEND | APR_READ | APR_WRITE | APR_CREATE,
  -                      APR_OS_DEFAULT, p);
  +                           APR_APPEND | APR_READ | APR_WRITE | APR_CREATE,
  +                           APR_OS_DEFAULT, p);
           if (rc != APR_SUCCESS) {
               ap_log_error(APLOG_MARK, APLOG_STARTUP, rc, NULL, 
                            "%s: could not open error log file %s.",
  -		         ap_server_argv0, fname);
  +            ap_server_argv0, fname);
               exit(1);
  -	}
  +        }
           apr_file_set_inherit(s->error_log);
       }
   }
  @@ -292,7 +293,8 @@
           /* replace stderr with this new log */
           apr_file_flush(s_main->error_log);
           apr_file_open_stderr(&errfile, p);        
  -        if ((rc = apr_file_dup(&errfile, s_main->error_log, p)) != APR_SUCCESS)
{
  +        rc = apr_file_dup(&errfile, s_main->error_log, p);
  +        if (rc != APR_SUCCESS) {
               ap_log_error(APLOG_MARK, APLOG_CRIT, rc, s_main,
                            "unable to replace stderr with error_log");
           } else {
  @@ -304,23 +306,28 @@
        * of the submitter.
        */
       if (replace_stderr && freopen("/dev/null", "w", stderr) == NULL) {
  -	ap_log_error(APLOG_MARK, APLOG_CRIT, errno, s_main,
  -	    "unable to replace stderr with /dev/null");
  +        ap_log_error(APLOG_MARK, APLOG_CRIT, errno, s_main,
  +                     "unable to replace stderr with /dev/null");
       }
   
       for (virt = s_main->next; virt; virt = virt->next) {
  -	if (virt->error_fname) {
  -	    for (q=s_main; q != virt; q = q->next)
  -		if (q->error_fname != NULL &&
  -		    strcmp(q->error_fname, virt->error_fname) == 0)
  -		    break;
  -	    if (q == virt)
  -		open_error_log(virt, p);
  -	    else 
  -		virt->error_log = q->error_log;
  -	}
  -	else
  -	    virt->error_log = s_main->error_log;
  +        if (virt->error_fname) {
  +            for (q=s_main; q != virt; q = q->next) {
  +                if (q->error_fname != NULL &&
  +                    strcmp(q->error_fname, virt->error_fname) == 0) {
  +                        break;
  +                }
  +            }
  +            if (q == virt) {
  +                open_error_log(virt, p);
  +            }
  +            else {
  +                virt->error_log = q->error_log;
  +            }
  +        }
  +        else {
  +            virt->error_log = s_main->error_log;
  +        }
       }
   }
   
  @@ -345,127 +352,133 @@
       int level_and_mask = level & APLOG_LEVELMASK;
   
       if (s == NULL) {
  -	/*
  -	 * If we are doing stderr logging (startup), don't log messages that are
  -	 * above the default server log level unless it is a startup/shutdown
  -	 * notice
  -	 */
  -	if ((level_and_mask != APLOG_NOTICE) &&
  -	    (level_and_mask > DEFAULT_LOGLEVEL))
  -	    return;
  +        /*
  +         * If we are doing stderr logging (startup), don't log messages that are
  +         * above the default server log level unless it is a startup/shutdown
  +         * notice
  +         */
  +        if ((level_and_mask != APLOG_NOTICE) &&
  +            (level_and_mask > DEFAULT_LOGLEVEL)) {
  +            return;
  +        }
           logf = stderr_log;
       }
       else if (s->error_log) {
  -	/*
  -	 * If we are doing normal logging, don't log messages that are
  -	 * above the server log level unless it is a startup/shutdown notice
  -	 */
  -	if ((level_and_mask != APLOG_NOTICE) && 
  -	    (level_and_mask > s->loglevel))
  -	    return;
  -	logf = s->error_log;
  +        /*
  +         * If we are doing normal logging, don't log messages that are
  +         * above the server log level unless it is a startup/shutdown notice
  +         */
  +        if ((level_and_mask != APLOG_NOTICE) && 
  +            (level_and_mask > s->loglevel)) {
  +            return;
  +        }
  +        logf = s->error_log;
       }
   #ifdef TPF
       else if (tpf_child) {
  -    /*
  -     * If we are doing normal logging, don't log messages that are
  -     * above the server log level unless it is a startup/shutdown notice
  -     */
  -    if ((level_and_mask != APLOG_NOTICE) &&
  -        (level_and_mask > s->loglevel))
  -        return;
  -    logf = stderr;
  +        /*
  +         * If we are doing normal logging, don't log messages that are
  +         * above the server log level unless it is a startup/shutdown notice
  +         */
  +        if ((level_and_mask != APLOG_NOTICE) &&
  +            (level_and_mask > s->loglevel)) {
  +            return;
  +        }
  +        logf = stderr;
       }
   #endif /* TPF */
       else {
  -	/*
  -	 * If we are doing syslog logging, don't log messages that are
  -	 * above the server log level (including a startup/shutdown notice)
  -	 */
  -	if (level_and_mask > s->loglevel)
  -	    return;
  +        /*
  +         * If we are doing syslog logging, don't log messages that are
  +         * above the server log level (including a startup/shutdown notice)
  +         */
  +        if (level_and_mask > s->loglevel) {
  +            return;
  +        }
       }
   
       if (logf && ((level & APLOG_STARTUP) != APLOG_STARTUP)) {
  -	errstr[0] = '[';
  -	apr_ctime(errstr + 1, apr_time_now());
  -	errstr[1 + APR_CTIME_LEN - 1] = ']';
  -	errstr[1 + APR_CTIME_LEN    ] = ' ';
  -	len = 1 + APR_CTIME_LEN + 1;
  +        errstr[0] = '[';
  +        apr_ctime(errstr + 1, apr_time_now());
  +        errstr[1 + APR_CTIME_LEN - 1] = ']';
  +        errstr[1 + APR_CTIME_LEN    ] = ' ';
  +        len = 1 + APR_CTIME_LEN + 1;
       } else {
  -	len = 0;
  +        len = 0;
       }
   
       if ((level & APLOG_STARTUP) != APLOG_STARTUP) {
           len += apr_snprintf(errstr + len, MAX_STRING_LEN - len,
  -	        "[%s] ", priorities[level_and_mask].t_name);
  +                            "[%s] ", priorities[level_and_mask].t_name);
       }
   #ifndef TPF
       if (file && level_and_mask == APLOG_DEBUG) {
   #ifdef _OSD_POSIX
  -	char tmp[256];
  -	char *e = strrchr(file, '/');
  +        char tmp[256];
  +        char *e = strrchr(file, '/');
   
  -	/* In OSD/POSIX, the compiler returns for __FILE__
  -	 * a string like: __FILE__="*POSIX(/usr/include/stdio.h)"
  -	 * (it even returns an absolute path for sources in
  -	 * the current directory). Here we try to strip this
  -	 * down to the basename.
  -	 */
  -	if (e != NULL && e[1] != '\0') {
  -	    apr_snprintf(tmp, sizeof(tmp), "%s", &e[1]);
  -	    e = &tmp[strlen(tmp)-1];
  -	    if (*e == ')')
  -		*e = '\0';
  -	    file = tmp;
  -	}
  +        /* In OSD/POSIX, the compiler returns for __FILE__
  +         * a string like: __FILE__="*POSIX(/usr/include/stdio.h)"
  +         * (it even returns an absolute path for sources in
  +         * the current directory). Here we try to strip this
  +         * down to the basename.
  +         */
  +        if (e != NULL && e[1] != '\0') {
  +            apr_snprintf(tmp, sizeof(tmp), "%s", &e[1]);
  +            e = &tmp[strlen(tmp)-1];
  +            if (*e == ')') {
  +                *e = '\0';
  +            }
  +            file = tmp;
  +        }
   #endif /*_OSD_POSIX*/
  -	len += apr_snprintf(errstr + len, MAX_STRING_LEN - len,
  -		"%s(%d): ", file, line);
  +        len += apr_snprintf(errstr + len, MAX_STRING_LEN - len,
  +                            "%s(%d): ", file, line);
       }
   #endif /* TPF */
       if (r && r->connection) {
  -	/* XXX: TODO: add a method of selecting whether logged client
  -	 * addresses are in dotted quad or resolved form... dotted
  -	 * quad is the most secure, which is why I'm implementing it
  -	 * first. -djg
  -	 */
  -	len += apr_snprintf(errstr + len, MAX_STRING_LEN - len,
  -		"[client %s] ", r->connection->remote_ip);
  +        /* XXX: TODO: add a method of selecting whether logged client
  +         * addresses are in dotted quad or resolved form... dotted
  +         * quad is the most secure, which is why I'm implementing it
  +         * first. -djg
  +         */
  +        len += apr_snprintf(errstr + len, MAX_STRING_LEN - len,
  +                            "[client %s] ", r->connection->remote_ip);
       }
  -    if (!(level & APLOG_NOERRNO)
  -	&& (status != 0)) {
  +    if (!(level & APLOG_NOERRNO) && (status != 0)) {
           char buf[120];
  -	len += apr_snprintf(errstr + len, MAX_STRING_LEN - len,
  -		"(%d)%s: ", status, apr_strerror(status, buf, sizeof(buf)));
  +        len += apr_snprintf(errstr + len, MAX_STRING_LEN - len,
  +                            "(%d)%s: ", status,
  +                            apr_strerror(status, buf, sizeof(buf)));
       }
       errstrlen = len;
       len += apr_vsnprintf(errstr + len, MAX_STRING_LEN - len, fmt, args);
   
       if (r && (referer = apr_table_get(r->headers_in, "Referer"))) {
           len += apr_snprintf(errstr + len, MAX_STRING_LEN - len,
  -                ", referer: %s", referer);
  +                            ", referer: %s", referer);
       }
   
       /* NULL if we are logging to syslog */
       if (logf) {
           /* Truncate for the terminator (as apr_snprintf does) */
  -        if (len > MAX_STRING_LEN - sizeof(APR_EOL_STR))
  +        if (len > MAX_STRING_LEN - sizeof(APR_EOL_STR)) {
               len = MAX_STRING_LEN - sizeof(APR_EOL_STR);
  +        }
           strcpy(errstr + len, APR_EOL_STR);
           apr_file_puts(errstr, logf);
  -	apr_file_flush(logf);
  +        apr_file_flush(logf);
       }
   #ifdef HAVE_SYSLOG
       else {
  -	syslog(level_and_mask, "%s", errstr);
  +        syslog(level_and_mask, "%s", errstr);
       }
   #endif
       ap_run_error_log(file, line, level, status, s, r, pool, errstr + errstrlen);
   }
       
   AP_DECLARE(void) ap_log_error(const char *file, int line, int level,
  -			      apr_status_t status, const server_rec *s, 
  +                              apr_status_t status, const server_rec *s, 
                                 const char *fmt, ...)
   {
       va_list args;
  @@ -476,8 +489,8 @@
   }
   
   AP_DECLARE(void) ap_log_perror(const char *file, int line, int level,
  -			      apr_status_t status, apr_pool_t *p, 
  -                              const char *fmt, ...)
  +                               apr_status_t status, apr_pool_t *p, 
  +                               const char *fmt, ...)
   {
       va_list args;
   
  @@ -487,7 +500,7 @@
   }
   
   AP_DECLARE(void) ap_log_rerror(const char *file, int line, int level,
  -			       apr_status_t status, const request_rec *r, 
  +                               apr_status_t status, const request_rec *r, 
                                  const char *fmt, ...)
   {
       va_list args;
  @@ -505,10 +518,10 @@
       va_end(args);
       va_start(args,fmt); 
       if (((level & APLOG_LEVELMASK) <= APLOG_WARNING)
  -	&& (apr_table_get(r->notes, "error-notes") == NULL)) {
  -	apr_table_setn(r->notes, "error-notes",
  -		      ap_escape_html(r->pool, apr_pvsprintf(r->pool, fmt, 
  -		      args)));
  +        && (apr_table_get(r->notes, "error-notes") == NULL)) {
  +        apr_table_setn(r->notes, "error-notes",
  +                       ap_escape_html(r->pool, apr_pvsprintf(r->pool, fmt, 
  +                                                             args)));
       }
       va_end(args);
   }
  @@ -522,33 +535,34 @@
       apr_status_t rv;
   
       if (!fname) 
  -	return;
  +    return;
   
       fname = ap_server_root_relative(p, fname);
       mypid = getpid();
       if (mypid != saved_pid 
  -         && apr_stat(&finfo, fname, APR_FINFO_MTIME, p) == APR_SUCCESS) {
  -      /* AP_SIG_GRACEFUL and HUP call this on each restart.
  -       * Only warn on first time through for this pid.
  -       *
  -       * XXX: Could just write first time through too, although
  -       *      that may screw up scripts written to do something
  -       *      based on the last modification time of the pid file.
  -       */
  +        && apr_stat(&finfo, fname, APR_FINFO_MTIME, p) == APR_SUCCESS) {
  +        /* AP_SIG_GRACEFUL and HUP call this on each restart.
  +         * Only warn on first time through for this pid.
  +         *
  +         * XXX: Could just write first time through too, although
  +         *      that may screw up scripts written to do something
  +         *      based on the last modification time of the pid file.
  +         */
           ap_log_perror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, p,
  -		     apr_psprintf(p,
  -                                 "pid file %s overwritten -- Unclean shutdown of previous
Apache run?",
  -                     fname)
  -			       );
  +                      apr_psprintf(p, "pid file %s overwritten -- Unclean "
  +                                   "shutdown of previous Apache run?",
  +                                   fname));
       }
   
  -    if ((rv = apr_file_open(&pid_file, fname, APR_WRITE | APR_CREATE | APR_TRUNCATE,
  -                      APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD, p)) != APR_SUCCESS)
{
  +    if ((rv = apr_file_open(&pid_file, fname,
  +                            APR_WRITE | APR_CREATE | APR_TRUNCATE,
  +                            APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD, p))
  +        != APR_SUCCESS) {
           ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL, 
                        "could not create %s", fname);
           ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, NULL, 
                        "%s: could not log pid to file %s",
  -		     ap_server_argv0, fname);
  +                     ap_server_argv0, fname);
           exit(1);
       }
       apr_file_printf(pid_file, "%ld" APR_EOL_STR, (long)mypid);
  @@ -556,14 +570,15 @@
       saved_pid = mypid;
   }
   
  -AP_DECLARE(void) ap_log_assert(const char *szExp, const char *szFile, int nLine)
  +AP_DECLARE(void) ap_log_assert(const char *szExp, const char *szFile,
  +                               int nLine)
   {
       char time_str[APR_CTIME_LEN];
   
       apr_ctime(time_str, apr_time_now());
       ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
                    "[%s] file %s, line %d, assertion \"%s\" failed",
  -	         time_str, szFile, nLine, szExp);
  +                 time_str, szFile, nLine, szExp);
   #if !defined(WIN32) && !defined(NETWARE)
       /* unix assert does an abort leading to a core dump */
       abort();
  @@ -589,13 +604,15 @@
       apr_signal(SIGHUP, SIG_IGN);
   #endif
       if (((status = apr_procattr_create(&procattr, pl->p)) != APR_SUCCESS) ||
  -        ((status = apr_procattr_child_in_set(procattr, ap_piped_log_read_fd(pl), 
  -                                ap_piped_log_write_fd(pl)))  != APR_SUCCESS)) {
  +        ((status = apr_procattr_child_in_set(procattr,
  +                                             ap_piped_log_read_fd(pl), 
  +                                             ap_piped_log_write_fd(pl)))
  +        != APR_SUCCESS)) {
           char buf[120];
           /* Something bad happened, give up and go away. */
  -	ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
  -	    "piped_log_spawn: unable to setup child process '%s': %s",
  -	    pl->program, apr_strerror(status, buf, sizeof(buf)));
  +        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
  +                     "piped_log_spawn: unable to setup child process '%s': %s",
  +                     pl->program, apr_strerror(status, buf, sizeof(buf)));
           rc = -1;
       }
       else {
  @@ -606,7 +623,7 @@
           pname = apr_pstrdup(pl->p, args[0]);
           procnew = apr_pcalloc(pl->p, sizeof(apr_proc_t));
           rc = apr_proc_create(procnew, pname, (const char * const *) args,
  -                                NULL, procattr, pl->p);
  +                             NULL, procattr, pl->p);
       
           if (rc == APR_SUCCESS) {            
               /* pjr - This no longer happens inside the child, */
  @@ -616,7 +633,7 @@
               pl->pid = procnew;
               ap_piped_log_write_fd(pl) = procnew->in;
               apr_proc_other_child_register(procnew, piped_log_maintenance, pl, 
  -                                    ap_piped_log_write_fd(pl), pl->p);
  +                                          ap_piped_log_write_fd(pl), pl->p);
           }
       }
       
  @@ -631,44 +648,44 @@
   
       switch (reason) {
       case APR_OC_REASON_DEATH:
  -	pl->pid = NULL;
  -	apr_proc_other_child_unregister(pl);
  -	if (pl->program == NULL) {
  -	    /* during a restart */
  -	    break;
  -	}
  +        pl->pid = NULL;
  +        apr_proc_other_child_unregister(pl);
  +        if (pl->program == NULL) {
  +            /* during a restart */
  +            break;
  +        }
           break;
       case APR_OC_REASON_LOST:
  -	pl->pid = NULL;
  -	apr_proc_other_child_unregister(pl);
  -	if (pl->program == NULL) {
  -	    /* during a restart */
  -	    break;
  -	}
  -	if ((stats = piped_log_spawn(pl)) != APR_SUCCESS) {
  -	    /* what can we do?  This could be the error log we're having
  -	     * problems opening up... */
  +        pl->pid = NULL;
  +        apr_proc_other_child_unregister(pl);
  +        if (pl->program == NULL) {
  +            /* during a restart */
  +            break;
  +        }
  +        if ((stats = piped_log_spawn(pl)) != APR_SUCCESS) {
  +            /* what can we do?  This could be the error log we're having
  +             * problems opening up... */
               char buf[120];
  -	    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
  -		"piped_log_maintenance: unable to respawn '%s': %s",
  -		pl->program, apr_strerror(stats, buf, sizeof(buf)));
  -	}
  -	break;
  +            ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL,
  +                         "piped_log_maintenance: unable to respawn '%s': %s",
  +                         pl->program, apr_strerror(stats, buf, sizeof(buf)));
  +        }
  +        break;
       
       case APR_OC_REASON_UNWRITABLE:
           /* We should not kill off the pipe here, since it may only be full.
            * If it really is locked, we should kill it off manually. */
  -	break;
  +    break;
       
       case APR_OC_REASON_RESTART:
  -	pl->program = NULL;
  -	if (pl->pid != NULL) {
  -	    apr_proc_kill(pl->pid, SIGTERM);
  -	}
  -	break;
  +        pl->program = NULL;
  +        if (pl->pid != NULL) {
  +            apr_proc_kill(pl->pid, SIGTERM);
  +        }
  +        break;
   
       case APR_OC_REASON_UNREGISTER:
  -	break;
  +        break;
       }
   }
   
  @@ -678,7 +695,7 @@
       piped_log *pl = data;
   
       if (pl->pid != NULL) {
  -	apr_proc_kill(pl->pid, SIGTERM);
  +        apr_proc_kill(pl->pid, SIGTERM);
       }
       apr_file_close(ap_piped_log_read_fd(pl));
       apr_file_close(ap_piped_log_write_fd(pl));
  @@ -703,17 +720,19 @@
       pl->p = p;
       pl->program = apr_pstrdup(p, program);
       pl->pid = NULL;
  -    if (apr_file_pipe_create(&ap_piped_log_read_fd(pl), &ap_piped_log_write_fd(pl),
p) != APR_SUCCESS) {
  -	return NULL;
  +    if (apr_file_pipe_create(&ap_piped_log_read_fd(pl),
  +                             &ap_piped_log_write_fd(pl), p) != APR_SUCCESS) {
  +        return NULL;
       }
  -    apr_pool_cleanup_register(p, pl, piped_log_cleanup, piped_log_cleanup_for_exec);
  +    apr_pool_cleanup_register(p, pl, piped_log_cleanup,
  +                              piped_log_cleanup_for_exec);
       if (piped_log_spawn(pl) == -1) {
  -	int save_errno = errno;
  -	apr_pool_cleanup_kill(p, pl, piped_log_cleanup);
  -	apr_file_close(ap_piped_log_read_fd(pl));
  -	apr_file_close(ap_piped_log_write_fd(pl));
  -	errno = save_errno;
  -	return NULL;
  +        int save_errno = errno;
  +        apr_pool_cleanup_kill(p, pl, piped_log_cleanup);
  +        apr_file_close(ap_piped_log_read_fd(pl));
  +        apr_file_close(ap_piped_log_write_fd(pl));
  +        errno = save_errno;
  +        return NULL;
       }
       return pl;
   }
  @@ -736,9 +755,9 @@
   
       rc = log_child(p, program, &dummy);
       if (rc != APR_SUCCESS) {
  -	ap_log_error(APLOG_MARK, APLOG_STARTUP, rc, NULL, 
  +        ap_log_error(APLOG_MARK, APLOG_STARTUP, rc, NULL, 
                        "Couldn't start piped log process");
  -	exit (1);
  +        exit (1);
       }
   
       pl = apr_palloc(p, sizeof (*pl));
  
  
  

Mime
View raw message