Log the "weak randomization factor" warning only

once for mingw32 and provide some more details.

diff --git a/jcc.c b/jcc.c
index 30e146b..24e4522 100644 (file)
--- a/jcc.c
+++ b/jcc.c
@@ -1,4 +1,4 @@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.155 2007/10/23 20:12:45 fabiankeil Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.156 2007/11/01 18:20:58 fabiankeil Exp $";

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.c,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.c,v $


@@ -33,6 +33,10 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.155 2007/10/23 20:12:45 fabiankeil Exp $"
  *
  * Revisions   :
  *    $Log: jcc.c,v $
  *
  * Revisions   :
  *    $Log: jcc.c,v $

+ *    Revision 1.156  2007/11/01 18:20:58  fabiankeil
+ *    Initialize log module after initializing mutexes, future
+ *    deadlocks in that code should now work cross-platform.
+ *

  *    Revision 1.155  2007/10/23 20:12:45  fabiankeil
  *    Fix first CSUCCEED line to end in \r\n as required by RFC1945.
  *    Reported by Bert van Leeuwen in BR#1818808.
  *    Revision 1.155  2007/10/23 20:12:45  fabiankeil
  *    Fix first CSUCCEED line to end in \r\n as required by RFC1945.
  *    Reported by Bert van Leeuwen in BR#1818808.


@@ -3103,6 +3107,7 @@ int main(int argc, const char *argv[])
    files->next = NULL;
    clients->next = NULL;
 
    files->next = NULL;
    clients->next = NULL;
 

+   /* XXX: factor out initialising after the next stable release. */

 #ifdef AMIGA
    InitAmiga();
 #elif defined(_WIN32)
 #ifdef AMIGA
    InitAmiga();
 #elif defined(_WIN32)


@@ -3118,6 +3123,15 @@ int main(int argc, const char *argv[])
    random_seed = (unsigned int)time(NULL);
 #ifdef HAVE_RANDOM
    srandom(random_seed);
    random_seed = (unsigned int)time(NULL);
 #ifdef HAVE_RANDOM
    srandom(random_seed);

+#elif defined (_WIN32)
+   /*
+    * See pick_from_range() in miscutil.c for details.
+    */
+   log_error(LOG_LEVEL_INFO,
+      "No thread-safe PRNG implemented for your platform. "
+      "Using weak \'randomization\' factor which will "
+      "limit the already questionable usefulness of "
+      "header-time-randomizing actions (disabled by default).");

 #else
    srand(random_seed);
 #endif /* ifdef HAVE_RANDOM */
 #else
    srand(random_seed);
 #endif /* ifdef HAVE_RANDOM */

diff --git a/miscutil.c b/miscutil.c
index ab1ccae..f2bbc18 100644 (file)
--- a/miscutil.c
+++ b/miscutil.c
@@ -1,4 +1,4 @@
-const char miscutil_rcs[] = "$Id: miscutil.c,v 1.53 2007/09/09 18:20:20 fabiankeil Exp $";
+const char miscutil_rcs[] = "$Id: miscutil.c,v 1.54 2007/09/19 20:28:37 fabiankeil Exp $";

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/miscutil.c,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/miscutil.c,v $


@@ -44,6 +44,10 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.53 2007/09/09 18:20:20 fabianke
  *
  * Revisions   :
  *    $Log: miscutil.c,v $
  *
  * Revisions   :
  *    $Log: miscutil.c,v $

+ *    Revision 1.54  2007/09/19 20:28:37  fabiankeil
+ *    If privoxy_strlcpy() is called with a "buffer" size
+ *    of 0, don't touch whatever destination points to.
+ *

  *    Revision 1.53  2007/09/09 18:20:20  fabiankeil
  *    Turn privoxy_strlcpy() into a function and try to work with
  *    b0rked snprintf() implementations too. Reported by icmp30.
  *    Revision 1.53  2007/09/09 18:20:20  fabiankeil
  *    Turn privoxy_strlcpy() into a function and try to work with
  *    b0rked snprintf() implementations too. Reported by icmp30.


@@ -1099,8 +1103,9 @@ long int pick_from_range(long int range)
     *
     * Currently we don't have mutexes for mingw32, and for
     * our purpose this cludge is probably preferable to crashes.
     *
     * Currently we don't have mutexes for mingw32, and for
     * our purpose this cludge is probably preferable to crashes.

+    *
+    * The warning is shown once on startup from jcc.c.

     */
     */

-   log_error(LOG_LEVEL_INFO, "No thread-safe PRNG available? Using weak \'randomization\' factor.");

    number = (range + GetCurrentThreadId() % range) / 2;
 #else
    /*
    number = (range + GetCurrentThreadId() % range) / 2;
 #else
    /*