/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data
+ * Copyright (C) 1995-2011 Index Data
* See the file LICENSE for details.
*/
/**
#include <stdio.h>
#include <string.h>
-#include <ctype.h>
#include <yaz/tpath.h>
#include <yaz/log.h>
#if HAVE_SYS_TYPES_H
#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);
}
/* somewhat dirty since we have to consider Windows
* drive letters..
*/
- if (path[0] && strchr ("/\\.", path[0]))
- path_sep = strchr (path+1, ':');
+ if (path[0] && strchr("/\\.", path[0]))
+ path_sep = strchr(path+1, ':');
else if (path[0] && path[1])
- path_sep = strchr (path+2, ':');
+ path_sep = strchr(path+2, ':');
else
path_sep = 0;
char *yaz_filepath_resolve(const char *fname, const char *path,
const char *base, char *fullpath)
{
- for(;;)
+ if (path && *path == '\0')
+ path = 0;
+ if (strchr("/\\", *fname))
+ path = 0;
+ for (;;)
{
struct stat stat_buf;
size_t slen = 0;
if (!len)
break;
- if (!strchr ("/\\", *comp) && base)
+ if (!strchr("/\\", *comp) && base)
{
/* yes: make base the first part */
- strcpy (fullpath, base);
+ strcpy(fullpath, base);
slen = strlen(fullpath);
fullpath[slen++] = '/';
}
- memcpy (fullpath+slen, comp, 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)
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;
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab