-const char miscutil_rcs[] = "$Id: miscutil.c,v 1.52 2007/08/19 12:32:34 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 $
*
* 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.
*
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)
*
* 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
/*
#endif /* (def HAVE_RANDOM) */
- return (number);
+ return number;
}
*********************************************************************/
size_t privoxy_strlcpy(char *destination, const char *source, const size_t 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) ? size-1 : 0] = '\0';
-
+ 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 */