From 710eeb2a33cb91c05251c69d7eb1a572aed44cb4 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Sat, 5 Oct 2013 11:40:47 +0100 Subject: [PATCH] Fix previous not to lead fd on failure. --- tmux.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tmux.c b/tmux.c index 4ff45d55..f68beeea 100644 --- a/tmux.c +++ b/tmux.c @@ -130,23 +130,25 @@ areshell(const char *shell) const char * get_full_path(const char *wd, const char *path) { - int fd; - static char newpath[MAXPATHLEN]; + int fd; + static char newpath[MAXPATHLEN]; + const char *retval; fd = open(".", O_RDONLY); if (fd == -1) return (NULL); - if (chdir(wd) != 0) - return (NULL); - if (realpath(path, newpath) != 0) - return (NULL); + retval = NULL; + if (chdir(wd) == 0) { + if (realpath(path, newpath) == 0) + retval = newpath; + } if (fchdir(fd) != 0) chdir("/"); close(fd); - return (newpath); + return (retval); } void