X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=miscutil.c;h=404602e36e89d25b068938ee7c3b9cdfd54c6f5e;hp=8b0fc5b78326ba1a6666fe1f07dde538c8764872;hb=81d7f24ad32b07609902d0fbdf475ad5088ea7a5;hpb=83de7bee2cd2354985095b343d4cb21ac525fe50 diff --git a/miscutil.c b/miscutil.c index 8b0fc5b7..404602e3 100644 --- a/miscutil.c +++ b/miscutil.c @@ -1,5 +1,5 @@ /* vim:ts=3: */ -const char miscutil_rcs[] = "$Id: miscutil.c,v 1.9 2001/06/07 14:43:17 swa Exp $"; +const char miscutil_rcs[] = "$Id: miscutil.c,v 1.11 2001/06/07 23:09:19 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/miscutil.c,v $ @@ -37,6 +37,12 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.9 2001/06/07 14:43:17 swa Exp $ * * Revisions : * $Log: miscutil.c,v $ + * 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 /. * @@ -156,7 +162,12 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.9 2001/06/07 14:43:17 swa Exp $ #include #include -#include "miscutil.h" +/* + * 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" const char miscutil_h_rcs[] = MISCUTIL_H_VERSION; @@ -276,7 +287,7 @@ char *strdup( const char *s ) char *safe_strerror(int err) { char *s = NULL; - char buf[BUFSIZ]; + char buf[BUFFER_SIZE]; #ifdef HAVE_STRERROR @@ -486,14 +497,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; + char *fallback; + char *pat = pattern; + char *txt = text; + int wildcard = 0; - char lastchar = 'a'; - unsigned i; - unsigned char charmap[32]; + char lastchar = 'a'; + unsigned i; + unsigned char charmap[32]; while (*txt)