X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Ftpath.c;h=f04df3ef37a8dd37c6c942402f52c4e09a22ac98;hb=4b3d1e197d75fcb2607be8d86d244f20c4180000;hp=380ed25285b36b79c4c8750ef10861fd2f5b2d5d;hpb=19af2bd8dfd21731cc978beccd1346133d614c67;p=yaz-moved-to-github.git

diff --git a/util/tpath.c b/util/tpath.c
index 380ed25..f04df3e 100644
--- a/util/tpath.c
+++ b/util/tpath.c
@@ -1,50 +1,91 @@
 /*
- * Copyright (c) 1995-2000, Index Data.
+ * Copyright (c) 1995-2003, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: tpath.c,v $
- * Revision 1.4  2000-02-29 13:44:55  adam
- * Check for config.h (currently not generated).
- *
- * Revision 1.3  1999/11/30 13:47:12  adam
- * Improved installation. Moved header files to include/yaz.
- *
- * Revision 1.2  1996/10/29 13:36:26  adam
- * Added header.
- *
- * Revision 1.1  1995/11/01 16:35:00  quinn
- * Making data1 look for tables in data1_tabpath
- *
- *
+ * $Id: tpath.c,v 1.9 2003-01-06 08:20:28 adam Exp $
  */
 #if HAVE_CONFIG_H
 #include <config.h>
 #endif
 
+
 #include <stdio.h>
 #include <string.h>
+#include <ctype.h>
 #include <yaz/tpath.h>
+#include <yaz/log.h>
 
 FILE *yaz_path_fopen(const char *path, const char *name, const char *mode)
 {
-    char spath[512] = "";
+    return yaz_fopen (path, name, mode, 0);
+}
+
+int yaz_fclose (FILE *f)
+{
+    return fclose (f);
+}
 
-    if (!path)
-	return fopen(name, mode);
+FILE *yaz_fopen(const char *path, const char *name, const char *mode,
+                const char *base)
+{
+    char spath[1024];
 
-    do
+    for(;;)
     {
 	FILE *f;
 
-	if (sscanf(path, "%511[^:]", spath) < 1)
-	    return 0;
-	sprintf(spath + strlen(spath), "/%s", name);
+        const char *path_sep = 0;
+        size_t len = 0;
+        size_t slen = 0;
+        
+        *spath = '\0';
+        if (path)
+        {
+            /* somewhat dirty since we have to consider Windows
+             * drive letters..
+             */
+            if (strchr ("/\\.", *path))
+            {
+                path_sep = strchr (path+1, ':');
+            }
+            else if (path[0] && path[1])
+                path_sep = strchr (path+2, ':');
+            if (path_sep)
+                len = path_sep - path;
+            else
+                len = strlen(path);
+            if (!strchr ("/\\", *path) && base)
+            {
+                strcpy (spath, base);
+                slen = strlen(spath);
+                spath[slen++] = '/';
+            }
+            memcpy (spath+slen, path, len);
+            slen += len;
+            if (!strchr("/\\", spath[slen-1]))
+                spath[slen++] = '/';
+        }
+        strcpy (spath+slen, name);
 	if ((f = fopen(spath, mode)))
 	    return f;
-	if ((path = strchr(path, ':')))
-	    path++;
+        
+        if (!path_sep)
+            break;
+        path = path_sep+1;
     }
-    while (path);
+    return 0;
+}
+
+int yaz_is_abspath (const char *p)
+{
+    if (*p == '/')
+        return 1;
+#ifdef WIN32
+    if (*p == '\\')
+        return 1;
+    if (*p && p[1] == ':' && isalpha(*p))
+        return 1;
+#endif
     return 0;
 }