X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=miscutil.c;h=404602e36e89d25b068938ee7c3b9cdfd54c6f5e;hb=4fb8d07941a40fd8430db47374fd94da5b5deb3d;hp=7423af1862c12aaabeaefe8918bf8278e825293a;hpb=24bed489302916a8cd48522856e10e808deb506b;p=privoxy.git diff --git a/miscutil.c b/miscutil.c index 7423af18..404602e3 100644 --- a/miscutil.c +++ b/miscutil.c @@ -1,4 +1,5 @@ -const char miscutil_rcs[] = "$Id: miscutil.c,v 1.7 2001/06/03 19:12:30 oes Exp $"; +/* vim:ts=3: */ +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 $ @@ -36,6 +37,18 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.7 2001/06/03 19:12:30 oes 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 /. + * + * 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() * @@ -149,7 +162,12 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.7 2001/06/03 19:12:30 oes 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; @@ -269,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 @@ -479,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) @@ -631,6 +649,24 @@ char *bindup(const char *string, int n) *********************************************************************/ 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 */ @@ -653,12 +689,13 @@ char * make_path(const char * dir, const char * file) #ifdef _WIN32 strcat(path, "\\"); #else /* ifndef _WIN32 */ - strcat(path, "\\"); + if(path[strlen(path)-1] != '/') strcat(path, "/"); #endif /* ifndef _WIN32 */ strcat(path, file); return path; } +#endif /* ndef AMIGA */ }