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

Fixes r727 not compiling on windows,

Browse Source 
Fixes an old issue on Linux where the program couldn't be run from a symbolic to the executable.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@743 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud
2009-04-07 21:53:20 +00:00
parent 19ac89a38f
commit c98bfafb76
5 changed files with 86 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
realpath.c
View File

@@ -1,7 +1,3 @@
/* Found in:
http://amiga.sourceforge.net/amigadevhelp/FUNCTIONS/GeekGadgets/realpath/ex02_realpath.c
*/
#include <limits.h>
#include <stdlib.h>
#include <errno.h>
@@ -9,83 +5,91 @@
#include <string.h>
#include <unistd.h>
#if defined(__GP2X__)
// This is a random default value ...
#define PATH_MAX 32768
#endif
static char *sep(char *path)
{
#if defined(__AROS__) || defined(__BEOS__) || defined(__MORPHOS__) || defined(__GP2X__)
// These platforms don't have realpath().
// We use the following implementation, found in:
// http://amiga.sourceforge.net/amigadevhelp/FUNCTIONS/GeekGadgets/realpath/ex02_realpath.c
//
// When tested on Debian, this piece of code doesn't resolve
// symbolic link in the filename itself, only on the directories in
// the path. So this implementation is limited, it's really better to
// use realpath() if your platform has it.
#if defined(__GP2X__)
// This is a random default value ...
#define PATH_MAX 32768
#endif
static char *sep(char *path)
{
char *tmp, c;
tmp = strrchr(path, '/');
if(tmp) {
c = tmp[1];
tmp[1] = 0;
if (chdir(path)) {
return NULL;
}
tmp[1] = c;
return tmp + 1;
c = tmp[1];
tmp[1] = 0;
if (chdir(path)) {
return NULL;
}
tmp[1] = c;
return tmp + 1;
}
return path;
}
}
char *realpath(const char *_path, char *resolved_path)
{
char *Realpath(const char *_path, char *resolved_path)
{
int fd = open(".", O_RDONLY), l;
char current_dir_path[PATH_MAX];
char path[PATH_MAX], lnk[PATH_MAX], *tmp = (char *)"";
if (fd < 0) {
return NULL;
return NULL;
}
getcwd(current_dir_path,PATH_MAX);
strncpy(path, _path, PATH_MAX);
if (chdir(path)) {
if (errno == ENOTDIR) {
#if defined(__WIN32__) || defined(__MORPHOS__)
// No symbolic links and no readlink()
l = -1;
#else
l = readlink(path, lnk, PATH_MAX);
#endif
if (!(tmp = sep(path))) {
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 {
if (errno == ENOTDIR) {
#if defined(__WIN32__) || defined(__MORPHOS__)
// No symbolic links and no readlink()
l = -1;
#else
l = readlink(path, lnk, PATH_MAX);
#endif
if (!(tmp = sep(path))) {
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 {
resolved_path = NULL;
goto abort;
}
}
if(resolved_path==NULL) // if we called realpath with null as a 2nd arg
resolved_path = (char*) malloc( PATH_MAX );
resolved_path = (char*) malloc( PATH_MAX );
if (!getcwd(resolved_path, PATH_MAX)) {
resolved_path = NULL;
goto abort;
resolved_path = NULL;
goto abort;
}
if(strcmp(resolved_path, "/") && *tmp) {
strcat(resolved_path, "/");
strcat(resolved_path, "/");
}
strcat(resolved_path, tmp);
@@ -93,5 +97,20 @@ char *realpath(const char *_path, char *resolved_path)
chdir(current_dir_path);
close(fd);
return resolved_path;
}
}
#elif defined (__WIN32__)
// Mingw has a working equivalent. It only has reversed arguments.
char *Realpath(const char *_path, char *resolved_path)
{
return _fullpath(resolved_path,_path,260);
}
#else
// Use the stdlib function.
char *Realpath(const char *_path, char *resolved_path)
{
return realpath(_path, resolved_path);
}
#endif