X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=errlog.c;h=4a3cfe7ef68c1b587233d35596630fb711e9cf0a;hp=739736ce82b7ad64134bea03c06593f1084cbafd;hb=05d6727348e6c02689c0eec493faa42c91f49f86;hpb=2f86c770ec87c33518b40e47e229ab8cd813853a diff --git a/errlog.c b/errlog.c index 739736ce..4a3cfe7e 100644 --- a/errlog.c +++ b/errlog.c @@ -1,4 +1,4 @@ -const char errlog_rcs[] = "$Id: errlog.c,v 1.21 2001/10/25 03:40:47 david__schmidt Exp $"; +const char errlog_rcs[] = "$Id: errlog.c,v 1.39 2002/04/03 17:15:27 gliptak Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/errlog.c,v $ @@ -7,7 +7,7 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.21 2001/10/25 03:40:47 david__schmi * printf-like fashion. * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * IJBSWA team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -33,6 +33,68 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.21 2001/10/25 03:40:47 david__schmi * * Revisions : * $Log: errlog.c,v $ + * Revision 1.39 2002/04/03 17:15:27 gliptak + * zero padding thread ids in log + * + * Revision 1.38 2002/03/31 17:18:59 jongfoster + * Win32 only: Enabling STRICT to fix a VC++ compile warning. + * + * Revision 1.37 2002/03/27 14:32:43 david__schmidt + * More compiler warning message maintenance + * + * Revision 1.36 2002/03/26 22:29:54 swa + * we have a new homepage! + * + * Revision 1.35 2002/03/24 15:23:33 jongfoster + * Name changes + * + * 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, @@ -153,6 +215,7 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.21 2001/10/25 03:40:47 david__schmi #include "config.h" +#include "miscutil.h" #include #include @@ -170,6 +233,9 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.21 2001/10/25 03:40:47 david__schmi #endif /* def FEATURE_PTHREAD */ #ifdef _WIN32 +#ifndef STRICT +#define STRICT +#endif #include #ifndef _WIN_CONSOLE #include "w32log.h" @@ -177,12 +243,14 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.21 2001/10/25 03:40:47 david__schmi #endif /* def _WIN32 */ #ifdef __OS2__ +#include /* For sock_errno */ #define INCL_DOS #include #endif #include "errlog.h" #include "project.h" +#include "jcc.h" const char errlog_h_rcs[] = ERRLOG_H_VERSION; @@ -205,6 +273,9 @@ static void fatal_error(const char * error_message); #ifdef _WIN32 static char *w32_socket_strerr(int errcode, char *tmp_buf); #endif +#ifdef __OS2__ +static char *os2_socket_strerr(int errcode, char *tmp_buf); +#endif /********************************************************************* * @@ -223,7 +294,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. */ @@ -233,13 +304,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. @@ -263,6 +338,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; @@ -270,9 +346,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 */ @@ -281,7 +357,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); @@ -310,7 +386,7 @@ void log_error(int loglevel, char *fmt, ...) { va_list ap; char *outbuf= NULL; - char *outbuf_save = NULL; + static char *outbuf_save = NULL; char * src = fmt; int outc = 0; long this_thread = 1; /* was: pthread_t this_thread;*/ @@ -340,83 +416,93 @@ void log_error(int loglevel, char *fmt, ...) /* FIXME get current thread id */ #ifdef FEATURE_PTHREAD this_thread = (long)pthread_self(); -#elif __OS2__ - +#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 */ - outbuf_save = outbuf = (char*)malloc(BUFFER_SIZE); - assert(outbuf); + 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() - */ + * 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); - tm_now = localtime (&now); - strftime (outbuf, BUFFER_SIZE-6, "%b %d %H:%M:%S ", tm_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(%ld) Error: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%05ld) Error: ", this_thread); break; case LOG_LEVEL_FATAL: - outc = sprintf(outbuf, "IJB(%ld) Fatal error: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%05ld) Fatal error: ", this_thread); break; case LOG_LEVEL_GPC: - outc = sprintf(outbuf, "IJB(%ld) Request: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%05ld) Request: ", this_thread); break; case LOG_LEVEL_CONNECT: - outc = sprintf(outbuf, "IJB(%ld) Connect: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%05ld) Connect: ", this_thread); break; case LOG_LEVEL_LOG: - outc = sprintf(outbuf, "IJB(%ld) Writing: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%05ld) Writing: ", this_thread); break; case LOG_LEVEL_HEADER: - outc = sprintf(outbuf, "IJB(%ld) Header: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%05ld) Header: ", this_thread); break; case LOG_LEVEL_INFO: - outc = sprintf(outbuf, "IJB(%ld) Info: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%05ld) Info: ", this_thread); break; case LOG_LEVEL_RE_FILTER: - outc = sprintf(outbuf, "IJB(%ld) Re-Filter: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%05ld) Re-Filter: ", this_thread); break; #ifdef FEATURE_FORCE_LOAD case LOG_LEVEL_FORCE: - outc = sprintf(outbuf, "IJB(%ld) Force: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%05ld) Force: ", this_thread); break; #endif /* def FEATURE_FORCE_LOAD */ #ifdef FEATURE_FAST_REDIRECTS case LOG_LEVEL_REDIRECTS: - outc = sprintf(outbuf, "IJB(%ld) Redirect: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%05ld) Redirect: ", this_thread); break; #endif /* def FEATURE_FAST_REDIRECTS */ case LOG_LEVEL_DEANIMATE: - outc = sprintf(outbuf, "IJB(%ld) Gif-Deanimate: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%05ld) 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(%ld) Kill-Popups: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%05ld) Kill-Popups: ", this_thread); break; #endif /* def FEATURE_KILL_POPUPS */ case LOG_LEVEL_CGI: - outc = sprintf(outbuf, "IJB(%ld) CGI: ", this_thread); + outc = sprintf(outbuf, "Privoxy(%05ld) CGI: ", this_thread); break; default: - outc = sprintf(outbuf, "IJB(%ld) UNKNOWN LOG TYPE(%d): ", this_thread, loglevel); + outc = sprintf(outbuf, "Privoxy(%05ld) UNKNOWN LOG TYPE(%d): ", this_thread, loglevel); break; } @@ -427,7 +513,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; @@ -491,7 +577,7 @@ void log_error(int loglevel, char *fmt, ...) else { /* Error */ - sprintf(outbuf, "IJB(%ld) 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 */ @@ -548,7 +634,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 { @@ -560,6 +646,15 @@ 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) + sval = os2_socket_strerr(ival, tempbuf); + else + { + ival = errno; + sval = strerror(ival); + } #else /* ifndef _WIN32 */ ival = errno; #ifdef HAVE_STRERROR @@ -595,11 +690,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; @@ -618,7 +724,7 @@ void log_error(int loglevel, char *fmt, ...) } break; default: - sprintf(outbuf, "IJB(%ld) 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 */ @@ -780,6 +886,82 @@ static char *w32_socket_strerr(int errcode, char *tmp_buf) #endif /* def _WIN32 */ +#ifdef __OS2__ +/********************************************************************* + * + * Function : os2_socket_strerr + * + * Description : Translate the return value from sock_errno() + * into a string. + * + * Parameters : + * 1 : errcode = The return value from sock_errno(). + * 2 : tmp_buf = A temporary buffer that might be used to + * store the string. + * + * Returns : String representing the error code. This may be + * a global string constant or a string stored in + * tmp_buf. + * + *********************************************************************/ +static char *os2_socket_strerr(int errcode, char *tmp_buf) +{ +#define TEXT_FOR_ERROR(code,text) \ + if (errcode == code) \ + { \ + return #code " - " text; \ + } + + TEXT_FOR_ERROR(SOCEPERM , "Not owner.") + TEXT_FOR_ERROR(SOCESRCH , "No such process.") + TEXT_FOR_ERROR(SOCEINTR , "Interrupted system call.") + TEXT_FOR_ERROR(SOCENXIO , "No such device or address.") + TEXT_FOR_ERROR(SOCEBADF , "Bad file number.") + TEXT_FOR_ERROR(SOCEACCES , "Permission denied.") + TEXT_FOR_ERROR(SOCEFAULT , "Bad address.") + TEXT_FOR_ERROR(SOCEINVAL , "Invalid argument.") + TEXT_FOR_ERROR(SOCEMFILE , "Too many open files.") + TEXT_FOR_ERROR(SOCEPIPE , "Broken pipe.") + TEXT_FOR_ERROR(SOCEWOULDBLOCK , "Operation would block.") + TEXT_FOR_ERROR(SOCEINPROGRESS , "Operation now in progress.") + TEXT_FOR_ERROR(SOCEALREADY , "Operation already in progress.") + TEXT_FOR_ERROR(SOCENOTSOCK , "Socket operation on non-socket.") + TEXT_FOR_ERROR(SOCEDESTADDRREQ , "Destination address required.") + TEXT_FOR_ERROR(SOCEMSGSIZE , "Message too long.") + TEXT_FOR_ERROR(SOCEPROTOTYPE , "Protocol wrong type for socket.") + TEXT_FOR_ERROR(SOCENOPROTOOPT , "Protocol not available.") + TEXT_FOR_ERROR(SOCEPROTONOSUPPORT, "Protocol not supported.") + TEXT_FOR_ERROR(SOCESOCKTNOSUPPORT, "Socket type not supported.") + TEXT_FOR_ERROR(SOCEOPNOTSUPP , "Operation not supported.") + TEXT_FOR_ERROR(SOCEPFNOSUPPORT , "Protocol family not supported.") + TEXT_FOR_ERROR(SOCEAFNOSUPPORT , "Address family not supported by protocol family.") + TEXT_FOR_ERROR(SOCEADDRINUSE , "Address already in use.") + TEXT_FOR_ERROR(SOCEADDRNOTAVAIL , "Can't assign requested address.") + TEXT_FOR_ERROR(SOCENETDOWN , "Network is down.") + TEXT_FOR_ERROR(SOCENETUNREACH , "Network is unreachable.") + TEXT_FOR_ERROR(SOCENETRESET , "Network dropped connection on reset.") + TEXT_FOR_ERROR(SOCECONNABORTED , "Software caused connection abort.") + TEXT_FOR_ERROR(SOCECONNRESET , "Connection reset by peer.") + TEXT_FOR_ERROR(SOCENOBUFS , "No buffer space available.") + TEXT_FOR_ERROR(SOCEISCONN , "Socket is already connected.") + TEXT_FOR_ERROR(SOCENOTCONN , "Socket is not connected.") + TEXT_FOR_ERROR(SOCESHUTDOWN , "Can't send after socket shutdown.") + TEXT_FOR_ERROR(SOCETOOMANYREFS , "Too many references: can't splice.") + TEXT_FOR_ERROR(SOCETIMEDOUT , "Operation timed out.") + TEXT_FOR_ERROR(SOCECONNREFUSED , "Connection refused.") + TEXT_FOR_ERROR(SOCELOOP , "Too many levels of symbolic links.") + TEXT_FOR_ERROR(SOCENAMETOOLONG , "File name too long.") + TEXT_FOR_ERROR(SOCEHOSTDOWN , "Host is down.") + TEXT_FOR_ERROR(SOCEHOSTUNREACH , "No route to host.") + TEXT_FOR_ERROR(SOCENOTEMPTY , "Directory not empty.") + TEXT_FOR_ERROR(SOCEOS2ERR , "OS/2 Error.") + + sprintf(tmp_buf, "(error number %d)", errcode); + return tmp_buf; +} +#endif /* def __OS2__ */ + + /* Local Variables: tab-width: 3