X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=miscutil.c;h=fe19582a959b08a5b25b76fe5a322ba8f16d0a43;hb=29cf52cc22d3242d2e94d5ee3d2b7023f1b743e7;hp=53958a2574647c391746016f27c7ffa85cb2dcbb;hpb=730da5d840d9572b9c0a5b8d90a2e1beebaa0adc;p=privoxy.git

diff --git a/miscutil.c b/miscutil.c
index 53958a25..fe19582a 100644
--- a/miscutil.c
+++ b/miscutil.c
@@ -1,4 +1,4 @@
-const char miscutil_rcs[] = "$Id: miscutil.c,v 1.41 2006/08/18 16:03:17 david__schmidt Exp $";
+const char miscutil_rcs[] = "$Id: miscutil.c,v 1.44 2006/11/07 12:46:43 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/miscutil.c,v $
@@ -36,6 +36,17 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.41 2006/08/18 16:03:17 david__s
  *
  * Revisions   :
  *    $Log: miscutil.c,v $
+ *    Revision 1.44  2006/11/07 12:46:43  fabiankeil
+ *    Silence compiler warning on NetBSD 3.1.
+ *
+ *    Revision 1.43  2006/09/23 13:26:38  roro
+ *    Replace TABs by spaces in source code.
+ *
+ *    Revision 1.42  2006/09/09 14:01:45  fabiankeil
+ *    Integrated Oliver Yeoh's domain pattern fix
+ *    to make sure *x matches xx. Closes Patch 1217393
+ *    and Bug 1170767.
+ *
  *    Revision 1.41  2006/08/18 16:03:17  david__schmidt
  *    Tweak for OS/2 build happiness.
  *
@@ -762,7 +773,7 @@ char *string_toupper(const char *string)
 
    while (*q != '\0')
    {
-      *p++ = toupper(*q++);
+      *p++ = toupper((int) *q++);
    }
 
    return result;
@@ -1073,25 +1084,37 @@ char * make_path(const char * dir, const char * file)
 long int pick_from_range(long int range)
 {
    long int number;
-#ifndef HAVE_RANDOM
-   unsigned int weak_seed;
-
-   weak_seed = (unsigned int)((unsigned int)time(NULL) | (unsigned int)range);
-   srand(weak_seed);
+#ifdef HAVE_RANDOM
+   number = random() % range + 1; 
+#elif defined(FEATURE_PTHREAD)
+   pthread_mutex_lock(&rand_mutex);
+   number = rand() % (long int)(range + 1);
+   pthread_mutex_unlock(&rand_mutex);
+#else
+#ifdef _WIN32
    /*
-    * Some rand implementations aren't that random and return mostly
-    * lower numbers. Low entropy doesn't matter for the header times, 
-    * but higher "random" factors are prefered.
+    * On Windows and mingw32 srand() has to be called in every
+    * rand()-using thread, but can cause crashes if it's not
+    * mutex protected.
+    *
+    * Currently we don't have mutexes for mingw32, and for
+    * our purpose this cludge is probably preferable to crashes.
     */
-   number = (rand() * 12345) % (long int)(range + 1);
-   /* Overflows don't matter either, positive numbers do. */
-   if(number<0)
-   {
-      number*= -1;
-   }
+   log_error(LOG_LEVEL_INFO, "No thread-safe PRNG available? Using weak \'randomization\' factor.");
+   number = (range + GetCurrentThreadId() % range) / 2;
 #else
-   number = random() % range + 1; 
-#endif /* (ifndef HAVE_RANDOM) */
+   /*
+    * XXX: Which platforms reach this and are there
+    * better options than just using rand() and hoping
+    * that it's safe?
+    */
+   log_error(LOG_LEVEL_INFO, "No thread-safe PRNG available? Header time randomization might cause "
+      "crashes, predictable results or even combine these fine options.");
+   number = rand() % (long int)(range + 1);
+#endif /* def _WIN32 */ 
+
+#endif /* (def HAVE_RANDOM) */
+
    return (number);
 }
 
@@ -1130,7 +1153,7 @@ time_t timegm(struct tm *tm)
       {
          strcpy(old_zone,"TZ=");
          strcat(old_zone,zone);
-         putenv(old_zone);	
+         putenv(old_zone);
       }
    }
    else