X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Ftpath.c;h=b802c98033a0af6df45dfc91bfc58f9fdc85e644;hp=9dd863727b2b96878e47b57848e9dc9e2e2af7d5;hb=cf6bf2f04ed7e376bfd9a37f7ef4ab0366f46804;hpb=1e5f589925b0cbb16ea52243d300b02438fb3229

diff --git a/src/tpath.c b/src/tpath.c
index 9dd8637..b802c98 100644
--- a/src/tpath.c
+++ b/src/tpath.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2006, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2011 Index Data
  * See the file LICENSE for details.
- *
- * $Id: tpath.c,v 1.11 2006-06-08 20:55:38 adam Exp $
  */
 /**
  * \file tpath.c
@@ -16,74 +14,100 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <ctype.h>
 #include <yaz/tpath.h>
 #include <yaz/log.h>
+#if HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#if HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+#if WIN32
 #include <sys/stat.h>
+#endif
+
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
 FILE *yaz_path_fopen(const char *path, const char *name, const char *mode)
 {
-    return yaz_fopen (path, name, mode, 0);
+    return yaz_fopen(path, name, mode, 0);
 }
 
 int yaz_fclose (FILE *f)
 {
-    return fclose (f);
+    return fclose(f);
 }
 
 
+size_t yaz_filepath_comp(const char **path_p, const char **comp)
+{
+    const char *path = *path_p;
+    size_t len;
+    const char *path_sep;
+
+    /* somewhat dirty since we have to consider Windows
+     * drive letters..
+     */
+    if (path[0] && strchr("/\\.", path[0]))
+        path_sep = strchr(path+1, ':');
+    else if (path[0] && path[1])
+        path_sep = strchr(path+2, ':');
+    else
+        path_sep = 0;
+    
+    if (path_sep)
+    {
+        len = path_sep - path;
+        *path_p = path + len + 1;
+    }
+    else
+    {
+        len = strlen(path);
+        *path_p = path + len;
+    }
+    *comp = path;
+    return len;
+}
+
 char *yaz_filepath_resolve(const char *fname, const char *path,
                            const char *base, char *fullpath)
 {
-    for(;;)
+    if (path && *path == '\0')
+        path = 0;
+    for (;;)
     {
         struct stat stat_buf;
-        const char *path_sep = 0;
-        size_t len = 0;
         size_t slen = 0;
        
         *fullpath = '\0';
         if (path)
         {
-            /* somewhat dirty since we have to consider Windows
-             * drive letters..
-             */
-            if (path[0] && strchr ("/\\.", *path))
-                path_sep = strchr (path+1, ':');
-            else if (path[0] && path[1])
-                path_sep = strchr (path+2, ':');
-            else
-                path_sep = 0;
-
-            if (path_sep)
-                len = path_sep - path;
-            else
-                len = strlen(path);
-            /* is path is relative and base is to be used */
-            if (!strchr ("/\\", *path) && base)
+            const char *comp;
+            size_t len = 0;
+
+            len = yaz_filepath_comp(&path, &comp);
+            if (!len)
+                break;
+
+            if (!strchr("/\\", *comp) && base)
             {
                 /* yes: make base the first part */
-                strcpy (fullpath, base);
+                strcpy(fullpath, base);
                 slen = strlen(fullpath);
                 fullpath[slen++] = '/';
             }
-            if (len)
-                memcpy (fullpath+slen, path, len);
+            memcpy(fullpath+slen, comp, len);
             slen += len;
-            if (slen > 0 && !strchr("/\\", fullpath[slen-1]))
+            if(slen > 0 && !strchr("/\\", fullpath[slen-1]))
                 fullpath[slen++] = '/';
         }
-        strcpy (fullpath+slen, fname);
+        strcpy(fullpath+slen, fname);
         if (stat(fullpath, &stat_buf) == 0)
             return fullpath;
-        
-        if (!path_sep)
+        if (!path)
             break;
-        path = path_sep+1;
     }
     return 0;
 }
@@ -98,14 +122,15 @@ FILE *yaz_fopen(const char *path, const char *fname, const char *mode,
     return fopen(fullpath, mode);
 }
 
-int yaz_is_abspath (const char *p)
+int yaz_is_abspath(const char *p)
 {
     if (*p == '/')
         return 1;
 #ifdef WIN32
     if (*p == '\\')
         return 1;
-    if (*p && p[1] == ':' && isalpha(*p))
+    if (*p && p[1] == ':' && 
+        ((*p >= 'A' && *p <= 'Z') || (*p >= 'a' && *p <= 'z')))
         return 1;
 #endif
     return 0;
@@ -113,6 +138,7 @@ int yaz_is_abspath (const char *p)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab