X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=errlog.c;h=b9ad70c42818107a45bcdf6bcc4bd2397c0146e2;hp=76ad1fd3ba21ea34d4e0863b593913d238449597;hb=2bd48cc9d034d3508f5aecb2e5b325667dc1c05b;hpb=536a88ebe11300228987eaa39ef4bbd63cd0e1ba diff --git a/errlog.c b/errlog.c index 76ad1fd3..b9ad70c4 100644 --- a/errlog.c +++ b/errlog.c @@ -1,4 +1,4 @@ -const char errlog_rcs[] = "$Id: errlog.c,v 1.15 2001/07/29 17:41:10 jongfoster Exp $"; +const char errlog_rcs[] = "$Id: errlog.c,v 1.34 2002/03/24 13:25:43 swa Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/errlog.c,v $ @@ -7,7 +7,7 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.15 2001/07/29 17:41:10 jongfoster E * printf-like fashion. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * IJBSWA team. http://ijbswa.sourceforge.net + * Privoxy team. http://ijbswa.sourceforge.net * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -33,6 +33,77 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.15 2001/07/29 17:41:10 jongfoster E * * Revisions : * $Log: errlog.c,v $ + * Revision 1.34 2002/03/24 13:25:43 swa + * name change related issues + * + * Revision 1.33 2002/03/13 00:27:04 jongfoster + * Killing warnings + * + * Revision 1.32 2002/03/07 03:46:17 oes + * Fixed compiler warnings + * + * Revision 1.31 2002/03/06 23:02:57 jongfoster + * Removing tabs + * + * Revision 1.30 2002/03/05 22:43:45 david__schmidt + * - Better error reporting on OS/2 + * - Fix double-slash comment (oops) + * + * Revision 1.29 2002/03/04 23:45:13 jongfoster + * Printing thread ID if using Win32 native threads + * + * Revision 1.28 2002/03/04 17:59:59 oes + * Deleted deletePidFile(), cosmetics + * + * Revision 1.27 2002/03/04 02:08:01 david__schmidt + * Enable web editing of actions file on OS/2 (it had been broken all this time!) + * + * Revision 1.26 2002/01/09 19:05:45 steudten + * Fix big memory leak. + * + * Revision 1.25 2002/01/09 14:32:08 oes + * Added support for gmtime_r and localtime_r. + * + * Revision 1.24 2001/12/30 14:07:32 steudten + * - Add signal handling (unix) + * - Add SIGHUP handler (unix) + * - Add creation of pidfile (unix) + * - Add action 'top' in rc file (RH) + * - Add entry 'SIGNALS' to manpage + * - Add exit message to logfile (unix) + * + * Revision 1.23 2001/11/07 00:02:13 steudten + * Add line number in error output for lineparsing for + * actionsfile and configfile. + * Special handling for CLF added. + * + * Revision 1.22 2001/11/05 23:43:05 steudten + * Add time+date to log files. + * + * Revision 1.21 2001/10/25 03:40:47 david__schmidt + * Change in porting tactics: OS/2's EMX porting layer doesn't allow multiple + * threads to call select() simultaneously. So, it's time to do a real, live, + * native OS/2 port. See defines for __EMX__ (the porting layer) vs. __OS2__ + * (native). Both versions will work, but using __OS2__ offers multi-threading. + * + * Revision 1.20 2001/09/16 23:04:34 jongfoster + * Fixing a warning + * + * Revision 1.19 2001/09/13 20:08:06 jongfoster + * Adding support for LOG_LEVEL_CGI + * + * Revision 1.18 2001/09/10 11:27:24 oes + * Declaration of w32_socket_strerr now conditional + * + * Revision 1.17 2001/09/10 10:17:13 oes + * Removed unused variable; Fixed sprintf format + * + * Revision 1.16 2001/07/30 22:08:36 jongfoster + * Tidying up #defines: + * - All feature #defines are now of the form FEATURE_xxx + * - Permanently turned off WIN_GUI_EDIT + * - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS + * * Revision 1.15 2001/07/29 17:41:10 jongfoster * Now prints thread ID for each message (pthreads only) * @@ -129,17 +200,19 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.15 2001/07/29 17:41:10 jongfoster E #include "config.h" +#include "miscutil.h" #include #include #include #include -#ifndef _WIN32 +#if !defined(_WIN32) && !defined(__OS2__) #include -#endif /* ndef _WIN32 */ +#endif /* !defined(_WIN32) && !defined(__OS2__) */ #include +#include #ifdef FEATURE_PTHREAD #include #endif /* def FEATURE_PTHREAD */ @@ -151,8 +224,14 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.15 2001/07/29 17:41:10 jongfoster E #endif /* ndef _WIN_CONSOLE */ #endif /* def _WIN32 */ +#ifdef __OS2__ +#define INCL_DOS +#include +#endif + #include "errlog.h" #include "project.h" +#include "jcc.h" const char errlog_h_rcs[] = ERRLOG_H_VERSION; @@ -167,16 +246,14 @@ const char errlog_h_rcs[] = ERRLOG_H_VERSION; /* where to log (default: stderr) */ static FILE *logfp = NULL; -/* where to log (NULL == stderr) */ -static char * logfilename = NULL; - /* logging detail level. */ static int debug = (LOG_LEVEL_FATAL | LOG_LEVEL_ERROR | LOG_LEVEL_INFO); /* static functions */ static void fatal_error(const char * error_message); -static char * w32_socket_strerr(int errcode, char * tmp_buf); - +#ifdef _WIN32 +static char *w32_socket_strerr(int errcode, char *tmp_buf); +#endif /********************************************************************* * @@ -195,7 +272,7 @@ static char * w32_socket_strerr(int errcode, char * tmp_buf); static void fatal_error(const char * error_message) { #if defined(_WIN32) && !defined(_WIN_CONSOLE) - MessageBox(g_hwndLogFrame, error_message, "Internet JunkBuster Error", + MessageBox(g_hwndLogFrame, error_message, "Privoxy Error", MB_OK | MB_ICONERROR | MB_TASKMODAL | MB_SETFOREGROUND | MB_TOPMOST); /* Cleanup - remove taskbar icon etc. */ @@ -205,13 +282,17 @@ static void fatal_error(const char * error_message) fputs(error_message, stderr); #endif /* defined(_WIN32) && !defined(_WIN_CONSOLE) */ +#if defined(unix) + unlink(pidfile); +#endif /* unix */ + exit(1); } /********************************************************************* * - * Function : init_errlog + * Function : init_error_log * * Description : Initializes the logging module. Must call before * calling log_error. @@ -235,6 +316,7 @@ void init_error_log(const char *prog_name, const char *logfname, int debuglevel) if ((logfp != NULL) && (logfp != stderr)) { + log_error(LOG_LEVEL_INFO, "(Re-)Open logfile %s", logfname ? logfname : "none"); fclose(logfp); } logfp = stderr; @@ -242,9 +324,9 @@ void init_error_log(const char *prog_name, const char *logfname, int debuglevel) /* set the designated log file */ if( logfname ) { - if( !(fp = fopen(logfname, "a")) ) + if( NULL == (fp = fopen(logfname, "a")) ) { - log_error(LOG_LEVEL_FATAL, "init_errlog(): can't open logfile: %s", logfname); + log_error(LOG_LEVEL_FATAL, "init_error_log(): can't open logfile: %s", logfname); } /* set logging to be completely unbuffered */ @@ -253,7 +335,7 @@ void init_error_log(const char *prog_name, const char *logfname, int debuglevel) logfp = fp; } - log_error(LOG_LEVEL_INFO, "Internet JunkBuster version " VERSION); + log_error(LOG_LEVEL_INFO, "Privoxy version " VERSION); if (prog_name != NULL) { log_error(LOG_LEVEL_INFO, "Program name: %s", prog_name); @@ -281,10 +363,15 @@ 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[BUFFER_SIZE]; + char *outbuf= NULL; + static char *outbuf_save = NULL; char * src = fmt; int outc = 0; long this_thread = 1; /* was: pthread_t this_thread;*/ +#ifdef __OS2__ + PTIB ptib; + APIRET ulrc; +#endif /* __OS2__ */ #if defined(_WIN32) && !defined(_WIN_CONSOLE) /* @@ -307,58 +394,93 @@ void log_error(int loglevel, char *fmt, ...) /* FIXME get current thread id */ #ifdef FEATURE_PTHREAD this_thread = (long)pthread_self(); +#elif defined(_WIN32) + this_thread = GetCurrentThreadId(); +#elif defined(__OS2__) + ulrc = DosGetInfoBlocks(&ptib, NULL); + if (ulrc == 0) + this_thread = ptib -> tib_ptib2 -> tib2_ultid; #endif /* def FEATURE_PTHREAD */ + if ( !outbuf_save ) + { + outbuf_save = outbuf = (char*)malloc(BUFFER_SIZE); + assert(outbuf); + } + outbuf = outbuf_save; + + { + /* + * Write timestamp into tempbuf. + * + * Complex because not all OSs have tm_gmtoff or + * the %z field in strftime() + */ + time_t now; + struct tm tm_now; + time (&now); +#ifdef HAVE_LOCALTIME_R + tm_now = *localtime_r(&now, &tm_now); +#else + tm_now = *localtime (&now); +#endif + strftime(outbuf, BUFFER_SIZE-6, "%b %d %H:%M:%S ", &tm_now); + outbuf += strlen( outbuf ); + } switch (loglevel) { case LOG_LEVEL_ERROR: - outc = sprintf(outbuf, "IJB(%d) Error: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Error: ", this_thread); break; case LOG_LEVEL_FATAL: - outc = sprintf(outbuf, "IJB(%d) Fatal error: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Fatal error: ", this_thread); break; case LOG_LEVEL_GPC: - outc = sprintf(outbuf, "IJB(%d) Request: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Request: ", this_thread); break; case LOG_LEVEL_CONNECT: - outc = sprintf(outbuf, "IJB(%d) Connect: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Connect: ", this_thread); break; case LOG_LEVEL_LOG: - outc = sprintf(outbuf, "IJB(%d) Writing: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Writing: ", this_thread); break; case LOG_LEVEL_HEADER: - outc = sprintf(outbuf, "IJB(%d) Header: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Header: ", this_thread); break; case LOG_LEVEL_INFO: - outc = sprintf(outbuf, "IJB(%d) Info: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Info: ", this_thread); break; case LOG_LEVEL_RE_FILTER: - outc = sprintf(outbuf, "IJB(%d) Re-Filter: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Re-Filter: ", this_thread); break; #ifdef FEATURE_FORCE_LOAD case LOG_LEVEL_FORCE: - outc = sprintf(outbuf, "IJB(%d) Force: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Force: ", this_thread); break; #endif /* def FEATURE_FORCE_LOAD */ #ifdef FEATURE_FAST_REDIRECTS case LOG_LEVEL_REDIRECTS: - outc = sprintf(outbuf, "IJB(%d) Redirect: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Redirect: ", this_thread); break; #endif /* def FEATURE_FAST_REDIRECTS */ case LOG_LEVEL_DEANIMATE: - outc = sprintf(outbuf, "IJB(%d) Gif-Deanimate: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Gif-Deanimate: ", this_thread); break; case LOG_LEVEL_CLF: + outbuf = outbuf_save; outc = 0; outbuf[0] = '\0'; break; #ifdef FEATURE_KILL_POPUPS case LOG_LEVEL_POPUPS: - outc = sprintf(outbuf, "IJB(%d) Kill-Popups: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%ld) Kill-Popups: ", this_thread); break; #endif /* def FEATURE_KILL_POPUPS */ + case LOG_LEVEL_CGI: + outc = sprintf(outbuf, "Privoxy(%ld) CGI: ", this_thread); + break; default: - outc = sprintf(outbuf, "IJB(%d) UNKNOWN LOG TYPE(%d): ", this_thread, loglevel); + outc = sprintf(outbuf, "Privoxy(%ld) UNKNOWN LOG TYPE(%d): ", this_thread, loglevel); break; } @@ -369,7 +491,7 @@ void log_error(int loglevel, char *fmt, ...) while ((*src) && (outc < BUFFER_SIZE-2)) { char tempbuf[BUFFER_SIZE]; - char *sval; + char *sval = NULL; int ival; unsigned uval; long lval; @@ -433,7 +555,7 @@ void log_error(int loglevel, char *fmt, ...) else { /* Error */ - sprintf(outbuf, "IJB(%d) Error: log_error(): Bad format string:\n" + sprintf(outbuf, "Privoxy(%ld) Error: log_error(): Bad format string:\n" "Format = \"%s\"\n" "Exiting.", this_thread, fmt); /* FIXME RACE HAZARD: should start critical section error_log_use here */ @@ -490,7 +612,7 @@ void log_error(int loglevel, char *fmt, ...) outc += ival; if (outc < BUFFER_SIZE-1) { - memcpy(outbuf + oldoutc, sval, ival); + memcpy(outbuf + oldoutc, sval, (size_t) ival); } else { @@ -502,6 +624,11 @@ void log_error(int loglevel, char *fmt, ...) #ifdef _WIN32 ival = WSAGetLastError(); sval = w32_socket_strerr(ival, tempbuf); +#elif __OS2__ + ival = sock_errno(); + if (ival == 0) + ival = errno; + sval = strerror(ival); #else /* ifndef _WIN32 */ ival = errno; #ifdef HAVE_STRERROR @@ -537,11 +664,22 @@ void log_error(int loglevel, char *fmt, ...) */ time_t now; struct tm *tm_now; - struct tm gmt; + struct tm gmt; +#ifdef HAVE_LOCALTIME_R + struct tm dummy; +#endif int days, hrs, mins; time (&now); - gmt = *gmtime (&now); +#ifdef HAVE_GMTIME_R + gmt = *gmtime_r(&now, &gmt); +#else + gmt = *gmtime(&now); +#endif +#ifdef HAVE_LOCALTIME_R + tm_now = localtime_r(&now, &dummy); +#else tm_now = localtime (&now); +#endif 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; @@ -560,7 +698,7 @@ void log_error(int loglevel, char *fmt, ...) } break; default: - sprintf(outbuf, "IJB(%d) Error: log_error(): Bad format string:\n" + sprintf(outbuf, "Privoxy(%ld) Error: log_error(): Bad format string:\n" "Format = \"%s\"\n" "Exiting.", this_thread, fmt); /* FIXME RACE HAZARD: should start critical section error_log_use here */ @@ -568,9 +706,9 @@ void log_error(int loglevel, char *fmt, ...) { logfp = stderr; } - fputs(outbuf, logfp); + fputs(outbuf_save, logfp); /* FIXME RACE HAZARD: should end critical section error_log_use here */ - fatal_error(outbuf); + fatal_error(outbuf_save); /* Never get here */ break; @@ -614,11 +752,11 @@ void log_error(int loglevel, char *fmt, ...) logfp = stderr; } - fputs(outbuf, logfp); + fputs(outbuf_save, logfp); if (loglevel == LOG_LEVEL_FATAL) { - fatal_error(outbuf); + fatal_error(outbuf_save); /* Never get here */ } @@ -626,7 +764,7 @@ void log_error(int loglevel, char *fmt, ...) #if defined(_WIN32) && !defined(_WIN_CONSOLE) /* Write to display */ - LogPutString(outbuf); + LogPutString(outbuf_save); #endif /* defined(_WIN32) && !defined(_WIN_CONSOLE) */ } @@ -650,7 +788,7 @@ void log_error(int loglevel, char *fmt, ...) * tmp_buf. * *********************************************************************/ -static char * w32_socket_strerr(int errcode, char * tmp_buf) +static char *w32_socket_strerr(int errcode, char *tmp_buf) { #define TEXT_FOR_ERROR(code,text) \ if (errcode == code) \ @@ -727,4 +865,3 @@ static char * w32_socket_strerr(int errcode, char * tmp_buf) tab-width: 3 end: */ -