X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=errlog.c;h=76ad1fd3ba21ea34d4e0863b593913d238449597;hp=ae98ed3c42fbe149a62eafaf92033752868d692c;hb=fa3f696c4bfed2ee296f589ad6fb1eb505304ff1;hpb=a8e6e10e532d17d33cbedc4fe4c4027e624c6b1d diff --git a/errlog.c b/errlog.c index ae98ed3c..76ad1fd3 100644 --- a/errlog.c +++ b/errlog.c @@ -1,4 +1,4 @@ -const char errlog_rcs[] = "$Id: errlog.c,v 1.10 2001/05/29 11:52:21 oes Exp $"; +const char errlog_rcs[] = "$Id: errlog.c,v 1.15 2001/07/29 17:41:10 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/errlog.c,v $ @@ -33,6 +33,23 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.10 2001/05/29 11:52:21 oes Exp $"; * * Revisions : * $Log: errlog.c,v $ + * Revision 1.15 2001/07/29 17:41:10 jongfoster + * Now prints thread ID for each message (pthreads only) + * + * Revision 1.14 2001/07/19 19:03:48 haroon + * - Added case for LOG_LEVEL_POPUPS + * + * Revision 1.13 2001/07/13 13:58:58 oes + * - Added case for LOG_LEVEL_DEANIMATE + * - Removed all #ifdef PCRS + * + * 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 * @@ -123,7 +140,9 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.10 2001/05/29 11:52:21 oes Exp $"; #endif /* ndef _WIN32 */ #include -/* #include */ +#ifdef FEATURE_PTHREAD +#include +#endif /* def FEATURE_PTHREAD */ #ifdef _WIN32 #include @@ -262,7 +281,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;*/ @@ -286,7 +305,9 @@ void log_error(int loglevel, char *fmt, ...) } /* FIXME get current thread id */ - /* this_thread = (long)pthread_self(); */ +#ifdef FEATURE_PTHREAD + this_thread = (long)pthread_self(); +#endif /* def FEATURE_PTHREAD */ switch (loglevel) { @@ -311,25 +332,31 @@ 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 +#ifdef FEATURE_FORCE_LOAD case LOG_LEVEL_FORCE: outc = sprintf(outbuf, "IJB(%d) Force: ", this_thread); break; -#endif /* def FORCE_LOAD */ -#ifdef FAST_REDIRECTS +#endif /* def FEATURE_FORCE_LOAD */ +#ifdef FEATURE_FAST_REDIRECTS case LOG_LEVEL_REDIRECTS: outc = sprintf(outbuf, "IJB(%d) Redirect: ", this_thread); break; -#endif /* def FAST_REDIRECTS */ +#endif /* def FEATURE_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'; break; +#ifdef FEATURE_KILL_POPUPS + case LOG_LEVEL_POPUPS: + outc = sprintf(outbuf, "IJB(%d) Kill-Popups: ", this_thread); + break; +#endif /* def FEATURE_KILL_POPUPS */ default: outc = sprintf(outbuf, "IJB(%d) UNKNOWN LOG TYPE(%d): ", this_thread, loglevel); break; @@ -339,9 +366,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; @@ -366,7 +393,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); } @@ -379,7 +406,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); } @@ -420,7 +447,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); } @@ -440,7 +467,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); } @@ -461,7 +488,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); } @@ -490,7 +517,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); } @@ -518,12 +545,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); } @@ -554,20 +581,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);