Merge from R9_0-AMD64, most notably:

- AMD64 support to insmod-busybox, minilibc, et al.
- Sync with insmod-modutils 2.4.19 something but everyone should use
  dietlibc nowadays
- Factor out compilation and prefix with $(DIET) for dietlibc builds
- 64-bit & varargs fixes

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; }