X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=miscutil.c;h=09eeffaaeca731d72dac30af8a22a6a86fdb2fdf;hp=4d39b431081a126ded0059f97c67b060368b08b4;hb=3b3a3699275014838fe9562233d0973d58875d64;hpb=a8e6e10e532d17d33cbedc4fe4c4027e624c6b1d diff --git a/miscutil.c b/miscutil.c index 4d39b431..09eeffaa 100644 --- a/miscutil.c +++ b/miscutil.c @@ -1,4 +1,4 @@ -const char miscutil_rcs[] = "$Id: miscutil.c,v 1.5 2001/06/01 10:31:51 oes Exp $"; +const char miscutil_rcs[] = "$Id: miscutil.c,v 1.17 2001/09/13 20:51:29 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/miscutil.c,v $ @@ -36,6 +36,44 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.5 2001/06/01 10:31:51 oes Exp $ * * Revisions : * $Log: miscutil.c,v $ + * 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 * @@ -88,6 +126,11 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.5 2001/06/01 10:31:51 oes Exp $ #include #include +/* + * FIXME: Only need project.h for BUFFER_SIZE. It would be nice + * to remove this dependency. + */ +#include "project.h" #include "miscutil.h" #include "errlog.h" @@ -143,9 +186,9 @@ void *zalloc(int size) * Returns : an unsigned long variable with the hashed value. * *********************************************************************/ -unsigned long hash_string( const char* s ) +unsigned int hash_string( const char* s ) { - unsigned long h = 0ul; + unsigned int h = 0; for ( ; *s; ++s ) { @@ -208,7 +251,7 @@ char *strdup( const char *s ) char *safe_strerror(int err) { char *s = NULL; - char buf[BUFSIZ]; + char buf[BUFFER_SIZE]; #ifdef HAVE_STRERROR @@ -418,14 +461,14 @@ char *strsav(char *old, const char *text_to_append) *********************************************************************/ int simplematch(char *pattern, char *text) { - char *fallback; - char *pat = pattern; - char *txt = text; - int wildcard = 0; + unsigned char *pat = (unsigned char *) pattern; + unsigned char *txt = (unsigned char *) text; + unsigned char *fallback = pat; + int wildcard = 0; - char lastchar = 'a'; - unsigned i; - unsigned char charmap[32]; + unsigned char lastchar = 'a'; + unsigned i; + unsigned char charmap[32]; while (*txt) @@ -515,6 +558,111 @@ int simplematch(char *pattern, char *text) } + +/********************************************************************* + * + * Function : bindup + * + * Description : Duplicate the first n characters of a string that may + * contain '\0' characters. + * + * Parameters : + * 1 : string = string to be duplicated + * 2 : n = number of bytes to duplicate + * + * Returns : pointer to copy, or NULL if failiure + * + *********************************************************************/ +char *bindup(const char *string, int n) +{ + char *dup; + + if (NULL == (dup = (char *)malloc(n))) + { + return NULL; + } + else + { + memcpy(dup, string, n); + } + + return dup; + +} + + +/********************************************************************* + * + * Function : make_path + * + * 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. + * + * Parameters : + * 1 : dir: Name of directory or NULL for none. + * 2 : file: Name of file. Should not be NULL or empty. + * + * 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) + * + *********************************************************************/ +char * make_path(const char * dir, const char * file) +{ +#ifdef AMIGA + char path[512]; + + if(dir) + { + 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 */ + } + + if ((dir == NULL) || (*dir == '\0') /* No directory specified */ +#ifdef _WIN32 + || (*file == '\\') || (file[1] == ':') /* Absolute path (DOS) */ +#else /* ifndef _WIN32 */ + || (*file == '/') /* Absolute path (U*ix) */ +#endif /* ifndef _WIN32 */ + ) + { + return strdup(file); + } + else + { + char * path = malloc(strlen(dir) + strlen(file) + 2); + strcpy(path, dir); +#ifdef _WIN32 + strcat(path, "\\"); +#else /* ifndef _WIN32 */ + if(path[strlen(path)-1] != '/') strcat(path, "/"); +#endif /* ifndef _WIN32 */ + strcat(path, file); + + return path; + } +#endif /* ndef AMIGA */ +} + + /* Local Variables: tab-width: 3