-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.30 2002/03/05 22:43:45 david__schmidt Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/errlog.c,v $
*
* Revisions :
* $Log: errlog.c,v $
+ * 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)
+ *
+ * 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
+ *
+ * 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
*
\f
#include "config.h"
+#include "miscutil.h"
#include <stdlib.h>
#include <stdio.h>
#include <stdarg.h>
#include <string.h>
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(__OS2__)
#include <unistd.h>
-#endif /* ndef _WIN32 */
+#endif /* !defined(_WIN32) && !defined(__OS2__) */
#include <errno.h>
-/* #include <pthread.h> */
+#include <assert.h>
+#ifdef FEATURE_PTHREAD
+#include <pthread.h>
+#endif /* def FEATURE_PTHREAD */
#ifdef _WIN32
#include <windows.h>
#endif /* ndef _WIN_CONSOLE */
#endif /* def _WIN32 */
+#ifdef __OS2__
+#define INCL_DOS
+#include <os2.h>
+#endif
+
#include "errlog.h"
#include "project.h"
+#include "jcc.h"
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
/*********************************************************************
*
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.
if ((logfp != NULL) && (logfp != stderr))
{
+ log_error(LOG_LEVEL_INFO, "(Re-)Open logfile %s", logfname ? logfname : "none");
fclose(logfp);
}
logfp = stderr;
{
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 */
void log_error(int loglevel, char *fmt, ...)
{
va_list ap;
- char outbuf[BUFSIZ];
+ 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)
/*
}
/* FIXME get current thread id */
- /* this_thread = (long)pthread_self(); */
-
+#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, "IJB(%ld) Error: ", this_thread);
break;
case LOG_LEVEL_FATAL:
- outc = sprintf(outbuf, "IJB(%d) Fatal error: ", this_thread);
+ outc = sprintf(outbuf, "IJB(%ld) Fatal error: ", this_thread);
break;
case LOG_LEVEL_GPC:
- outc = sprintf(outbuf, "IJB(%d) Request: ", this_thread);
+ outc = sprintf(outbuf, "IJB(%ld) Request: ", this_thread);
break;
case LOG_LEVEL_CONNECT:
- outc = sprintf(outbuf, "IJB(%d) Connect: ", this_thread);
+ outc = sprintf(outbuf, "IJB(%ld) Connect: ", this_thread);
break;
case LOG_LEVEL_LOG:
- outc = sprintf(outbuf, "IJB(%d) Writing: ", this_thread);
+ outc = sprintf(outbuf, "IJB(%ld) Writing: ", this_thread);
break;
case LOG_LEVEL_HEADER:
- outc = sprintf(outbuf, "IJB(%d) Header: ", this_thread);
+ outc = sprintf(outbuf, "IJB(%ld) Header: ", this_thread);
break;
case LOG_LEVEL_INFO:
- outc = sprintf(outbuf, "IJB(%d) Info: ", this_thread);
+ outc = sprintf(outbuf, "IJB(%ld) Info: ", this_thread);
break;
-#ifdef PCRS
case LOG_LEVEL_RE_FILTER:
- outc = sprintf(outbuf, "IJB(%d) Re-Filter: ", this_thread);
+ outc = sprintf(outbuf, "IJB(%ld) 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);
+ outc = sprintf(outbuf, "IJB(%ld) 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);
+ outc = sprintf(outbuf, "IJB(%ld) Redirect: ", this_thread);
+ break;
+#endif /* def FEATURE_FAST_REDIRECTS */
+ case LOG_LEVEL_DEANIMATE:
+ outc = sprintf(outbuf, "IJB(%ld) Gif-Deanimate: ", this_thread);
break;
-#endif /* def FAST_REDIRECTS */
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);
+ break;
+#endif /* def FEATURE_KILL_POPUPS */
+ case LOG_LEVEL_CGI:
+ outc = sprintf(outbuf, "IJB(%ld) CGI: ", this_thread);
+ break;
default:
- outc = sprintf(outbuf, "IJB(%d) UNKNOWN LOG TYPE(%d): ", this_thread, loglevel);
+ outc = sprintf(outbuf, "IJB(%ld) UNKNOWN LOG TYPE(%d): ", this_thread, loglevel);
break;
}
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 *sval;
+ char tempbuf[BUFFER_SIZE];
+ char *sval = NULL;
int ival;
unsigned uval;
long lval;
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);
}
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);
}
else
{
/* Error */
- sprintf(outbuf, "IJB(%d) Error: log_error(): Bad format string:\n"
+ sprintf(outbuf, "IJB(%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 */
/* Never get here */
break;
}
- if (outc < BUFSIZ-1)
+ if (outc < BUFFER_SIZE-1)
{
strcpy(outbuf + oldoutc, tempbuf);
}
sval = va_arg( ap, char * );
oldoutc = outc;
outc += strlen(sval);
- if (outc < BUFSIZ-1)
+ if (outc < BUFFER_SIZE-1)
{
strcpy(outbuf + oldoutc, sval);
}
}
oldoutc = outc;
outc += ival;
- if (outc < BUFSIZ-1)
+ if (outc < BUFFER_SIZE-1)
{
memcpy(outbuf + oldoutc, sval, ival);
}
#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;
-#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);
#endif /* ndef _WIN32 */
oldoutc = outc;
outc += strlen(sval);
- if (outc < BUFSIZ-1)
+ if (outc < BUFFER_SIZE-1)
{
strcpy(outbuf + oldoutc, sval);
}
*/
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;
- 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);
}
}
break;
default:
- sprintf(outbuf, "IJB(%d) Error: log_error(): Bad format string:\n"
+ sprintf(outbuf, "IJB(%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 */
{
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;
/* 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);
logfp = stderr;
}
- fputs(outbuf, logfp);
+ fputs(outbuf_save, logfp);
if (loglevel == LOG_LEVEL_FATAL)
{
- fatal_error(outbuf);
+ fatal_error(outbuf_save);
/* Never get here */
}
#if defined(_WIN32) && !defined(_WIN_CONSOLE)
/* Write to display */
- LogPutString(outbuf);
+ LogPutString(outbuf_save);
#endif /* defined(_WIN32) && !defined(_WIN_CONSOLE) */
}
+#ifdef _WIN32
/*********************************************************************
*
* Function : w32_socket_strerr
* 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) \
sprintf(tmp_buf, "(error number %d)", errcode);
return tmp_buf;
}
+#endif /* def _WIN32 */
/*
tab-width: 3
end:
*/
-
projects / privoxy.git / blobdiff