X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=miscutil.c;h=3eb707ca15da9d39590c24c8587b17a3bdd06482;hp=12e9ba497479e5c806fd8553446ad887287f6703;hb=d97f9cde5d3740e29c00b5f08c92d469955ca34b;hpb=0072b2fd5d165c25c258a69481b9a738bac9d801 diff --git a/miscutil.c b/miscutil.c index 12e9ba49..3eb707ca 100644 --- a/miscutil.c +++ b/miscutil.c @@ -1,4 +1,4 @@ -const char miscutil_rcs[] = "$Id: miscutil.c,v 1.48 2007/04/09 17:48:51 fabiankeil Exp $"; +const char miscutil_rcs[] = "$Id: miscutil.c,v 1.57 2008/03/24 15:29:51 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/miscutil.c,v $ @@ -44,6 +44,42 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.48 2007/04/09 17:48:51 fabianke * * Revisions : * $Log: miscutil.c,v $ + * 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. + * + * 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. + * + * Revision 1.49 2007/05/11 11:48:15 fabiankeil + * - Delete strsav() which was replaced + * by string_append() years ago. + * - Add a strlcat() look-alike. + * - Use strlcat() and strlcpy() in those parts + * of the code that are run on unixes. + * * Revision 1.48 2007/04/09 17:48:51 fabiankeil * Check for HAVE_SNPRINTF instead of __OS2__ * before including the portable snprintf() code. @@ -749,7 +785,7 @@ char *string_toupper(const char *string) while (*q != '\0') { - *p++ = toupper((int) *q++); + *p++ = (char)toupper((int) *q++); } return result; @@ -757,144 +793,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 @@ -1062,6 +960,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) @@ -1077,8 +981,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 /* @@ -1093,8 +998,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 @@ -1109,7 +1048,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) @@ -1125,9 +1064,15 @@ size_t privoxy_strlcat(char *destination, const char *source, const size_t size) * * Function : timegm * - * Description : libc replacement function for the inverse of gmtime() + * Description : libc replacement function for the inverse of gmtime(). * Copyright (C) 2004 Free Software Foundation, Inc. - * Code copied from GnuPG with minor style changes. + * + * Code originally copied from GnuPG, modifications done + * for Privoxy: style changed, #ifdefs for _WIN32 added + * to have it work on mingw32. + * + * XXX: It's very unlikely to happen, but if the malloc() + * call fails the time zone will be permanently set to UTC. * * Parameters : * 1 : tm: Broken-down time struct. @@ -1140,31 +1085,37 @@ time_t timegm(struct tm *tm) time_t answer; char *zone; - zone=getenv("TZ"); + zone = getenv("TZ"); putenv("TZ=UTC"); tzset(); - answer=mktime(tm); - if(zone) + answer = mktime(tm); + if (zone) { char *old_zone; - old_zone=malloc(3+strlen(zone)+1); - if(old_zone) + old_zone = malloc(3 + strlen(zone) + 1); + if (old_zone) { - strcpy(old_zone,"TZ="); - strcat(old_zone,zone); + strcpy(old_zone, "TZ="); + strcat(old_zone, zone); putenv(old_zone); +#ifdef _WIN32 + free(old_zone); +#endif /* def _WIN32 */ } } else { #ifdef HAVE_UNSETENV unsetenv("TZ"); +#elif defined(_WIN32) + putenv("TZ="); #else putenv("TZ"); #endif } tzset(); + return answer; } #endif /* !defined(HAVE_TIMEGM) && defined(HAVE_TZSET) && defined(HAVE_PUTENV) */