projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change yaz_filepath_resolve for path="" (empty)
[yaz-moved-to-github.git]
/
src
/
tpath.c
diff --git
a/src/tpath.c
b/src/tpath.c
index
2cd900d
..
80dca2d
100644
(file)
--- 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.
* See the file LICENSE for details.
- *
- * $Id: tpath.c,v 1.12 2006-10-11 08:43:22 adam Exp $
*/
/**
* \file tpath.c
*/
/**
* \file tpath.c
@@
-16,11
+14,18
@@
#include <stdio.h>
#include <string.h>
#include <stdio.h>
#include <string.h>
-#include <ctype.h>
#include <yaz/tpath.h>
#include <yaz/log.h>
#include <yaz/tpath.h>
#include <yaz/log.h>
+#if HAVE_SYS_TYPES_H
#include <sys/types.h>
#include <sys/types.h>
+#endif
+#if HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+#if WIN32
#include <sys/stat.h>
#include <sys/stat.h>
+#endif
+
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
@@
-69,7
+74,9
@@
size_t yaz_filepath_comp(const char **path_p, const char **comp)
char *yaz_filepath_resolve(const char *fname, const char *path,
const char *base, char *fullpath)
{
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;
size_t slen = 0;
{
struct stat stat_buf;
size_t slen = 0;
@@
-130,6
+137,7
@@
int yaz_is_abspath (const char *p)
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab