m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Second attempt at fixing #448.

Browse Source 
* Fix another bug with realpath in Haiku (relying on nonstandard behaviour)


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1917 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Adrien Destugues
2012-03-06 21:05:54 +00:00
parent 8852f59a95
commit af8316c279
3 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/realpath.c
View File

@@ -43,6 +43,8 @@
return path;
}
// Find the real path of _path by chdir to it and then getcwd.
// If resolved_path is null, it is allocated.
char *Realpath(const char *_path, char *resolved_path)
{
int fd = open(".", O_RDONLY), l;
@@ -62,23 +64,23 @@
l = -1;
#else
l = readlink(path, lnk, PATH_MAX);
#endif
if (!(tmp = sep(path))) {
#endif
if (!(tmp = sep(path))) {
resolved_path = NULL;
goto abort;
}
if (l < 0) {
if (errno != EINVAL) {
resolved_path = NULL;
goto abort;
}
if (l < 0) {
if (errno != EINVAL) {
resolved_path = NULL;
goto abort;
}
} else {
lnk[l] = 0;
if (!(tmp = sep(lnk))) {
resolved_path = NULL;
goto abort;
}
} else {
lnk[l] = 0;
if (!(tmp = sep(lnk))) {
resolved_path = NULL;
goto abort;
}
}
} else {
resolved_path = NULL;
goto abort;
@@ -114,6 +116,12 @@
// Use the stdlib function.
char *Realpath(const char *_path, char *resolved_path)
{
// While linux version of realpath handles the resolved_path being a
// null pointer, this is not the case for other platforms (Haiku), nor
// specified by the open group in POSIX. So, be safe and allocate
// ourselves.
if(resolved_path==NULL) // if we called realpath with null as a 2nd arg
resolved_path = (char*) malloc( PATH_MAX );
return realpath(_path, resolved_path);
}
#endif