From f1566cce4540d9cdd48239e3d31bb3658b8771d4 Mon Sep 17 00:00:00 2001
From: Kelvin Sherlock <ksherlock@gmail.com>
Date: Mon, 22 Dec 2014 09:53:38 -0500
Subject: [PATCH] use new realpath code

---
 toolbox/CMakeLists.txt   |  1 +
 toolbox/os_highlevel.cpp | 10 ++++------
 toolbox/realpath.c       | 22 ++++++++++++++++++++--
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/toolbox/CMakeLists.txt b/toolbox/CMakeLists.txt
index 5412a4a..d4c9d3b 100644
--- a/toolbox/CMakeLists.txt
+++ b/toolbox/CMakeLists.txt
@@ -22,6 +22,7 @@ set(TOOLBOX_SRC
 	pathnames.cpp
 	utility.cpp
 	fs_spec.cpp
+	realpath.c
 )
 
 
diff --git a/toolbox/os_highlevel.cpp b/toolbox/os_highlevel.cpp
index 75f8111..637e971 100644
--- a/toolbox/os_highlevel.cpp
+++ b/toolbox/os_highlevel.cpp
@@ -59,6 +59,9 @@
 using ToolBox::Log;
 using MacOS::macos_error_from_errno;
 
+extern "C" {
+	char * fs_spec_realpath(const char * __restrict path, char * __restrict resolved);
+}
 
 namespace OS {
 
@@ -83,15 +86,10 @@ namespace OS {
 		// realpath does not behave in such a manner.
 
 
-
-
 		// expand the path.  Also handles relative paths.
-		char *cp = ::realpath(path.c_str(), buffer);
+		char *cp = ::fs_spec_realpath(path.c_str(), buffer);
 		if (!cp)
 		{
-			// temporary workaround - return if it's just a filename w/o a path.
-			if (path.find('/') == path.npos) return path;
-
 			fprintf(stderr, "realpath failed %s\n", path.c_str());
 			return "";
 		}
diff --git a/toolbox/realpath.c b/toolbox/realpath.c
index c4bd953..d104fc6 100644
--- a/toolbox/realpath.c
+++ b/toolbox/realpath.c
@@ -32,7 +32,7 @@ static char sccsid[] = "@(#)realpath.c	8.1 (Berkeley) 2/16/94";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "namespace.h"
+//#include "namespace.h"
 #include <sys/param.h>
 #include <sys/stat.h>
 
@@ -40,15 +40,23 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include "un-namespace.h"
+//#include "un-namespace.h"
+
+#define FS_SPEC
 
 /*
  * Find the real name of path, by removing all ".", ".." and symlink
  * components.  Returns (resolved) on success, or (NULL) on failure,
  * in which case the path which caused trouble is left in (resolved).
  */
+
+#ifdef FS_SPEC
+char *
+fs_spec_realpath(const char * __restrict path, char * __restrict resolved)
+#else
 char *
 realpath(const char * __restrict path, char * __restrict resolved)
+#endif
 {
 	struct stat sb;
 	char *p, *q, *s;
@@ -57,6 +65,10 @@ realpath(const char * __restrict path, char * __restrict resolved)
 	int m, slen;
 	char left[PATH_MAX], next_token[PATH_MAX], symlink[PATH_MAX];
 
+	#ifdef FS_SPEC
+	int serrno = errno;
+	#endif
+
 	if (path == NULL) {
 		errno = EINVAL;
 		return (NULL);
@@ -162,6 +174,12 @@ realpath(const char * __restrict path, char * __restrict resolved)
 			return (NULL);
 		}
 		if (lstat(resolved, &sb) != 0) {
+			#ifdef FS_SPEC
+			if (errno == ENOENT && p == NULL) {
+				errno = serrno;
+				return (resolved);
+			}
+			#endif
 			if (m)
 				free(resolved);
 			return (NULL);