/*
- * Copyright (C) 1995-2005, Index Data ApS
+ * Copyright (C) 1995-2006, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: tpath.c,v 1.8 2006-04-26 10:01:31 adam Exp $
+ * $Id: tpath.c,v 1.11 2006-06-08 20:55:38 adam Exp $
*/
/**
* \file tpath.c
#include <yaz/tpath.h>
#include <yaz/log.h>
#include <sys/types.h>
-#if HAVE_SYS_STAT_H
#include <sys/stat.h>
-#endif
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
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))
- {
+ 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)
{
+ /* yes: make base the first part */
strcpy (fullpath, base);
slen = strlen(fullpath);
fullpath[slen++] = '/';
}
- memcpy (fullpath+slen, path, len);
+ if (len)
+ memcpy (fullpath+slen, path, 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;