Use open(".")/fchdir() to save and restore current directory rather than

getcwd()/chdir().

1 files changed, 9 insertions, 3 deletions

diff --git a/tmux.c b/tmux.c
index b229967d..8726a55f 100644
--- a/tmux.c
+++ b/tmux.c
@@ -127,16 +127,22 @@ areshell(const char *shell)
 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);
 }