X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=miscutil.h;h=38fb85ba2087b01c7d066bb0d5710f3e4ebb6d85;hp=d6a6b2aecd2da5ae09f3d931c72d053b090b7f0d;hb=29acfd671144c7a058ed03f0ffd9fe9f4584dc36;hpb=24bed489302916a8cd48522856e10e808deb506b diff --git a/miscutil.h b/miscutil.h index d6a6b2ae..38fb85ba 100644 --- a/miscutil.h +++ b/miscutil.h @@ -1,6 +1,6 @@ -#ifndef _MISCUTIL_H -#define _MISCUTIL_H -#define MISCUTIL_H_VERSION "$Id: miscutil.h,v 1.6 2001/06/03 19:12:30 oes Exp $" +#ifndef MISCUTIL_H_INCLUDED +#define MISCUTIL_H_INCLUDED +#define MISCUTIL_H_VERSION "$Id: miscutil.h,v 1.28 2007/05/11 11:48:16 fabiankeil Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/miscutil.h,v $ @@ -10,8 +10,8 @@ * 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 - * IJBSWA team. http://ijbswa.sourceforge.net + * Copyright : Written by and Copyright (C) 2001-2007 the SourceForge + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -37,62 +37,102 @@ * * Revisions : * $Log: miscutil.h,v $ - * Revision 1.6 2001/06/03 19:12:30 oes - * introduced bindup() + * Revision 1.28 2007/05/11 11:48:16 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.6 2001/06/03 11:03:48 oes - * Makefile/in + * Revision 1.27 2007/04/09 17:48:51 fabiankeil + * Check for HAVE_SNPRINTF instead of __OS2__ + * before including the portable snprintf() code. * - * introduced cgi.c + * Revision 1.26 2007/04/08 17:04:51 fabiankeil + * Add macro for strlcpy() in case the libc lacks it. * - * actions.c: + * Revision 1.25 2007/01/18 15:03:20 fabiankeil + * Don't include replacement timegm() if + * putenv() or tzset() isn't available. * - * adapted to new enlist_unique arg format + * Revision 1.24 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. * - * conf loadcfg.c + * - Removed now-useless Privoxy 3.0.3 compatibility glue. * - * introduced confdir option + * - Moved randomization code into pick_from_range(). * - * filters.c filtrers.h + * - 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. * - * extracted-CGI relevant stuff + * Revision 1.23 2006/07/18 14:48:47 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) * - * jbsockets.c + * Revision 1.21 2002/04/26 12:55:38 oes + * New function string_toupper * - * filled comment + * Revision 1.20 2002/03/26 22:29:55 swa + * we have a new homepage! * - * jcc.c + * Revision 1.19 2002/03/24 13:25:43 swa + * name change related issues * - * support for new cgi mechansim + * Revision 1.18 2002/03/07 03:46:17 oes + * Fixed compiler warnings * - * list.c list.h + * Revision 1.17 2002/03/04 18:28:32 oes + * Deleted deletePidFile, played syleguide police * - * functions for new list type: "map" - * extended enlist_unique + * Revision 1.16 2002/01/21 00:53:36 jongfoster + * Adding string_join() * - * miscutil.c .h - * introduced bindup() + * Revision 1.15 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.14 2001/11/05 21:43:48 steudten + * Add global var 'basedir' for unix os. * - * parsers.c parsers.h + * Revision 1.13 2001/10/29 03:48:10 david__schmidt + * OS/2 native needed a snprintf() routine. Added one to miscutil, brackedted + * by and __OS2__ ifdef. * - * deleted const struct interceptors + * Revision 1.12 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) * - * pcrs.c - * added FIXME + * Revision 1.11 2001/10/14 22:02:57 jongfoster + * New function string_append() which is like strsav(), but running + * out of memory isn't automatically FATAL. * - * project.h + * Revision 1.10 2001/09/20 13:34:09 steudten * - * added struct map - * added struct http_response - * changes struct interceptors to struct cgi_dispatcher - * moved HTML stuff to cgi.h + * change long to int for prototype hash_string() * - * re_filterfile: + * Revision 1.9 2001/07/29 18:43:08 jongfoster + * Changing #ifdef _FILENAME_H to FILENAME_H_INCLUDED, to conform to + * ANSI C rules. * - * changed + * Revision 1.8 2001/06/29 13:32:14 oes + * Removed logentry from cancelled commit * - * showargs.c - * NO TIME LEFT + * Revision 1.7 2001/06/05 22:32:01 jongfoster + * New function make_path() to splice directory and file names together. + * + * Revision 1.6 2001/06/03 19:12:30 oes + * introduced bindup() * * Revision 1.5 2001/06/01 10:31:51 oes * Added character class matching to trivimatch; renamed to simplematch @@ -138,32 +178,64 @@ *********************************************************************/ +#include "project.h" + #if defined(__cplusplus) extern "C" { #endif -extern void *zalloc(int size); +extern const char *basedir; +extern void *zalloc(size_t size); + +#if defined(unix) +extern void write_pid_file(void); +#endif /* unix */ -extern unsigned long hash_string(const char* s); +extern unsigned int hash_string(const char* s); extern char *safe_strerror(int err); extern int strcmpic(const char *s1, const char *s2); extern int strncmpic(const char *s1, const char *s2, size_t n); -extern char *strsav(char *old, const char *text_to_append); +extern jb_err string_append(char **target_string, const char *text_to_append); +extern jb_err string_join (char **target_string, char *text_to_append); +extern char *string_toupper(const char *string); extern char *chomp(char *string); extern int simplematch(char *pattern, char *text); -extern char *bindup(const char *string, int n); +extern char *bindup(const char *string, size_t len); extern char *make_path(const char * dir, const char * file); +long int pick_from_range(long int range); + #ifdef __MINGW32__ extern char *strdup(const char *s); #endif /* def __MINGW32__ */ +#ifndef HAVE_SNPRINTF +extern int snprintf(char *, size_t, const char *, /*args*/ ...); +#endif /* ndef HAVE_SNPRINTF */ + +#if !defined(HAVE_TIMEGM) && defined(HAVE_TZSET) && defined(HAVE_PUTENV) +time_t timegm(struct tm *tm); +#endif /* !defined(HAVE_TIMEGM) && defined(HAVE_TZSET) && defined(HAVE_PUTENV) */ + +/* Here's looking at you, Ulrich. */ +#if !defined(HAVE_STRLCPY) +size_t privoxy_strlcpy(char *destination, const char *source, size_t size); +#define strlcpy privoxy_strlcpy +#define USE_PRIVOXY_STRLCPY 1 +#define HAVE_STRLCPY 1 +#endif /* ndef HAVE_STRLCPY*/ + +#ifndef HAVE_STRLCAT +size_t privoxy_strlcat(char *destination, const char *source, size_t size); +#define strlcat privoxy_strlcat +#endif /* ndef HAVE_STRLCAT */ + /* Revision control strings from this header and associated .c file */ extern const char miscutil_rcs[]; extern const char miscutil_h_rcs[]; @@ -172,7 +244,7 @@ extern const char miscutil_h_rcs[]; } #endif -#endif /* ndef _MISCUTIL_H */ +#endif /* ndef MISCUTIL_H_INCLUDED */ /* Local Variables: