X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=miscutil.c;h=8dcdd95387c8d8985729e5586aa0f15bc1fc33b8;hp=ac9d491a6afe7315dc621d08e30fd28f2ec608cd;hb=fef47f1318a4147305d5645290a8f4d72cdddf5c;hpb=bc46dec9d845571191c3b2bb1fad6e47b97ba171

diff --git a/miscutil.c b/miscutil.c
index ac9d491a..8dcdd953 100644
--- a/miscutil.c
+++ b/miscutil.c
@@ -1,4 +1,5 @@
-const char miscutil_rcs[] = "$Id: miscutil.c,v 1.8 2001/06/05 22:32:01 jongfoster Exp $";
+/* vim:ts=3: */
+const char miscutil_rcs[] = "$Id: miscutil.c,v 1.10 2001/06/07 14:51:38 joergs Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/miscutil.c,v $
@@ -36,6 +37,12 @@ const char miscutil_rcs[] = "$Id: miscutil.c,v 1.8 2001/06/05 22:32:01 jongfoste
  *
  * Revisions   :
  *    $Log: miscutil.c,v $
+ *    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.
  *
@@ -482,14 +489,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)
@@ -634,6 +641,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 */
@@ -656,12 +681,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 */
 }