X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=miscutil.c;h=8036a46faedf820faf025a5ea5b3596309c4f143;hb=e741e95518a4bbce41f9bcea155c73d316eedbf8;hp=07ae6e7f2268b6f52e39781f497ca79924be295e;hpb=b8e38d514e47283a9e1cddf257cfc847dd0d8fb0;p=privoxy.git

diff --git a/miscutil.c b/miscutil.c
index 07ae6e7f..8036a46f 100644
--- a/miscutil.c
+++ b/miscutil.c
@@ -1,4 +1,4 @@
-const char miscutil_rcs[] = "$Id: miscutil.c,v 1.50 2007/06/10 14:59:59 fabiankeil Exp $";
+const char miscutil_rcs[] = "$Id: miscutil.c,v 1.55 2007/11/03 17:34:49 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/miscutil.c,v $
@@ -44,6 +44,25 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.50 2007/06/10 14:59:59 fabianke
  *
  * Revisions   :
  *    $Log: miscutil.c,v $
+ *    Revision 1.55  2007/11/03 17:34:49  fabiankeil
+ *    Log the "weak randomization factor" warning only
+ *    once for mingw32 and provide some more details.
+ *
+ *    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.52  2007/08/19 12:32:34  fabiankeil
+ *    Fix a conversion warning.
+ *
+ *    Revision 1.51  2007/06/17 16:12:22  fabiankeil
+ *    #ifdef _WIN32 the last commit. According to David Shaw,
+ *    one of the gnupg developers, the changes are mingw32-specific.
+ *
  *    Revision 1.50  2007/06/10 14:59:59  fabiankeil
  *    Change replacement timegm() to better match our style, plug a small
  *    but guaranteed memory leak and fix "time zone breathing" on mingw32.
@@ -760,7 +779,7 @@ char *string_toupper(const char *string)
 
    while (*q != '\0')
    {
-      *p++ = toupper((int) *q++);
+      *p++ = (char)toupper((int) *q++);
    }
 
    return result;
@@ -1073,6 +1092,12 @@ char * make_path(const char * dir, const char * file)
 long int pick_from_range(long int range)
 {
    long int number;
+
+   assert(range != 0);
+   assert(range > 0);
+
+   if (range <= 0) return 0;
+
 #ifdef HAVE_RANDOM
    number = random() % range + 1; 
 #elif defined(FEATURE_PTHREAD)
@@ -1088,8 +1113,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.
+    *
+    * 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
    /*
@@ -1104,8 +1130,42 @@ long int pick_from_range(long int range)
 
 #endif /* (def HAVE_RANDOM) */
 
-   return (number);
+   return number;
+}
+
+
+#ifdef USE_PRIVOXY_STRLCPY
+/*********************************************************************
+ *
+ * Function    :  privoxy_strlcpy
+ *
+ * Description :  strlcpy(3) look-alike for those without decent libc.
+ *
+ * Parameters  :
+ *          1  :  destination: buffer to copy into.
+ *          2  :  source: String to copy.
+ *          3  :  size: Size of destination buffer.
+ *
+ * Returns     :  The length of the string that privoxy_strlcpy() tried to create.
+ *
+ *********************************************************************/
+size_t privoxy_strlcpy(char *destination, const char *source, const size_t size)
+{
+   if (0 < size)
+   {
+      snprintf(destination, size, "%s", source);
+      /*
+       * Platforms that lack strlcpy() also tend to have
+       * a broken snprintf implementation that doesn't
+       * guarantee nul termination.
+       *
+       * XXX: the configure script should detect and reject those.
+       */
+      destination[size-1] = '\0';
+   }
+   return strlen(source);
 }
+#endif /* def USE_PRIVOXY_STRLCPY */
 
 
 #ifndef HAVE_STRLCAT
@@ -1120,7 +1180,7 @@ long int pick_from_range(long int range)
  *          2  :  source: String to copy.
  *          3  :  size: Size of destination buffer.
  *
- * Returns     :  The length of the string that strlcat tried to create.
+ * Returns     :  The length of the string that privoxy_strlcat() tried to create.
  *
  *********************************************************************/
 size_t privoxy_strlcat(char *destination, const char *source, const size_t size)