From 7d18720162a71f7f3835c08291a5a1938fd707e4 Mon Sep 17 00:00:00 2001
From: Kelvin Sherlock <ksherlock@gmail.com>
Date: Thu, 11 Feb 2016 20:50:24 -0500
Subject: [PATCH] use filesystem::current_path for builtin_directoery

---
 builtins.cpp | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/builtins.cpp b/builtins.cpp
index a09e937..354a3a5 100644
--- a/builtins.cpp
+++ b/builtins.cpp
@@ -375,25 +375,29 @@ int builtin_directory(Environment &env, const std::vector<std::string> &tokens,
 		}
 
 		// todo -- if relative path does not exist, check {DirectoryPath}
-		std::string path = ToolBox::MacToUnix(argv.front());
-		int ok = chdir(path.c_str());
-		if (ok < 0) {
+		fs::path path = ToolBox::MacToUnix(argv.front());
+		std::error_code ec;
+		current_path(path, ec);
+		if (ec) {
 			fputs("### Directory - Unable to set current directory.\n", stderr);
-			perror("chdir: ");
+			fprintf(stderr, "# %s\n", ec.message().c_str());
 			return 1;
 		}
 	}
 	else {
 		// pwd
-		char buffer[MAXPATHLEN];
-		char *cp = getcwd(buffer, sizeof(buffer));
-		if (!cp) {
-			perror("getcwd: ");
+		std::error_code ec;
+		fs::path path = fs::current_path(ec);
+		if (ec) {
+
+			fputs("### Directory - Unable to get current directory.\n", stderr);
+			fprintf(stderr, "# %s\n", ec.message().c_str());
 			return 1;
+
 		}
 		// todo -- pathname translation?
 
-		std::string s = buffer;
+		std::string s = path;
 		if (!q) s = quote(std::move(s));
 		fprintf(stdout, "%s\n", s.c_str());
 	}
@@ -579,7 +583,7 @@ int builtin_which(Environment &env, const std::vector<std::string> &tokens, cons
 			return 2;
 		}
 	}
-	
+
 	for(; ss; ++ss) {
 		if (p) fprintf(stderr, "checking %s\n", ss->c_str());