X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=miscutil.c;h=6650890ef9b81fe56dec4820a38fe85d6bb710f6;hp=8dcdd95387c8d8985729e5586aa0f15bc1fc33b8;hb=c53b1d365affbaa1a32b6fcb9fedb23180b03d3f;hpb=73c570f9fed555694eaa24395e0682a477e2c79f diff --git a/miscutil.c b/miscutil.c index 8dcdd953..6650890e 100644 --- a/miscutil.c +++ b/miscutil.c @@ -1,5 +1,4 @@ -/* vim:ts=3: */ -const char miscutil_rcs[] = "$Id: miscutil.c,v 1.10 2001/06/07 14:51:38 joergs Exp $"; +const char miscutil_rcs[] = "$Id: miscutil.c,v 1.14 2001/06/29 21:45:41 oes Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/miscutil.c,v $ @@ -37,6 +36,18 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.10 2001/06/07 14:51:38 joergs E * * Revisions : * $Log: miscutil.c,v $ + * 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 '/'. * @@ -49,60 +60,6 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.10 2001/06/07 14:51:38 joergs E * 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. @@ -159,6 +116,11 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.10 2001/06/07 14:51:38 joergs E #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" @@ -279,7 +241,7 @@ char *strdup( const char *s ) char *safe_strerror(int err) { char *s = NULL; - char buf[BUFSIZ]; + char buf[BUFFER_SIZE]; #ifdef HAVE_STRERROR @@ -607,12 +569,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;