From d51b4f92d7c9899694e9ef8334030ceb512cb2de Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Sat, 5 Oct 2013 09:14:11 +0100
Subject: [PATCH] Use open(".")/fchdir() to save and restore current directory
 rather than getcwd()/chdir().

---
 osdep-openbsd.c |  2 +-
 tmux.c          | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/osdep-openbsd.c b/osdep-openbsd.c
index 7be38a91..0a4c1445 100644
--- a/osdep-openbsd.c
+++ b/osdep-openbsd.c
@@ -135,7 +135,7 @@ error:
 	return (NULL);
 }
 
-char*
+char *
 osdep_get_cwd(int fd)
 {
 	int		name[] = { CTL_KERN, KERN_PROC_CWD, 0 };
diff --git a/tmux.c b/tmux.c
index 9c81cff5..4ff45d55 100644
--- a/tmux.c
+++ b/tmux.c
@@ -127,19 +127,25 @@ areshell(const char *shell)
 	return (0);
 }
 
-const char*
+const char *
 get_full_path(const char *wd, const char *path)
 {
+	int		fd;
 	static char	newpath[MAXPATHLEN];
-	char		oldpath[MAXPATHLEN];
 
-	if (getcwd(oldpath, sizeof oldpath) == NULL)
+	fd = open(".", O_RDONLY);
+	if (fd == -1)
 		return (NULL);
+
 	if (chdir(wd) != 0)
 		return (NULL);
 	if (realpath(path, newpath) != 0)
 		return (NULL);
-	chdir(oldpath);
+
+	if (fchdir(fd) != 0)
+		chdir("/");
+	close(fd);
+
 	return (newpath);
 }