X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=miscutil.c;h=488a774bb965ef0fd591dfe73ed432977d72d471;hp=a45d19fd9baed71aea730ae9cdd2c3b05393f664;hb=251baeb8f9cfe5521292317bbec20e238aabfd54;hpb=b3ee70e4ee07171ad5cc5050748d53db7228f232 diff --git a/miscutil.c b/miscutil.c index a45d19fd..488a774b 100644 --- a/miscutil.c +++ b/miscutil.c @@ -1,22 +1,28 @@ -const char miscutil_rcs[] = "$Id: miscutil.c,v 1.33 2002/03/07 03:46:53 oes Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/miscutil.c,v $ * - * Purpose : zalloc, hash_string, safe_strerror, strcmpic, - * strncmpic, chomp, and MinGW32 strdup - * functions. - * These are each too small to deserve their own file - * but don't really fit in any other file. + * Purpose : zalloc, hash_string, strcmpic, strncmpic, and + * MinGW32 strdup functions. These are each too small + * to deserve their own file but don't really fit in + * any other file. * - * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Copyright : Written by and Copyright (C) 2001-2020 the + * Privoxy team. https://www.privoxy.org/ * * Based on the Internet Junkbuster originally written - * by and Copyright (C) 1997 Anonymous Coders and + * by and Copyright (C) 1997 Anonymous Coders and * Junkbusters Corporation. http://www.junkbusters.com * - * This program is free software; you can redistribute it + * The timegm replacement function was taken from GnuPG, + * Copyright (C) 2004 Free Software Foundation, Inc. + * + * The snprintf replacement function is written by + * Mark Martinec who also holds the copyright. It can be + * used under the terms of the GPL or the terms of the + * "Frontier Artistic License". + * + * This program is free software; you can redistribute it * and/or modify it under the terms of the GNU General * Public License as published by the Free Software * Foundation; either version 2 of the License, or (at @@ -34,162 +40,8 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.33 2002/03/07 03:46:53 oes Exp * or write to the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * Revisions : - * $Log: miscutil.c,v $ - * Revision 1.33 2002/03/07 03:46:53 oes - * Fixed compiler warnings etc - * - * Revision 1.32 2002/03/06 23:02:57 jongfoster - * Removing tabs - * - * Revision 1.31 2002/03/05 04:52:42 oes - * Deleted non-errlog debugging code - * - * Revision 1.30 2002/03/04 18:27:42 oes - * - Deleted deletePidFile - * - Made write_pid_file use the --pidfile option value - * (or no PID file, if the option was absent) - * - Played styleguide police - * - * Revision 1.29 2002/03/04 02:08:02 david__schmidt - * Enable web editing of actions file on OS/2 (it had been broken all this time!) - * - * Revision 1.28 2002/03/03 09:18:03 joergs - * Made jumbjuster work on AmigaOS again. - * - * Revision 1.27 2002/01/21 00:52:32 jongfoster - * Adding string_join() - * - * Revision 1.26 2001/12/30 14:07:32 steudten - * - Add signal handling (unix) - * - Add SIGHUP handler (unix) - * - Add creation of pidfile (unix) - * - Add action 'top' in rc file (RH) - * - Add entry 'SIGNALS' to manpage - * - Add exit message to logfile (unix) - * - * Revision 1.25 2001/11/13 00:16:38 jongfoster - * Replacing references to malloc.h with the standard stdlib.h - * (See ANSI or K&R 2nd Ed) - * - * Revision 1.24 2001/11/05 21:41:43 steudten - * Add changes to be a real daemon just for unix os. - * (change cwd to /, detach from controlling tty, set - * process group and session leader to the own process. - * Add DBG() Macro. - * Add some fatal-error log message for failed malloc(). - * Add '-d' if compiled with 'configure --with-debug' to - * enable debug output. - * - * Revision 1.23 2001/10/29 03:48:10 david__schmidt - * OS/2 native needed a snprintf() routine. Added one to miscutil, brackedted - * by and __OS2__ ifdef. - * - * Revision 1.22 2001/10/26 17:39:38 oes - * Moved ijb_isspace and ijb_tolower to project.h - * - * Revision 1.21 2001/10/23 21:27:50 jongfoster - * Standardising error codes in string_append - * make_path() no longer adds '\\' if the dir already ends in '\\' (this - * is just copying a UNIX-specific fix to the Windows-specific part) - * - * Revision 1.20 2001/10/22 15:33:56 david__schmidt - * Special-cased OS/2 out of the Netscape-abort-on-404-in-js problem in - * filters.c. Added a FIXME in front of the offending code. I'll gladly - * put in a better/more robust fix for all parties if one is presented... - * It seems that just returning 200 instead of 404 would pretty much fix - * it for everyone, but I don't know all the history of the problem. - * - * Revision 1.19 2001/10/14 22:02:57 jongfoster - * New function string_append() which is like strsav(), but running - * out of memory isn't automatically FATAL. - * - * Revision 1.18 2001/09/20 13:33:43 steudten - * - * change long to int as return value in hash_string(). Remember the wraparound - * for int = long = sizeof(4) - thats maybe not what we want. - * - * Revision 1.17 2001/09/13 20:51:29 jongfoster - * Fixing potential problems with characters >=128 in simplematch() - * This was also a compiler warning. - * - * Revision 1.16 2001/09/10 10:56:59 oes - * Silenced compiler warnings - * - * Revision 1.15 2001/07/13 14:02:24 oes - * Removed vim-settings - * - * Revision 1.14 2001/06/29 21:45:41 oes - * Indentation, CRLF->LF, Tab-> Space - * - * Revision 1.13 2001/06/29 13:32:14 oes - * Removed logentry from cancelled commit - * - * Revision 1.12 2001/06/09 10:55:28 jongfoster - * Changing BUFSIZ ==> BUFFER_SIZE - * - * Revision 1.11 2001/06/07 23:09:19 jongfoster - * Cosmetic indentation changes. - * - * Revision 1.10 2001/06/07 14:51:38 joergs - * make_path() no longer adds '/' if the dir already ends in '/'. - * - * Revision 1.9 2001/06/07 14:43:17 swa - * slight mistake in make_path, unix path style is /. - * - * Revision 1.8 2001/06/05 22:32:01 jongfoster - * New function make_path() to splice directory and file names together. - * - * Revision 1.7 2001/06/03 19:12:30 oes - * introduced bindup() - * - * Revision 1.6 2001/06/01 18:14:49 jongfoster - * Changing the calls to strerr() to check HAVE_STRERR (which is defined - * in config.h if appropriate) rather than the NO_STRERR macro. - * - * Revision 1.5 2001/06/01 10:31:51 oes - * Added character class matching to trivimatch; renamed to simplematch - * - * Revision 1.4 2001/05/31 17:32:31 oes - * - * - Enhanced domain part globbing with infix and prefix asterisk - * matching and optional unanchored operation - * - * Revision 1.3 2001/05/29 23:10:09 oes - * - * - * - Introduced chomp() - * - Moved strsav() from showargs to miscutil - * - * Revision 1.2 2001/05/29 09:50:24 jongfoster - * Unified blocklist/imagelist/permissionslist. - * File format is still under discussion, but the internal changes - * are (mostly) done. - * - * Also modified interceptor behaviour: - * - We now intercept all URLs beginning with one of the following - * prefixes (and *only* these prefixes): - * * http://i.j.b/ - * * http://ijbswa.sf.net/config/ - * * http://ijbswa.sourceforge.net/config/ - * - New interceptors "home page" - go to http://i.j.b/ to see it. - * - Internal changes so that intercepted and fast redirect pages - * are not replaced with an image. - * - Interceptors now have the option to send a binary page direct - * to the client. (i.e. ijb-send-banner uses this) - * - Implemented show-url-info interceptor. (Which is why I needed - * the above interceptors changes - a typical URL is - * "http://i.j.b/show-url-info?url=www.somesite.com/banner.gif". - * The previous mechanism would not have intercepted that, and - * if it had been intercepted then it then it would have replaced - * it with an image.) - * - * Revision 1.1.1.1 2001/05/15 13:59:00 oes - * Initial import of version 2.9.3 source tree - * - * *********************************************************************/ - + #include "config.h" @@ -203,170 +55,217 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.33 2002/03/07 03:46:53 oes Exp #include #include +#if !defined(HAVE_TIMEGM) && defined(HAVE_TZSET) && defined(HAVE_PUTENV) +#include +#endif /* !defined(HAVE_TIMEGM) && defined(HAVE_TZSET) && defined(HAVE_PUTENV) */ + #include "project.h" #include "miscutil.h" -#include "errlog.h" #include "jcc.h" - -const char miscutil_h_rcs[] = MISCUTIL_H_VERSION; +#include "errlog.h" /********************************************************************* * * Function : zalloc * - * Description : Malloc some memory and set it to '\0'. - * The way calloc() ought to be -acjc + * Description : Returns allocated memory that is initialized + * with zeros. * * Parameters : * 1 : size = Size of memory chunk to return. * - * Returns : Pointer to newly malloc'd memory chunk. + * Returns : Pointer to newly alloc'd memory chunk. * *********************************************************************/ void *zalloc(size_t size) { void * ret; +#ifdef HAVE_CALLOC + ret = calloc(1, size); +#else +#warning calloc appears to be unavailable. Your platform will become unsupported in the future if ((ret = (void *)malloc(size)) != NULL) { memset(ret, 0, size); } +#endif return(ret); } -#if defined(unix) /********************************************************************* * - * Function : write_pid_file + * Function : zalloc_or_die * - * Description : Writes a pid file with the pid of the main process + * Description : zalloc wrapper that either succeeds or causes + * program termination. * - * Parameters : None + * Useful in situations were the string length is + * "small" and zalloc() failures couldn't be handled + * better anyway. In case of debug builds, failures + * trigger an assert(). * - * Returns : N/A + * Parameters : + * 1 : size = Size of memory chunk to return. + * + * Returns : Pointer to newly malloc'd memory chunk. * *********************************************************************/ -void write_pid_file(void) +void *zalloc_or_die(size_t size) { - FILE *fp; - - /* - * If no --pidfile option was given, - * we can live without one. - */ - if (pidfile == NULL) return; + void *buffer; - if ((fp = fopen(pidfile, "w")) == NULL) + buffer = zalloc(size); + if (buffer == NULL) { - log_error(LOG_LEVEL_INFO, "can't open pidfile '%s': %E", pidfile); + assert(buffer != NULL); + log_error(LOG_LEVEL_FATAL, "Out of memory in zalloc_or_die()."); + exit(1); } - else - { - fprintf(fp, "%u\n", (unsigned int) getpid()); - fclose (fp); - } - return; -} -#endif /* def unix */ + return(buffer); +} /********************************************************************* * - * Function : hash_string + * Function : strdup_or_die * - * Description : Take a string and compute a (hopefuly) unique numeric - * integer value. This has several uses, but being able - * to "switch" a string the one of my favorites. + * Description : strdup wrapper that either succeeds or causes + * program termination. + * + * Useful in situations were the string length is + * "small" and strdup() failures couldn't be handled + * better anyway. In case of debug builds, failures + * trigger an assert(). * * Parameters : - * 1 : s : string to be hashed. + * 1 : str = String to duplicate * - * Returns : an unsigned long variable with the hashed value. + * Returns : Pointer to newly strdup'd copy of the string. * *********************************************************************/ -unsigned int hash_string( const char* s ) +char *strdup_or_die(const char *str) { - unsigned int h = 0; + char *new_str; - for ( ; *s; ++s ) + new_str = strdup(str); + + if (new_str == NULL) { - h = 5 * h + *s; + assert(new_str != NULL); + log_error(LOG_LEVEL_FATAL, "Out of memory in strdup_or_die()."); + exit(1); } - return (h); + return(new_str); } -#ifdef __MINGW32__ /********************************************************************* * - * Function : strdup + * Function : malloc_or_die * - * Description : For some reason (which is beyond me), gcc and WIN32 - * don't like strdup. When a "free" is executed on a - * strdup'd ptr, it can at times freez up! So I just - * replaced it and problem was solved. + * Description : malloc wrapper that either succeeds or causes + * program termination. + * + * Useful in situations were the buffer size is "small" + * and malloc() failures couldn't be handled better + * anyway. In case of debug builds, failures trigger + * an assert(). * * Parameters : - * 1 : s = string to duplicate + * 1 : buffer_size = Size of the space to allocate * - * Returns : Pointer to newly malloc'ed copy of the string. + * Returns : Pointer to newly malloc'd memory * *********************************************************************/ -char *strdup( const char *s ) +void *malloc_or_die(size_t buffer_size) { - char * result = (char *)malloc( strlen(s)+1 ); + char *new_buf; - if (result != NULL) + if (buffer_size == 0) { - strcpy( result, s ); + log_error(LOG_LEVEL_ERROR, + "malloc_or_die() called with buffer size 0"); + assert(buffer_size != 0); + buffer_size = 4096; } - return( result ); -} + new_buf = malloc(buffer_size); + + if (new_buf == NULL) + { + assert(new_buf != NULL); + log_error(LOG_LEVEL_FATAL, "Out of memory in malloc_or_die()."); + exit(1); + } -#endif /* def __MINGW32__ */ + return(new_buf); +} +#if defined(unix) /********************************************************************* * - * Function : safe_strerror + * Function : write_pid_file * - * Description : Variant of the library routine strerror() which will - * work on systems without the library routine, and - * which should never return NULL. + * Description : Writes a pid file with the pid of the main process. + * Exits if the file can't be opened * * Parameters : - * 1 : err = the `errno' of the last operation. + * 1 : pid_file = Path of the pid file that gets created. * - * Returns : An "English" string of the last `errno'. Allocated - * with strdup(), so caller frees. May be NULL if the - * system is out of memory. + * Returns : N/A * *********************************************************************/ -char *safe_strerror(int err) +void write_pid_file(const char *pid_file) { - char *s = NULL; - char buf[BUFFER_SIZE]; + FILE *fp; + if ((fp = fopen(pid_file, "w")) == NULL) + { + log_error(LOG_LEVEL_FATAL, "can't open pid file '%s': %E", pid_file); + } + else + { + fprintf(fp, "%u\n", (unsigned int) getpid()); + fclose (fp); + } + return; + +} +#endif /* def unix */ -#ifdef HAVE_STRERROR - s = strerror(err); -#endif /* HAVE_STRERROR */ - if (s == NULL) +/********************************************************************* + * + * Function : hash_string + * + * Description : Take a string and compute a (hopefuly) unique numeric + * integer value. This is useful to "switch" a string. + * + * Parameters : + * 1 : s : string to be hashed. + * + * Returns : The string's hash + * + *********************************************************************/ +unsigned int hash_string(const char* s) +{ + unsigned int h = 0; + + for (; *s; ++s) { - sprintf(buf, "(errno = %d)", err); - s = buf; + h = 5 * h + (unsigned int)*s; } - return(strdup(s)); + return (h); } @@ -386,15 +285,18 @@ 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) ) ) + if ((*s1 != *s2) && (privoxy_tolower(*s1) != privoxy_tolower(*s2))) { break; } s1++, s2++; } - return(ijb_tolower(*s1) - ijb_tolower(*s2)); + return(privoxy_tolower(*s1) - privoxy_tolower(*s2)); } @@ -403,7 +305,7 @@ int strcmpic(const char *s1, const char *s2) * * Function : strncmpic * - * Description : Case insensitive string comparison (upto n characters) + * Description : Case insensitive string comparison (up to n characters) * * Parameters : * 1 : s1 = string 1 to compare @@ -415,20 +317,22 @@ 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 (n <= (size_t)0) return(0); + if (!s1) s1 = ""; + if (!s2) s2 = ""; while (*s1 && *s2) { - if ( ( *s1 != *s2 ) && ( ijb_tolower(*s1) != ijb_tolower(*s2) ) ) + if ((*s1 != *s2) && (privoxy_tolower(*s1) != privoxy_tolower(*s2))) { break; } - if (--n <= 0) break; + if (--n <= (size_t)0) break; s1++, s2++; } - return(ijb_tolower(*s1) - ijb_tolower(*s2)); + return(privoxy_tolower(*s1) - privoxy_tolower(*s2)); } @@ -450,21 +354,21 @@ char *chomp(char *string) { char *p, *q, *r; - /* + /* * strip trailing whitespace */ p = string + strlen(string); - while (p > string && ijb_isspace(*(p-1))) + while (p > string && privoxy_isspace(*(p-1))) { p--; } *p = '\0'; - /* - * find end of leading whitespace + /* + * find end of leading whitespace */ q = r = string; - while (*q && ijb_isspace(*q)) + while (*q && privoxy_isspace(*q)) { q++; } @@ -485,64 +389,11 @@ char *chomp(char *string) } -/********************************************************************* - * - * Function : strsav - * - * Description : Reallocate "old" and append text to it. This makes - * it easier to append to malloc'd strings. - * Running out of memory is a FATAL error. - * - * Parameters : - * 1 : old = Old text that is to be extended. Will be - * free()d by this routine. May be NULL. - * 2 : text_to_append = Text to be appended to old. - * May be NULL. - * - * Returns : Pointer to newly malloc'ed appended string. - * If there is no text to append, return old. Caller - * must free(). - * - *********************************************************************/ -char *strsav(char *old, const char *text_to_append) -{ - size_t old_len, new_len = 0; - char *p; - - if ((text_to_append == NULL) || (*text_to_append == '\0')) - { - return(old); - } - - if (NULL == old) - { - if ((p = strdup(text_to_append)) == NULL) - { - log_error(LOG_LEVEL_FATAL, "strdup() failed!"); - /* Never get here - LOG_LEVEL_FATAL causes program exit */ - } - return p; - } - - old_len = strlen(old); - new_len = old_len + strlen(text_to_append) + 1; - - if ((p = realloc(old, new_len)) == NULL) - { - log_error(LOG_LEVEL_FATAL, "realloc(%d) bytes failed!", new_len); - /* Never get here - LOG_LEVEL_FATAL causes program exit */ - } - - strcpy(p + old_len, text_to_append); - return(p); -} - - /********************************************************************* * * Function : string_append * - * Description : Reallocate target_string and append text to it. + * Description : Reallocate target_string and append text to it. * This makes it easier to append to malloc'd strings. * This is similar to the (removed) strsav(), but * running out of memory isn't catastrophic. @@ -590,6 +441,7 @@ jb_err string_append(char **target_string, const char *text_to_append) { size_t old_len; char *new_string; + size_t new_size; assert(target_string); assert(text_to_append); @@ -606,8 +458,9 @@ jb_err string_append(char **target_string, const char *text_to_append) old_len = strlen(*target_string); - if (NULL == (new_string = realloc(*target_string, - strlen(text_to_append) + old_len + 1))) + new_size = strlen(text_to_append) + old_len + 1; + + if (NULL == (new_string = realloc(*target_string, new_size))) { free(*target_string); @@ -615,7 +468,7 @@ jb_err string_append(char **target_string, const char *text_to_append) return JB_ERR_MEMORY; } - strcpy(new_string + old_len, text_to_append); + strlcpy(new_string + old_len, text_to_append, new_size - old_len); *target_string = new_string; return JB_ERR_OK; @@ -669,7 +522,7 @@ jb_err string_join(char **target_string, char *text_to_append) err = string_append(target_string, text_to_append); - free(text_to_append); + freez(text_to_append); return err; } @@ -677,117 +530,63 @@ jb_err string_join(char **target_string, char *text_to_append) /********************************************************************* * - * Function : simplematch + * Function : string_toupper * - * 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. + * Description : Produce a copy of string with all convertible + * characters converted to uppercase. * * Parameters : - * 1 : pattern = pattern for matching - * 2 : text = text to be matched + * 1 : string = string to convert * - * Returns : 0 if match, else nonzero + * Returns : Uppercase copy of string if possible, + * NULL on out-of-memory or if string was NULL. * *********************************************************************/ -int simplematch(char *pattern, char *text) +char *string_toupper(const char *string) { - 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') - { - return 1; - } + char *result, *p; + const char *q; - /* '*' 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; - } + if (!string || ((result = (char *) zalloc(strlen(string) + 1)) == NULL)) + { + return NULL; + } - /* Character range specification? */ - if (*pat == '[') - { - memset(charmap, '\0', sizeof(charmap)); + q = string; + p = result; - 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 */ + while (*q != '\0') + { + *p++ = (char)toupper((int) *q++); + } + return result; - /* Compare: Char match, or char range match*/ - if ((*pat == *txt) - || ((*pat == ']') && (charmap[*txt / 8] & (1 << (*txt % 8)))) ) - { - /* Sucess, go ahead */ - pat++; - } - else - { - /* In wildcard mode, just try again after failiure */ - if(wildcard) - { - pat = fallback; - } - - /* Else, bad luck */ - else - { - return 1; - } - } - txt++; - } +} - /* Cut off extra '*'s */ - if(*pat == '*') pat++; - /* If this is the pattern's end, fine! */ - return(*pat); +/********************************************************************* + * + * Function : string_move + * + * Description : memmove wrapper to move the last part of a string + * towards the beginning, overwriting the part in + * the middle. strlcpy() can't be used here as the + * strings overlap. + * + * Parameters : + * 1 : dst = Destination to overwrite + * 2 : src = Source to move. + * + * Returns : N/A + * + *********************************************************************/ +void string_move(char *dst, char *src) +{ + assert(dst < src); + /* +1 to copy the terminating nul as well. */ + memmove(dst, src, strlen(src)+1); } @@ -809,13 +608,10 @@ char *bindup(const char *string, size_t len) { char *duplicate; - if (NULL == (duplicate = (char *)malloc(len))) + duplicate = (char *)malloc(len); + if (NULL != duplicate) { - return NULL; - } - else - { - memcpy(duplicate, string, len); + memcpy(duplicate, string, len); } return duplicate; @@ -827,11 +623,11 @@ char *bindup(const char *string, size_t len) * * Function : make_path * - * Description : Takes a directory name and a file name, returns + * Description : Takes a directory name and a file name, returns * the complete path. Handles windows/unix differences. * If the file name is already an absolute path, or if - * the directory name is NULL or empty, it returns - * the filename. + * the directory name is NULL or empty, it returns + * the filename. * * Parameters : * 1 : dir: Name of directory or NULL for none. @@ -840,43 +636,11 @@ char *bindup(const char *string, size_t len) * Returns : "dir/file" (Or on windows, "dir\file"). * It allocates the string on the heap. Caller frees. * Returns NULL in error (i.e. NULL file or out of - * memory) + * memory) * *********************************************************************/ char * make_path(const char * dir, const char * file) { -#ifdef AMIGA - char path[512]; - - if(dir) - { - if(dir[0] == '.') - { - if(dir[1] == '/') - { - strncpy(path,dir+2,512); - } - else - { - strncpy(path,dir+1,512); - } - } - else - { - strncpy(path,dir,512); - } - path[511]=0; - } else { - path[0]=0; - } - if(AddPart(path,file,512)) - { - return strdup(path); - } else { - return NULL; - } -#else /* ndef AMIGA */ - if ((file == NULL) || (*file == '\0')) { return NULL; /* Error */ @@ -895,59 +659,330 @@ char * make_path(const char * dir, const char * file) else { char * path; + size_t path_size = strlen(dir) + strlen(file) + 2; /* +2 for trailing (back)slash and \0 */ #if defined(unix) - if ( *dir != '/' && basedir && *basedir ) + if (*dir != '/' && basedir && *basedir) { - path = malloc( strlen( basedir ) + strlen(dir) + strlen(file) + 3); - if (!path ) log_error(LOG_LEVEL_FATAL, "malloc failed!"); - strcpy(path, basedir); - strcat(path, "/"); - strcat(path, dir); + /* + * Relative path, so start with the base directory. + */ + path_size += strlen(basedir) + 1; /* +1 for the slash */ + path = malloc(path_size); + if (!path) log_error(LOG_LEVEL_FATAL, "malloc failed!"); + strlcpy(path, basedir, path_size); + strlcat(path, "/", path_size); + strlcat(path, dir, path_size); } else +#endif /* defined unix */ { - path = malloc(strlen(dir) + strlen(file) + 2); - if (!path ) log_error(LOG_LEVEL_FATAL, "malloc failed!"); - strcpy(path, dir); + path = malloc(path_size); + if (!path) log_error(LOG_LEVEL_FATAL, "malloc failed!"); + strlcpy(path, dir, path_size); } -#else - - path = malloc(strlen(dir) + strlen(file) + 2); - if (!path ) log_error(LOG_LEVEL_FATAL, "malloc failed!"); - strcpy(path, dir); - -#endif /* defined unix */ + assert(NULL != path); #if defined(_WIN32) || defined(__OS2__) - if(path[strlen(path)-1] != '\\') + if (path[strlen(path)-1] != '\\') { - strcat(path, "\\"); + strlcat(path, "\\", path_size); } #else /* ifndef _WIN32 || __OS2__ */ - if(path[strlen(path)-1] != '/') + if (path[strlen(path)-1] != '/') { - strcat(path, "/"); + strlcat(path, "/", path_size); } #endif /* ifndef _WIN32 || __OS2__ */ - strcat(path, file); + strlcat(path, file, path_size); return path; } -#endif /* ndef AMIGA */ } +/********************************************************************* + * + * 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; +#ifdef _WIN32 + static unsigned long seed = 0; +#endif /* def _WIN32 */ + + assert(range != 0); + assert(range > 0); + + if (range <= 0) return 0; + +#ifdef HAVE_ARC4RANDOM + number = arc4random() % range + 1; +#elif defined(HAVE_RANDOM) + number = random() % range + 1; +#elif defined(MUTEX_LOCKS_AVAILABLE) + privoxy_mutex_lock(&rand_mutex); +#ifdef _WIN32 + 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."); + number = rand() % (long int)(range + 1); + +#endif /* (def HAVE_ARC4RANDOM) */ + + 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 +/********************************************************************* + * + * Function : privoxy_strlcat + * + * Description : strlcat(3) look-alike for those without decent libc. + * + * Parameters : + * 1 : destination: C string. + * 2 : source: String to copy. + * 3 : size: Size of destination buffer. + * + * 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) +{ + const size_t old_length = strlen(destination); + return old_length + strlcpy(destination + old_length, source, size - old_length); +} +#endif /* ndef HAVE_STRLCAT */ + + +/********************************************************************* + * + * Function : privoxy_millisleep + * + * Description : Sleep a number of milliseconds + * + * Parameters : + * 1 : delay: Number of milliseconds to sleep + * + * Returns : -1 on error, 0 otherwise + * + *********************************************************************/ +int privoxy_millisleep(unsigned milliseconds) +{ +#ifdef HAVE_NANOSLEEP + struct timespec rqtp = {0}; + struct timespec rmtp = {0}; + + rqtp.tv_sec = milliseconds / 1000; + rqtp.tv_nsec = (milliseconds % 1000) * 1000 * 1000; + + return nanosleep(&rqtp, &rmtp); +#elif defined (_WIN32) + Sleep(milliseconds); + + return 0; +#elif defined(__OS2__) + DosSleep(milliseconds * 10); + + return 0; +#else +#warning Missing privoxy_milisleep() implementation. delay-response{} will not work. + + return -1; +#endif /* def HAVE_NANOSLEEP */ + +} + + +/********************************************************************* + * + * Function : privoxy_gmtime_r + * + * Description : Behave like gmtime_r() and convert a + * time_t to a struct tm. + * + * Parameters : + * 1 : time_spec: The time to convert + * 2 : result: The struct tm to use as storage + * + * Returns : Pointer to the result or NULL on error. + * + *********************************************************************/ +struct tm *privoxy_gmtime_r(const time_t *time_spec, struct tm *result) +{ + struct tm *timeptr; + +#ifdef HAVE_GMTIME_R + timeptr = gmtime_r(time_spec, result); +#elif defined(MUTEX_LOCKS_AVAILABLE) + privoxy_mutex_lock(&gmtime_mutex); + timeptr = gmtime(time_spec); +#else +#warning Using unlocked gmtime() + timeptr = gmtime(time_spec); +#endif + + if (timeptr == NULL) + { +#if !defined(HAVE_GMTIME_R) && defined(MUTEX_LOCKS_AVAILABLE) + privoxy_mutex_unlock(&gmtime_mutex); +#endif + return NULL; + } + +#if !defined(HAVE_GMTIME_R) + *result = *timeptr; + timeptr = result; +#ifdef MUTEX_LOCKS_AVAILABLE + privoxy_mutex_unlock(&gmtime_mutex); +#endif +#endif + + return timeptr; +} + +#if !defined(HAVE_TIMEGM) && defined(HAVE_TZSET) && defined(HAVE_PUTENV) +/********************************************************************* + * + * Function : timegm + * + * Description : libc replacement function for the inverse of gmtime(). + * Copyright (C) 2004 Free Software Foundation, Inc. + * + * 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. + * + * 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); +#ifdef _WIN32 + /* http://man7.org/linux/man-pages/man3/putenv.3.html + * int putenv(char *string); + * The string pointed to by string becomes part of the environment, so altering the + * string changes the environment. + * In other words, the memory pointed to by *string is used until + * a) another call to putenv() with the same e-var name + * b) the program exits + * + * Windows e-vars don't work that way, so let's not leak memory. + */ + 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) */ + + +#ifndef HAVE_SNPRINTF /* * What follows is a portable snprintf routine, written by Mark Martinec. * See: http://www.ijs.si/software/snprintf/ - * Anyone who needs it can add a define for themselves... so far, only - * OS/2 (native) lacks snprintf. snprintf.c - a portable implementation of snprintf, including vsnprintf.c, asnprintf, vasnprintf, asprintf, vasprintf - + snprintf is a routine to convert numeric and string arguments to formatted strings. It is similar to sprintf(3) provided in a system's C library, yet it requires an additional argument - the buffer size - @@ -964,8 +999,6 @@ Author */ -#ifdef __OS2__ - #define PORTABLE_SNPRINTF_VERSION_MAJOR 2 #define PORTABLE_SNPRINTF_VERSION_MINOR 2 @@ -1591,7 +1624,7 @@ int portable_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap) { } } /* zero padding to specified precision? */ - if (num_of_digits < precision) + if (num_of_digits < precision) number_of_zeros_to_pad = precision - num_of_digits; } /* zero padding to specified minimal field width? */ @@ -1609,7 +1642,7 @@ int portable_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap) { #if defined(PERL_COMPATIBLE) || defined(LINUX_COMPATIBLE) /* keep the entire format string unchanged */ str_arg = starting_p; str_arg_l = p - starting_p; - /* well, not exactly so for Linux, which does something inbetween, + /* well, not exactly so for Linux, which does something between, * and I don't feel an urge to imitate it: "%+++++hy" -> "%+y" */ #else /* discard the unrecognized conversion, just keep * @@ -1705,7 +1738,7 @@ int portable_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap) { return (int) str_l; } #endif -#endif /* __OS2__ */ +#endif /* ndef HAVE_SNPRINTF */ /* Local Variables: tab-width: 3