-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2010 Index Data
* See the file LICENSE for details.
- *
- * $Id: tpath.c,v 1.8 2006-04-26 10:01:31 adam Exp $
*/
/**
* \file tpath.c
#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
}
+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(;;)
{
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 (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)
+ 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);
slen = strlen(fullpath);
fullpath[slen++] = '/';
}
- memcpy (fullpath+slen, path, len);
+ memcpy (fullpath+slen, comp, len);
slen += len;
- if (!strchr("/\\", fullpath[slen-1]))
+ if (slen > 0 && !strchr("/\\", fullpath[slen-1]))
fullpath[slen++] = '/';
}
strcpy (fullpath+slen, fname);
-
if (stat(fullpath, &stat_buf) == 0)
return fullpath;
-
- if (!path_sep)
+ if (!path)
break;
- path = path_sep+1;
}
return 0;
}
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab