diff options
author | Mystery Man <unknown@mandriva.org> | 2003-08-20 07:37:27 +0000 |
---|---|---|
committer | Mystery Man <unknown@mandriva.org> | 2003-08-20 07:37:27 +0000 |
commit | 7f2ac73888b8ef372ea597049981b27e7d810ac2 (patch) | |
tree | 354132889b63bbe5f446cb82869b3c3367135a80 /mdk-stage1/dietlibc/libshell/realpath.c | |
parent | 327bd24f8e4291bd1882de1990dd7339f781a9cb (diff) | |
download | drakx-topic/MDKC_1_0.tar drakx-topic/MDKC_1_0.tar.gz drakx-topic/MDKC_1_0.tar.bz2 drakx-topic/MDKC_1_0.tar.xz drakx-topic/MDKC_1_0.zip |
This commit was manufactured by cvs2svn to create branch 'MDKC_1_0'.topic/MDKC_1_0
Diffstat (limited to 'mdk-stage1/dietlibc/libshell/realpath.c')
-rw-r--r-- | mdk-stage1/dietlibc/libshell/realpath.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mdk-stage1/dietlibc/libshell/realpath.c b/mdk-stage1/dietlibc/libshell/realpath.c index 1377018e5..9aee2c585 100644 --- a/mdk-stage1/dietlibc/libshell/realpath.c +++ b/mdk-stage1/dietlibc/libshell/realpath.c @@ -5,21 +5,21 @@ #include <string.h> #include "dietfeatures.h" -char *realpath(const char *path, char *resolved_path) { +char* realpath(const char *path, char *resolved_path) { int fd=open(".",O_RDONLY); - char *tmp=""; + char* tmp=(char*)""; + if (fd<0) return 0; if (chdir(path)) { -#ifdef WANT_THREAD_SAFE - if (*__errno_location()==ENOTDIR) -#else - if (errno==ENOTDIR) -#endif - { - if ((tmp=strrchr(path,'/'))) { + if (errno==ENOTDIR) { + char* match; + if ((match=strrchr(path,'/'))) { + tmp=match; memmove(resolved_path,path,tmp-path); resolved_path[tmp-path]=0; if (chdir(resolved_path)) { resolved_path=0; goto abort; } } + } else { + resolved_path=0; goto abort; } } if (!getcwd(resolved_path,PATH_MAX)) { resolved_path=0; goto abort; } |