X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=errlog.c;h=e3644fd36b1540567d3dd66e6d9711e49456ead1;hp=0e672a767cb87d94579a5909259cb920bb0a58e4;hb=c54228f0ef0172341cfe4f9acb7e955fa1e269b7;hpb=cf00a1febf05c13975594dc5a2b7e23572cc1177

diff --git a/errlog.c b/errlog.c
index 0e672a76..e3644fd3 100644
--- a/errlog.c
+++ b/errlog.c
@@ -1,4 +1,4 @@
-const char errlog_rcs[] = "$Id: errlog.c,v 1.60 2007/11/03 19:03:31 fabiankeil Exp $";
+const char errlog_rcs[] = "$Id: errlog.c,v 1.63 2007/12/15 19:49:32 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/errlog.c,v $
@@ -33,6 +33,18 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.60 2007/11/03 19:03:31 fabiankeil E
  *
  * Revisions   :
  *    $Log: errlog.c,v $
+ *    Revision 1.63  2007/12/15 19:49:32  fabiankeil
+ *    Stop overloading logfile to control the mingw32 log window as well.
+ *    It's no longer necessary now that we disable all debug lines by default
+ *    and at least one user perceived it as a regression (added in 1.55).
+ *
+ *    Revision 1.62  2007/11/30 15:33:46  fabiankeil
+ *    Unbreak LOG_LEVEL_FATAL. It wasn't fatal with logging disabled
+ *    and on mingw32 fatal log messages didn't end up in the log file.
+ *
+ *    Revision 1.61  2007/11/04 19:03:01  fabiankeil
+ *    Fix another deadlock Hal spotted and that mysteriously didn't affect FreeBSD.
+ *
  *    Revision 1.60  2007/11/03 19:03:31  fabiankeil
  *    - Prevent the Windows GUI from showing the version two times in a row.
  *    - Stop using the imperative in the "(Re-)Open logfile" message.
@@ -431,11 +443,13 @@ static void fatal_error(const char * error_message)
 
    /* Cleanup - remove taskbar icon etc. */
    TermLogWindow();
-
-#else /* if !defined(_WIN32) || defined(_WIN_CONSOLE) */
-   fputs(error_message, logfp);
 #endif /* defined(_WIN32) && !defined(_WIN_CONSOLE) */
 
+   if (logfp != NULL)
+   {
+      fputs(error_message, logfp);
+   }
+
 #if defined(unix)
    if (pidfile)
    {
@@ -530,7 +544,8 @@ void disable_logging(void)
 {
    if (logfp != NULL)
    {
-      log_error(LOG_LEVEL_INFO, "No logfile configured. Logging disabled.");
+      log_error(LOG_LEVEL_INFO,
+         "No logfile configured. Please enable it before reporting any problems.");
       lock_logfile();
       fclose(logfp);
       logfp = NULL;
@@ -900,7 +915,11 @@ void log_error(int loglevel, const char *fmt, ...)
     * settings and that logging is enabled.
     * Bail out otherwise.
     */
-   if ((0 == (loglevel & debug)) || (logfp == NULL))
+   if ((0 == (loglevel & debug))
+#ifndef _WIN32
+      || (logfp == NULL)
+#endif
+      )
    {
       return;
    }
@@ -919,9 +938,6 @@ void log_error(int loglevel, const char *fmt, ...)
          snprintf(tempbuf, sizeof(tempbuf),
             "%s Privoxy(%08lx) Fatal error: log_error() failed to allocate buffer memory.\n"
             "\nExiting.", timestamp, thread_id);
-         assert(NULL != logfp);
-         fputs(tempbuf, logfp);
-         unlock_logfile();
          fatal_error(tempbuf); /* Exit */
       }
    }
@@ -1139,15 +1155,23 @@ void log_error(int loglevel, const char *fmt, ...)
       loglevel = LOG_LEVEL_FATAL;
    }
 
-   assert(NULL != logfp);
+#ifdef _WIN32
+   assert(loglevel & debug);
+#else
+   assert(
+          (NULL != logfp) ||
+          (loglevel & debug));
+#endif
 
    if (loglevel == LOG_LEVEL_FATAL)
    {
       fatal_error(outbuf_save);
       /* Never get here */
    }
-   fputs(outbuf_save, logfp);
-
+   if (logfp != NULL)
+   {
+      fputs(outbuf_save, logfp);
+   }
    unlock_logfile();
 
 #if defined(_WIN32) && !defined(_WIN_CONSOLE)