From df63bd490a526af2d68f391f703abe8b54a502db Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Mon, 15 Oct 2001 23:39:33 +0000 Subject: * fhandler.cc (fhandler_base::fork_fixup): Don't protect handle. * dlfcn.cc: Fix to confirm to coding standards. Reorganize includes throughout to accomodate new cygheap.h usage. * cygheap.h (cygheap_fdmanip): New class: simplifies locking and retrieval of fds from cygheap->fdtab. (cygheap_fdget): Ditto. (cygheap_fdnew): Ditto. * fcntl.cc (_fcntl): Use new method to lock fdtab and retrieve info. * ioctl.cc (ioctl): Ditto. * mmap.cc (mmap): Ditto. * net.cc: Ditto, throughout. * passwd.cc (getpass): Ditto. * path.cc (fchdir): Ditto. * pipe.cc (make_pipe): Ditto. * sec_acl.cc (facl): Ditto. * syscalls.cc: Ditto, throughout. * termios.cc: Ditto, throughout. --- winsup/cygwin/path.cc | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'winsup/cygwin/path.cc') diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc index 59b0d59df..95e4ef703 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -3136,19 +3136,17 @@ extern "C" int fchdir (int fd) { + int res; sigframe thisframe (mainthread); - if (cygheap->fdtab.not_open (fd)) - { - syscall_printf ("-1 = fchdir (%d)", fd); - set_errno (EBADF); - return -1; - } - SetResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "fchdir"); - int ret = chdir (cygheap->fdtab[fd]->get_name ()); - ReleaseResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "fchdir"); - syscall_printf ("%d = fchdir (%d)", ret, fd); - return ret; + cygheap_fdget cfd (fd); + if (cfd >= 0) + res = chdir (cfd->get_name ()); + else + res = -1; + + syscall_printf ("%d = fchdir (%d)", res, fd); + return res; } /******************** Exported Path Routines *********************/ -- cgit v1.2.3