X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=errlog.c;h=409723f87d973d005e8e0b89f1cddcd0cfec7691;hp=e75da78130f6b1c1982c565c7f0ee3dca92fea97;hb=a77309974a2c2d0b2f7d34be313fa079f77d3b63;hpb=426f0650549b9cb1f4275d72efb4ae3ac1acce8e

diff --git a/errlog.c b/errlog.c
index e75da781..409723f8 100644
--- a/errlog.c
+++ b/errlog.c
@@ -1,4 +1,4 @@
-const char errlog_rcs[] = "$Id: errlog.c,v 1.26 2002/01/09 19:05:45 steudten Exp $";
+const char errlog_rcs[] = "$Id: errlog.c,v 1.32 2002/03/07 03:46:17 oes Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/errlog.c,v $
@@ -33,6 +33,25 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.26 2002/01/09 19:05:45 steudten Exp
  *
  * Revisions   :
  *    $Log: errlog.c,v $
+ *    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.
  *
@@ -206,6 +225,7 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.26 2002/01/09 19:05:45 steudten Exp
 
 #include "errlog.h"
 #include "project.h"
+#include "jcc.h"
 
 const char errlog_h_rcs[] = ERRLOG_H_VERSION;
 
@@ -257,7 +277,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);
@@ -266,7 +286,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.
@@ -298,9 +318,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 */
@@ -368,8 +388,9 @@ 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;
@@ -384,11 +405,11 @@ void log_error(int loglevel, char *fmt, ...)
 
     {
        /*
-	* 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);
@@ -440,7 +461,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;
@@ -464,7 +485,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;
@@ -585,7 +606,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
             {
@@ -599,6 +620,9 @@ void log_error(int loglevel, char *fmt, ...)
             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