X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=errlog.c;h=4d25349e780ed78da612e210b14f9d01bc65cdbb;hb=4d8b69fc32edd48072ac1dedc02a24b98fe1e6e5;hp=1c4aee4b40b1fd237ae9ae36dd824d2905d77f30;hpb=40632a90a4121008cd4f9f312df8569daa92370a;p=privoxy.git diff --git a/errlog.c b/errlog.c index 1c4aee4b..4d25349e 100644 --- a/errlog.c +++ b/errlog.c @@ -1,4 +1,4 @@ -const char errlog_rcs[] = "$Id: errlog.c,v 1.8 2001/05/26 17:25:14 jongfoster Exp $"; +const char errlog_rcs[] = "$Id: errlog.c,v 1.12 2001/06/09 10:55:28 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/errlog.c,v $ @@ -33,6 +33,19 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.8 2001/05/26 17:25:14 jongfoster Ex * * Revisions : * $Log: errlog.c,v $ + * Revision 1.12 2001/06/09 10:55:28 jongfoster + * Changing BUFSIZ ==> BUFFER_SIZE + * + * Revision 1.11 2001/06/01 18:14:49 jongfoster + * Changing the calls to strerr() to check HAVE_STRERR (which is defined + * in config.h if appropriate) rather than the NO_STRERR macro. + * + * Revision 1.10 2001/05/29 11:52:21 oes + * Conditional compilation of w32_socket_error + * + * Revision 1.9 2001/05/28 16:15:17 jongfoster + * Improved reporting of errors under Win32. + * * Revision 1.8 2001/05/26 17:25:14 jongfoster * Added support for CLF (Common Log Format) and fixed LOG_LEVEL_LOG * @@ -256,7 +269,7 @@ void init_error_log(const char *prog_name, const char *logfname, int debuglevel) void log_error(int loglevel, char *fmt, ...) { va_list ap; - char outbuf[BUFSIZ]; + char outbuf[BUFFER_SIZE]; char * src = fmt; int outc = 0; long this_thread = 1; /* was: pthread_t this_thread;*/ @@ -305,11 +318,9 @@ void log_error(int loglevel, char *fmt, ...) case LOG_LEVEL_INFO: outc = sprintf(outbuf, "IJB(%d) Info: ", this_thread); break; -#ifdef PCRS case LOG_LEVEL_RE_FILTER: outc = sprintf(outbuf, "IJB(%d) Re-Filter: ", this_thread); break; -#endif /* def PCRS */ #ifdef FORCE_LOAD case LOG_LEVEL_FORCE: outc = sprintf(outbuf, "IJB(%d) Force: ", this_thread); @@ -320,6 +331,9 @@ void log_error(int loglevel, char *fmt, ...) outc = sprintf(outbuf, "IJB(%d) Redirect: ", this_thread); break; #endif /* def FAST_REDIRECTS */ + case LOG_LEVEL_DEANIMATE: + outc = sprintf(outbuf, "IJB(%d) Gif-Deanimate: ", this_thread); + break; case LOG_LEVEL_CLF: outc = 0; outbuf[0] = '\0'; @@ -333,9 +347,9 @@ void log_error(int loglevel, char *fmt, ...) va_start( ap, fmt ); /* build formatted message from fmt and var-args */ - while ((*src) && (outc < BUFSIZ-2)) + while ((*src) && (outc < BUFFER_SIZE-2)) { - char tempbuf[BUFSIZ]; + char tempbuf[BUFFER_SIZE]; char *sval; int ival; unsigned uval; @@ -360,7 +374,7 @@ void log_error(int loglevel, char *fmt, ...) ival = va_arg( ap, int ); oldoutc = outc; outc += sprintf(tempbuf, "%d", ival); - if (outc < BUFSIZ-1) + if (outc < BUFFER_SIZE-1) { strcpy(outbuf + oldoutc, tempbuf); } @@ -373,7 +387,7 @@ void log_error(int loglevel, char *fmt, ...) uval = va_arg( ap, unsigned ); oldoutc = outc; outc += sprintf(tempbuf, "%u", uval); - if (outc < BUFSIZ-1) + if (outc < BUFFER_SIZE-1) { strcpy(outbuf + oldoutc, tempbuf); } @@ -414,7 +428,7 @@ void log_error(int loglevel, char *fmt, ...) /* Never get here */ break; } - if (outc < BUFSIZ-1) + if (outc < BUFFER_SIZE-1) { strcpy(outbuf + oldoutc, tempbuf); } @@ -434,7 +448,7 @@ void log_error(int loglevel, char *fmt, ...) sval = va_arg( ap, char * ); oldoutc = outc; outc += strlen(sval); - if (outc < BUFSIZ-1) + if (outc < BUFFER_SIZE-1) { strcpy(outbuf + oldoutc, sval); } @@ -455,7 +469,7 @@ void log_error(int loglevel, char *fmt, ...) } oldoutc = outc; outc += ival; - if (outc < BUFSIZ-1) + if (outc < BUFFER_SIZE-1) { memcpy(outbuf + oldoutc, sval, ival); } @@ -471,11 +485,11 @@ void log_error(int loglevel, char *fmt, ...) sval = w32_socket_strerr(ival, tempbuf); #else /* ifndef _WIN32 */ ival = errno; -#ifndef NOSTRERROR +#ifdef HAVE_STRERROR sval = strerror(ival); -#else /* def NOSTRERROR */ +#else /* ifndef HAVE_STRERROR */ sval = NULL; -#endif /* def NOSTRERROR */ +#endif /* ndef HAVE_STRERROR */ if (sval == NULL) { sprintf(tempbuf, "(errno = %d)", ival); @@ -484,7 +498,7 @@ void log_error(int loglevel, char *fmt, ...) #endif /* ndef _WIN32 */ oldoutc = outc; outc += strlen(sval); - if (outc < BUFSIZ-1) + if (outc < BUFFER_SIZE-1) { strcpy(outbuf + oldoutc, sval); } @@ -512,12 +526,12 @@ void log_error(int loglevel, char *fmt, ...) days = tm_now->tm_yday - gmt.tm_yday; hrs = ((days < -1 ? 24 : 1 < days ? -24 : days * 24) + tm_now->tm_hour - gmt.tm_hour); mins = hrs * 60 + tm_now->tm_min - gmt.tm_min; - strftime (tempbuf, BUFSIZ-6, "%d/%b/%Y:%H:%M:%S ", tm_now); + strftime (tempbuf, BUFFER_SIZE-6, "%d/%b/%Y:%H:%M:%S ", tm_now); sprintf (tempbuf + strlen(tempbuf), "%+03d%02d", mins / 60, abs(mins) % 60); } oldoutc = outc; outc += strlen(tempbuf); - if (outc < BUFSIZ-1) + if (outc < BUFFER_SIZE-1) { strcpy(outbuf + oldoutc, tempbuf); } @@ -548,20 +562,20 @@ void log_error(int loglevel, char *fmt, ...) /* done with var. args */ va_end( ap ); - if (outc >= BUFSIZ-2) + if (outc >= BUFFER_SIZE-2) { /* insufficient room for newline and trailing null. */ static const char warning[] = "... [too long, truncated]\n"; - if (outc < BUFSIZ) + if (outc < BUFFER_SIZE) { /* Need to add terminating null in this case. */ outbuf[outc] = '\0'; } /* Truncate output */ - outbuf[BUFSIZ - sizeof(warning)] = '\0'; + outbuf[BUFFER_SIZE - sizeof(warning)] = '\0'; /* Append warning */ strcat(outbuf, warning); @@ -599,6 +613,7 @@ void log_error(int loglevel, char *fmt, ...) } +#ifdef _WIN32 /********************************************************************* * * Function : w32_socket_strerr @@ -685,6 +700,7 @@ static char * w32_socket_strerr(int errcode, char * tmp_buf) sprintf(tmp_buf, "(error number %d)", errcode); return tmp_buf; } +#endif /* def _WIN32 */ /*