/*
- * 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.5 2005-01-15 19:47:14 adam Exp $
+ * $Id: tpath.c,v 1.9 2006-04-27 08:39:05 adam Exp $
*/
/**
* \file tpath.c
- * \brief Implements path fopen
+ * \brief File Path utilities
*/
#if HAVE_CONFIG_H
#include <ctype.h>
#include <yaz/tpath.h>
#include <yaz/log.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
FILE *yaz_path_fopen(const char *path, const char *name, const char *mode)
{
return fclose (f);
}
-FILE *yaz_fopen(const char *path, const char *name, const char *mode,
- const char *base)
-{
- char spath[1024];
+char *yaz_filepath_resolve(const char *fname, const char *path,
+ const char *base, char *fullpath)
+{
for(;;)
{
- FILE *f;
-
+ struct stat stat_buf;
const char *path_sep = 0;
size_t len = 0;
size_t slen = 0;
- *spath = '\0';
+ *fullpath = '\0';
if (path)
{
/* somewhat dirty since we have to consider Windows
len = strlen(path);
if (!strchr ("/\\", *path) && base)
{
- strcpy (spath, base);
- slen = strlen(spath);
- spath[slen++] = '/';
+ strcpy (fullpath, base);
+ slen = strlen(fullpath);
+ fullpath[slen++] = '/';
}
- memcpy (spath+slen, path, len);
+ memcpy (fullpath+slen, path, len);
slen += len;
- if (!strchr("/\\", spath[slen-1]))
- spath[slen++] = '/';
+ if (!strchr("/\\", fullpath[slen-1]))
+ fullpath[slen++] = '/';
}
- strcpy (spath+slen, name);
- if ((f = fopen(spath, mode)))
- return f;
+ strcpy (fullpath+slen, fname);
+
+ if (stat(fullpath, &stat_buf) == 0)
+ return fullpath;
if (!path_sep)
break;
return 0;
}
+FILE *yaz_fopen(const char *path, const char *fname, const char *mode,
+ const char *base)
+{
+ char fullpath[1024];
+
+ if (!yaz_filepath_resolve(fname, path, base, fullpath))
+ return 0; /* failure */
+ return fopen(fullpath, mode);
+}
+
int yaz_is_abspath (const char *p)
{
if (*p == '/')
#endif
return 0;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+