X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=miscutil.h;h=eeae38e6e38f33dad72ddcbcca88121de43f9613;hp=02a54d2273d934116a4580f812a4d31de53ad8b3;hb=a1486b8027c110bb77f3435d05c24435737c1b37;hpb=2935a01f7fffce53f81e235557f3ae5459e200e6 diff --git a/miscutil.h b/miscutil.h index 02a54d22..eeae38e6 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.3 2001/05/29 23:10:09 oes Exp $" +#ifndef MISCUTIL_H_INCLUDED +#define MISCUTIL_H_INCLUDED +#define MISCUTIL_H_VERSION "$Id: miscutil.h,v 1.15 2001/12/30 14:07:32 steudten Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/miscutil.h,v $ @@ -37,6 +37,55 @@ * * Revisions : * $Log: miscutil.h,v $ + * 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. + * + * 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. + * + * 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) + * + * 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. + * + * Revision 1.10 2001/09/20 13:34:09 steudten + * + * change long to int for prototype hash_string() + * + * Revision 1.9 2001/07/29 18:43:08 jongfoster + * Changing #ifdef _FILENAME_H to FILENAME_H_INCLUDED, to conform to + * ANSI C rules. + * + * Revision 1.8 2001/06/29 13:32:14 oes + * Removed logentry from cancelled commit + * + * 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 + * + * 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 * * @@ -73,13 +122,21 @@ *********************************************************************/ +#include "project.h" + #if defined(__cplusplus) extern "C" { #endif +extern const char *basedir; extern void *zalloc(int size); -extern unsigned long hash_string(const char* s); +#if defined(unix) +extern void writePidFile( void ); +extern void deletePidFile( void ); +#endif /* unix */ + +extern unsigned int hash_string(const char* s); extern char *safe_strerror(int err); @@ -87,14 +144,24 @@ 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 *chomp(char *string); -extern int trivimatch(char *pattern, char *text); +extern int simplematch(char *pattern, char *text); + +extern char *bindup(const char *string, int n); + +extern char *make_path(const char * dir, const char * file); #ifdef __MINGW32__ extern char *strdup(const char *s); #endif /* def __MINGW32__ */ +#ifdef __OS2__ +extern int snprintf(char *, size_t, const char *, /*args*/ ...); +#endif /* def __OS2__ */ + /* Revision control strings from this header and associated .c file */ extern const char miscutil_rcs[]; extern const char miscutil_h_rcs[]; @@ -103,7 +170,7 @@ extern const char miscutil_h_rcs[]; } #endif -#endif /* ndef _MISCUTIL_H */ +#endif /* ndef MISCUTIL_H_INCLUDED */ /* Local Variables: