From 8b136c84d2b233f71844039a6378ececae4290a1 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Mon, 29 Nov 2004 16:26:12 +0000 Subject: Corrected the error-return comment for zchdir() and optimized the HAVE_FCHDIR error-return code. --- Src/compat.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/Src/compat.c b/Src/compat.c index ba077d3a0..b8e1a6f0f 100644 --- a/Src/compat.c +++ b/Src/compat.c @@ -376,7 +376,7 @@ zgetcwd(void) return zgetdir(NULL); } -/* chdir with arbitrary long pathname. Returns 0 on success, 0 on normal * +/* chdir with arbitrary long pathname. Returns 0 on success, -1 on normal * * failure and -2 when chdir failed and the current directory is lost. */ /**/ @@ -418,17 +418,16 @@ zchdir(char *dir) dir = s; } #ifdef HAVE_FCHDIR - if (currdir == -1 || (currdir >= 0 && fchdir(currdir))) { - if (currdir >= 0) + if (currdir >= 0) { + if (fchdir(currdir) < 0) { close(currdir); - return -2; - } - if (currdir >= 0) + return -2; + } close(currdir); - return -1; -#else - return currdir == -2 ? -1 : -2; + return -1; + } #endif + return currdir == -2 ? -1 : -2; } /* -- cgit 1.4.1