X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=miscutil.c;h=9604c90ede8165b69b90a72786342ad84e078892;hp=bde7237100449e45034583afc4115bb2e6d44e99;hb=6fb0d5b897f16c213862a955482b17c14a02a729;hpb=e4aec8092bcef36685f4ce01ed83de1c024ba252 diff --git a/miscutil.c b/miscutil.c index bde72371..9604c90e 100644 --- a/miscutil.c +++ b/miscutil.c @@ -1,4 +1,4 @@ -const char miscutil_rcs[] = "$Id: miscutil.c,v 1.35 2002/03/26 22:29:55 swa Exp $"; +const char miscutil_rcs[] = "$Id: miscutil.c,v 1.42 2006/09/09 14:01:45 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/miscutil.c,v $ @@ -36,6 +36,54 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.35 2002/03/26 22:29:55 swa Exp * * Revisions : * $Log: miscutil.c,v $ + * 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. + * + * Revision 1.40 2006/08/17 17:15:10 fabiankeil + * - Back to timegm() using GnuPG's replacement if necessary. + * Using mktime() and localtime() could add a on hour offset if + * the randomize factor was big enough to lead to a summer/wintertime + * switch. + * + * - Removed now-useless Privoxy 3.0.3 compatibility glue. + * + * - Moved randomization code into pick_from_range(). + * + * - Changed parse_header_time definition. + * time_t isn't guaranteed to be signed and + * if it isn't, -1 isn't available as error code. + * Changed some variable types in client_if_modified_since() + * because of the same reason. + * + * Revision 1.39 2006/07/18 14:48:46 david__schmidt + * Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch) + * with what was really the latest development (the v_3_0_branch branch) + * + * Revision 1.37.2.4 2003/12/01 14:45:14 oes + * Fixed two more problems with wildcarding in simplematch() + * + * Revision 1.37.2.3 2003/11/20 11:39:24 oes + * Bugfix: The "?" wildcard for domain names had never been implemented. Ooops\! + * + * Revision 1.37.2.2 2002/11/12 14:28:18 oes + * Proper backtracking in simplematch; fixes bug #632888 + * + * Revision 1.37.2.1 2002/09/25 12:58:51 oes + * Made strcmpic and strncmpic safe against NULL arguments + * (which are now treated as empty strings). + * + * Revision 1.37 2002/04/26 18:29:43 jongfoster + * Fixing this Visual C++ warning: + * miscutil.c(710) : warning C4090: '=' : different 'const' qualifiers + * + * Revision 1.36 2002/04/26 12:55:38 oes + * New function string_toupper + * * Revision 1.35 2002/03/26 22:29:55 swa * we have a new homepage! * @@ -209,6 +257,10 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.35 2002/03/26 22:29:55 swa Exp #include #include +#ifndef HAVE_TIMEGM +#include +#endif /* #ifndef HAVE_TIMEGM */ + #include "project.h" #include "miscutil.h" #include "errlog.h" @@ -392,6 +444,9 @@ char *safe_strerror(int err) *********************************************************************/ int strcmpic(const char *s1, const char *s2) { + if (!s1) s1 = ""; + if (!s2) s2 = ""; + while (*s1 && *s2) { if ( ( *s1 != *s2 ) && ( ijb_tolower(*s1) != ijb_tolower(*s2) ) ) @@ -422,7 +477,9 @@ int strcmpic(const char *s1, const char *s2) int strncmpic(const char *s1, const char *s2, size_t n) { if (n <= 0) return(0); - + if (!s1) s1 = ""; + if (!s2) s2 = ""; + while (*s1 && *s2) { if ( ( *s1 != *s2 ) && ( ijb_tolower(*s1) != ijb_tolower(*s2) ) ) @@ -697,7 +754,8 @@ jb_err string_join(char **target_string, char *text_to_append) *********************************************************************/ char *string_toupper(const char *string) { - char *result, *q, *p; + char *result, *p; + const char *q; if (!string || ((result = (char *) zalloc(strlen(string) + 1)) == NULL)) { @@ -744,14 +802,20 @@ int simplematch(char *pattern, char *text) unsigned i; unsigned char charmap[32]; - while (*txt) { /* EOF pattern but !EOF text? */ if (*pat == '\0') { - return 1; + if (wildcard) + { + pat = fallback; + } + else + { + return 1; + } } /* '*' in the pattern? */ @@ -800,26 +864,42 @@ int simplematch(char *pattern, char *text) } /* -END- if Character range specification */ - /* Compare: Char match, or char range match*/ - if ((*pat == *txt) - || ((*pat == ']') && (charmap[*txt / 8] & (1 << (*txt % 8)))) ) + /* + * Char match, or char range match? + */ + if ( (*pat == *txt) + || (*pat == '?') + || ((*pat == ']') && (charmap[*txt / 8] & (1 << (*txt % 8)))) ) { - /* Sucess, go ahead */ + /* + * Sucess: Go ahead + */ pat++; } - else + else if (!wildcard) { - /* In wildcard mode, just try again after failiure */ - if(wildcard) - { - pat = fallback; - } - - /* Else, bad luck */ - else + /* + * No match && no wildcard: No luck + */ + return 1; + } + else if (pat != fallback) + { + /* + * Increment text pointer if in char range matching + */ + if (*pat == ']') { - return 1; + txt++; } + /* + * Wildcard mode && nonmatch beyond fallback: Rewind pattern + */ + pat = fallback; + /* + * Restart matching from current text pointer + */ + continue; } txt++; } @@ -980,6 +1060,98 @@ char * make_path(const char * dir, const char * file) } +/********************************************************************* + * + * Function : pick_from_range + * + * Description : Pick a positive number out of a given range. + * Should only be used if randomness would be nice, + * but isn't really necessary. + * + * Parameters : + * 1 : range: Highest possible number to pick. + * + * Returns : Picked number. + * + *********************************************************************/ + +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); + /* + * 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. + */ + number = (rand() * 12345) % (long int)(range + 1); + /* Overflows don't matter either, positive numbers do. */ + if(number<0) + { + number*= -1; + } +#else + number = random() % range + 1; +#endif /* (ifndef HAVE_RANDOM) */ + return (number); +} + + +#ifndef HAVE_TIMEGM +/********************************************************************* + * + * Function : timegm + * + * Description : libc replacement function for the inverse of gmtime() + * Copyright (C) 2004 Free Software Foundation, Inc. + * Code copied from GnuPG with minor style changes. + * + * Parameters : + * 1 : tm: Broken-down time struct. + * + * Returns : tm converted into time_t seconds. + * + *********************************************************************/ + +time_t timegm(struct tm *tm) +{ + time_t answer; + char *zone; + + zone=getenv("TZ"); + putenv("TZ=UTC"); + tzset(); + answer=mktime(tm); + if(zone) + { + char *old_zone; + + old_zone=malloc(3+strlen(zone)+1); + if(old_zone) + { + strcpy(old_zone,"TZ="); + strcat(old_zone,zone); + putenv(old_zone); + } + } + else + { +#ifdef HAVE_UNSETENV + unsetenv("TZ"); +#else + putenv("TZ"); +#endif + } + tzset(); + return answer; +} +#endif /* (ifndef HAVE_TIMEGM) */ + + /* * What follows is a portable snprintf routine, written by Mark Martinec. * See: http://www.ijs.si/software/snprintf/