X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=errlog.c;h=f91461ea4158124966ff6c4d9a61dfd7b00b77ab;hp=38cab01892fe81d07d4de32a86dd4f8865467c89;hb=22fce20bdb775a81e7c430076f59791858aca24f;hpb=e7f33c16b512f119f65800e85ba0beecfd3a1545 diff --git a/errlog.c b/errlog.c index 38cab018..f91461ea 100644 --- a/errlog.c +++ b/errlog.c @@ -1,4 +1,4 @@ -const char errlog_rcs[] = "$Id: errlog.c,v 1.23 2001/11/07 00:02:13 steudten Exp $"; +const char errlog_rcs[] = "$Id: errlog.c,v 1.31 2002/03/06 23:02:57 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/errlog.c,v $ @@ -33,6 +33,36 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.23 2001/11/07 00:02:13 steudten Exp * * Revisions : * $Log: errlog.c,v $ + * 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. @@ -192,6 +222,7 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.23 2001/11/07 00:02:13 steudten Exp #include "errlog.h" #include "project.h" +#include "jcc.h" const char errlog_h_rcs[] = ERRLOG_H_VERSION; @@ -243,7 +274,7 @@ static void fatal_error(const char * error_message) #endif /* defined(_WIN32) && !defined(_WIN_CONSOLE) */ #if defined(unix) - deletePidFile(); + unlink(pidfile); #endif /* unix */ exit(1); @@ -252,7 +283,7 @@ static void fatal_error(const char * error_message) /********************************************************************* * - * Function : init_errlog + * Function : init_error_log * * Description : Initializes the logging module. Must call before * calling log_error. @@ -286,7 +317,7 @@ void init_error_log(const char *prog_name, const char *logfname, int debuglevel) { if( !(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 */ @@ -324,7 +355,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;*/ @@ -354,28 +385,37 @@ 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) @@ -418,7 +458,7 @@ void log_error(int loglevel, char *fmt, ...) outc = sprintf(outbuf, "IJB(%ld) Gif-Deanimate: ", this_thread); break; case LOG_LEVEL_CLF: - outbuf = outbuf_save; + outbuf = outbuf_save; outc = 0; outbuf[0] = '\0'; break; @@ -442,7 +482,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; @@ -563,7 +603,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 { @@ -575,6 +615,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 @@ -610,11 +655,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;