X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=miscutil.c;h=09eeffaaeca731d72dac30af8a22a6a86fdb2fdf;hb=b5c1077ef4cf0c7c84659566ebff29e73f47f62e;hp=a536e74cdaadd84890f2689b502809d6da2b277a;hpb=3bae2db92ac3852edca084db809e0f79c64cdaf7;p=privoxy.git diff --git a/miscutil.c b/miscutil.c index a536e74c..09eeffaa 100644 --- a/miscutil.c +++ b/miscutil.c @@ -1,4 +1,4 @@ -const char miscutil_rcs[] = "$Id: miscutil.c,v 1.7 2001/06/03 11:03:48 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,60 +36,40 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.7 2001/06/03 11:03:48 oes Exp $ * * Revisions : * $Log: miscutil.c,v $ - * Revision 1.7 2001/06/03 11:03:48 oes - * Makefile/in + * Revision 1.17 2001/09/13 20:51:29 jongfoster + * Fixing potential problems with characters >=128 in simplematch() + * This was also a compiler warning. * - * introduced cgi.c + * Revision 1.16 2001/09/10 10:56:59 oes + * Silenced compiler warnings * - * actions.c: + * Revision 1.15 2001/07/13 14:02:24 oes + * Removed vim-settings * - * adapted to new enlist_unique arg format + * Revision 1.14 2001/06/29 21:45:41 oes + * Indentation, CRLF->LF, Tab-> Space * - * conf loadcfg.c + * Revision 1.13 2001/06/29 13:32:14 oes + * Removed logentry from cancelled commit * - * introduced confdir option + * Revision 1.12 2001/06/09 10:55:28 jongfoster + * Changing BUFSIZ ==> BUFFER_SIZE * - * filters.c filtrers.h + * Revision 1.11 2001/06/07 23:09:19 jongfoster + * Cosmetic indentation changes. * - * extracted-CGI relevant stuff + * Revision 1.10 2001/06/07 14:51:38 joergs + * make_path() no longer adds '/' if the dir already ends in '/'. * - * jbsockets.c + * Revision 1.9 2001/06/07 14:43:17 swa + * slight mistake in make_path, unix path style is /. * - * filled comment + * Revision 1.8 2001/06/05 22:32:01 jongfoster + * New function make_path() to splice directory and file names together. * - * jcc.c - * - * support for new cgi mechansim - * - * list.c list.h - * - * functions for new list type: "map" - * extended enlist_unique - * - * miscutil.c .h + * Revision 1.7 2001/06/03 19:12:30 oes * introduced bindup() * - * parsers.c parsers.h - * - * deleted const struct interceptors - * - * pcrs.c - * added FIXME - * - * project.h - * - * added struct map - * added struct http_response - * changes struct interceptors to struct cgi_dispatcher - * moved HTML stuff to cgi.h - * - * re_filterfile: - * - * changed - * - * showargs.c - * NO TIME LEFT - * * 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. @@ -146,6 +126,11 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.7 2001/06/03 11:03:48 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" @@ -201,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 ) { @@ -266,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 @@ -476,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) @@ -594,18 +579,90 @@ char *bindup(const char *string, int n) if (NULL == (dup = (char *)malloc(n))) { - return NULL; - } + return NULL; + } else - { - memcpy(dup, string, n); - } + { + 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