From 959a2409fe2684f971ce5cf92efb02888e948c24 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 12 Jul 2003 16:07:30 +0000 Subject: Don't emit diagnostics. Let callers do that. Don't include "error.h". (save_cwd): Don't call error. Ensure that errno is valid when returning nonzero. --- lib/save-cwd.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'lib') diff --git a/lib/save-cwd.c b/lib/save-cwd.c index bd75ef745..068ff0ac0 100644 --- a/lib/save-cwd.c +++ b/lib/save-cwd.c @@ -47,7 +47,6 @@ extern int errno; #endif #include "save-cwd.h" -#include "error.h" #include "xgetcwd.h" /* Record the location of the current working directory in CWD so that @@ -80,10 +79,7 @@ save_cwd (struct saved_cwd *cwd) #if HAVE_FCHDIR cwd->desc = open (".", O_RDONLY | O_DIRECTORY); if (cwd->desc < 0) - { - error (0, errno, "cannot open current directory"); - return 1; - } + return 1; # if __sun__ || sun /* On SunOS 4 and IRIX 5.3, fchdir returns EINVAL when auditing @@ -98,9 +94,10 @@ save_cwd (struct saved_cwd *cwd) } else { - error (0, errno, "current directory"); + int saved_errno = errno; close (cwd->desc); cwd->desc = -1; + errno = saved_errno; return 1; } } @@ -115,10 +112,7 @@ save_cwd (struct saved_cwd *cwd) { cwd->name = xgetcwd (); if (cwd->name == NULL) - { - error (0, errno, "cannot get current directory"); - return 1; - } + return 1; } return 0; } -- cgit v1.2.3-54-g00ecf