X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=miscutil.c;h=5ddf9808053709fa2da3c8c28b33f42299355275;hp=8036a46faedf820faf025a5ea5b3596309c4f143;hb=f3616f2012ca291e81b33dfc716892d54ad8fde3;hpb=0c843965da6aee5a55d1b623a4b41ac9a3ace4ff diff --git a/miscutil.c b/miscutil.c index 8036a46f..5ddf9808 100644 --- a/miscutil.c +++ b/miscutil.c @@ -1,4 +1,4 @@ -const char miscutil_rcs[] = "$Id: miscutil.c,v 1.55 2007/11/03 17:34:49 fabiankeil Exp $"; +const char miscutil_rcs[] = "$Id: miscutil.c,v 1.60 2008/09/07 12:35:05 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/miscutil.c,v $ @@ -44,6 +44,23 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.55 2007/11/03 17:34:49 fabianke * * Revisions : * $Log: miscutil.c,v $ + * Revision 1.60 2008/09/07 12:35:05 fabiankeil + * Add mutex lock support for _WIN32. + * + * Revision 1.59 2008/09/04 08:13:58 fabiankeil + * Prepare for critical sections on Windows by adding a + * layer of indirection before the pthread mutex functions. + * + * Revision 1.58 2008/04/17 14:53:30 fabiankeil + * Move simplematch() into urlmatch.c as it's only + * used to match (old-school) domain patterns. + * + * Revision 1.57 2008/03/24 15:29:51 fabiankeil + * Pet gcc43. + * + * Revision 1.56 2007/12/01 12:59:05 fabiankeil + * Some sanity checks for pick_from_range(). + * * 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. @@ -787,144 +804,6 @@ char *string_toupper(const char *string) } -/********************************************************************* - * - * Function : simplematch - * - * Description : String matching, with a (greedy) '*' wildcard that - * stands for zero or more arbitrary characters and - * character classes in [], which take both enumerations - * and ranges. - * - * Parameters : - * 1 : pattern = pattern for matching - * 2 : text = text to be matched - * - * Returns : 0 if match, else nonzero - * - *********************************************************************/ -int simplematch(char *pattern, char *text) -{ - unsigned char *pat = (unsigned char *) pattern; - unsigned char *txt = (unsigned char *) text; - unsigned char *fallback = pat; - int wildcard = 0; - - unsigned char lastchar = 'a'; - unsigned i; - unsigned char charmap[32]; - - while (*txt) - { - - /* EOF pattern but !EOF text? */ - if (*pat == '\0') - { - if (wildcard) - { - pat = fallback; - } - else - { - return 1; - } - } - - /* '*' in the pattern? */ - if (*pat == '*') - { - - /* The pattern ends afterwards? Speed up the return. */ - if (*++pat == '\0') - { - return 0; - } - - /* Else, set wildcard mode and remember position after '*' */ - wildcard = 1; - fallback = pat; - } - - /* Character range specification? */ - if (*pat == '[') - { - memset(charmap, '\0', sizeof(charmap)); - - while (*++pat != ']') - { - if (!*pat) - { - return 1; - } - else if (*pat == '-') - { - if ((*++pat == ']') || *pat == '\0') - { - return(1); - } - for(i = lastchar; i <= *pat; i++) - { - charmap[i / 8] |= (1 << (i % 8)); - } - } - else - { - charmap[*pat / 8] |= (1 << (*pat % 8)); - lastchar = *pat; - } - } - } /* -END- if Character range specification */ - - - /* - * Char match, or char range match? - */ - if ( (*pat == *txt) - || (*pat == '?') - || ((*pat == ']') && (charmap[*txt / 8] & (1 << (*txt % 8)))) ) - { - /* - * Sucess: Go ahead - */ - pat++; - } - else if (!wildcard) - { - /* - * No match && no wildcard: No luck - */ - return 1; - } - else if (pat != fallback) - { - /* - * Increment text pointer if in char range matching - */ - if (*pat == ']') - { - txt++; - } - /* - * Wildcard mode && nonmatch beyond fallback: Rewind pattern - */ - pat = fallback; - /* - * Restart matching from current text pointer - */ - continue; - } - txt++; - } - - /* Cut off extra '*'s */ - if(*pat == '*') pat++; - - /* If this is the pattern's end, fine! */ - return(*pat); - -} - - /********************************************************************* * * Function : bindup @@ -1092,6 +971,9 @@ char * make_path(const char * dir, const char * file) long int pick_from_range(long int range) { long int number; +#ifdef _WIN32 + static unsigned long seed = 0; +#endif /* def _WIN32 */ assert(range != 0); assert(range > 0); @@ -1100,33 +982,27 @@ long int pick_from_range(long int range) #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 +#elif defined(MUTEX_LOCKS_AVAILABLE) + privoxy_mutex_lock(&rand_mutex); #ifdef _WIN32 - /* - * 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. - * - * The warning is shown once on startup from jcc.c. - */ - number = (range + GetCurrentThreadId() % range) / 2; + if (!seed) + { + seed = (unsigned long)(GetCurrentThreadId()+GetTickCount()); + } + srand(seed); + seed = (unsigned long)((rand() << 16) + rand()); +#endif /* def _WIN32 */ + number = (unsigned long)((rand() << 16) + (rand())) % (unsigned long)(range + 1); + privoxy_mutex_unlock(&rand_mutex); #else /* * 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."); + 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) */