X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=miscutil.c;h=ac363f4f108c65388e774a409eeb1fc85d5761a8;hb=99b5c3c95573d4c908df45df0b3abfb28fb7d0f3;hp=8b0fc5b78326ba1a6666fe1f07dde538c8764872;hpb=83de7bee2cd2354985095b343d4cb21ac525fe50;p=privoxy.git

diff --git a/miscutil.c b/miscutil.c
index 8b0fc5b7..ac363f4f 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.13 2001/06/29 13:32:14 oes Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/miscutil.c,v $
@@ -37,6 +37,18 @@ 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.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 /.
  *
@@ -46,60 +58,6 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.9 2001/06/07 14:43:17 swa Exp $
  *    Revision 1.7  2001/06/03 19:12:30  oes
  *    introduced bindup()
  *
- *    Revision 1.7  2001/06/03 11:03:48  oes
- *    Makefile/in
- *
- *    introduced cgi.c
- *
- *    actions.c:
- *
- *    adapted to new enlist_unique arg format
- *
- *    conf loadcfg.c
- *
- *    introduced confdir option
- *
- *    filters.c filtrers.h
- *
- *     extracted-CGI relevant stuff
- *
- *    jbsockets.c
- *
- *     filled comment
- *
- *    jcc.c
- *
- *     support for new cgi mechansim
- *
- *    list.c list.h
- *
- *    functions for new list type: "map"
- *    extended enlist_unique
- *
- *    miscutil.c .h
- *    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.
@@ -156,6 +114,11 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.9 2001/06/07 14:43:17 swa Exp $
 #include <malloc.h>
 #include <ctype.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"
 
@@ -276,7 +239,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 +449,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)
@@ -604,12 +567,12 @@ 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;