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
Implement cs_get_peer_certificate_x509 for GnuTLS
[yaz-moved-to-github.git]
/
src
/
tpath.c
diff --git
a/src/tpath.c
b/src/tpath.c
index
80dca2d
..
231d29f
100644
(file)
--- a/
src/tpath.c
+++ b/
src/tpath.c
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
/**
* See the file LICENSE for details.
*/
/**
@@
-32,12
+32,12
@@
FILE *yaz_path_fopen(const char *path, const char *name, const char *mode)
{
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)
{
}
int yaz_fclose (FILE *f)
{
- return fclose (f);
+ return fclose(f);
}
}
@@
-50,13
+50,13
@@
size_t yaz_filepath_comp(const char **path_p, const char **comp)
/* somewhat dirty since we have to consider Windows
* drive letters..
*/
/* 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])
else if (path[0] && path[1])
- path_sep = strchr (path+2, ':');
+ path_sep = strchr(path+2, ':');
else
path_sep = 0;
else
path_sep = 0;
-
+
if (path_sep)
{
len = path_sep - path;
if (path_sep)
{
len = path_sep - path;
@@
-76,11
+76,13
@@
char *yaz_filepath_resolve(const char *fname, const char *path,
{
if (path && *path == '\0')
path = 0;
{
if (path && *path == '\0')
path = 0;
+ if (strchr("/\\", *fname))
+ path = 0;
for (;;)
{
struct stat stat_buf;
size_t slen = 0;
for (;;)
{
struct stat stat_buf;
size_t slen = 0;
-
+
*fullpath = '\0';
if (path)
{
*fullpath = '\0';
if (path)
{
@@
-91,19
+93,19
@@
char *yaz_filepath_resolve(const char *fname, const char *path,
if (!len)
break;
if (!len)
break;
- if (!strchr ("/\\", *comp) && base)
+ if (!strchr("/\\", *comp) && base)
{
/* yes: make base the first part */
{
/* yes: make base the first part */
- strcpy (fullpath, base);
+ strcpy(fullpath, base);
slen = strlen(fullpath);
fullpath[slen++] = '/';
}
slen = strlen(fullpath);
fullpath[slen++] = '/';
}
- memcpy (fullpath+slen, comp, len);
+ memcpy(fullpath+slen, comp, len);
slen += len;
slen += len;
- if (slen > 0 && !strchr("/\\", fullpath[slen-1]))
+ if(slen > 0 && !strchr("/\\", fullpath[slen-1]))
fullpath[slen++] = '/';
}
fullpath[slen++] = '/';
}
- strcpy (fullpath+slen, fname);
+ strcpy(fullpath+slen, fname);
if (stat(fullpath, &stat_buf) == 0)
return fullpath;
if (!path)
if (stat(fullpath, &stat_buf) == 0)
return fullpath;
if (!path)
@@
-122,14
+124,15
@@
FILE *yaz_fopen(const char *path, const char *fname, const char *mode,
return fopen(fullpath, mode);
}
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 == '/')
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;
return 1;
#endif
return 0;