From 47063f00e4eae2ed37096eda54429c025c0bc7b5 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Mon, 1 Oct 2001 04:10:07 +0000 Subject: Add "path.h" include throughout, where needed. Use new path_conv methods and operators to simplify testing for directory and attributes, throughout. * path.h (path_conv::exists): New method. (path_conv::has_attribute): Ditto. (path_conv::isdir): Ditto. (path_conv::DWORD &): New operator. (path_conv::int &): Ditto. * dir.cc (rmdir): Eliminate a goto. * dtable.cc (dtable::build_fhandler): Accept opt and suffix info for path_conv.check. Return fh == NULL on path_conv error. Pass unit to set_name as appropriate. (dtable::reset_unix_path_name): New method. * dtable.h (dtable): Declare new method. Reflect arg changes to build_fhandler. * fhandler.cc (fhandler_disk_dummy_name): Eliminate. (fhandler_base::set_name): Expect paths to be NULL. Build unix_path_name from win32_path_name when it is a device. (fhandler_base::reset_unix_path_name): New method. (fhandler_base::raw_read): Report EISDIR when ERROR_INVALID_FUNCTION or ERROR_INVALID_PARAMETER and reading a directory. (fhandler_disk_file::fstat): Don't call stat_dev since we should now never be calling fhandler_disk_file methods with devices. (fhandler_base::fhandler_base): Clear {unix,win32}_path_name. (fhandler_base::~fhandler_base): Always free {unix,win32}_path_name. (fhandler_disk_file::fhandler_disk_file): Remove set_no_free_names kludge. (fhandler_disk_file::open): Ditto. * fhandler.h (fhandler_base::no_free_names): Eliminate. (fhandler_base::set_no_free_names): Ditto. * fhandler_tty.cc (fhandler_tty_slave::fhandler_tty_slave): Don't set unix_path_name here. * path.cc (fchdir): Lock fd table throughout. Use new dtable::reset_unix_path_name method to reset path. * syscalls.cc (stat_worker): Reorganize to always call fstat method. Pass path_conv method to fhandler_*::open. (chroot): Elminate a goto. --- winsup/cygwin/dtable.cc | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'winsup/cygwin/dtable.cc') diff --git a/winsup/cygwin/dtable.cc b/winsup/cygwin/dtable.cc index e08ed4209..9c8677241 100644 --- a/winsup/cygwin/dtable.cc +++ b/winsup/cygwin/dtable.cc @@ -210,7 +210,8 @@ dtable::init_std_file_from_handle (int fd, HANDLE handle, } } - build_fhandler (fd, name, handle)->init (handle, myaccess, bin); + path_conv pc; + build_fhandler (fd, name, handle, &pc)->init (handle, myaccess, bin); set_std_handle (fd); paranoid_printf ("fd %d, handle %p", fd, handle); } @@ -228,7 +229,8 @@ cygwin_attach_handle_to_fd (char *name, int fd, HANDLE handle, mode_t bin, } fhandler_base * -dtable::build_fhandler (int fd, const char *name, HANDLE handle, path_conv *pc) +dtable::build_fhandler (int fd, const char *name, HANDLE handle, path_conv *pc, + unsigned opt, suffix_info *si) { int unit; DWORD devn; @@ -238,7 +240,12 @@ dtable::build_fhandler (int fd, const char *name, HANDLE handle, path_conv *pc) devn = get_device_number (name, unit); else { - pc->check (name); + pc->check (name, opt | PC_NULLEMPTY, si); + if (pc->error) + { + set_errno (pc->error); + return NULL; + } devn = pc->get_devn (); unit = pc->get_unitn (); } @@ -268,7 +275,7 @@ dtable::build_fhandler (int fd, const char *name, HANDLE handle, path_conv *pc) fh = build_fhandler (fd, devn, name, unit); if (pc) - fh->set_name (name, *pc); + fh->set_name (name, *pc, unit); return fh; } @@ -434,6 +441,14 @@ done: return res; } +void +dtable::reset_unix_path_name (int fd, const char *name) +{ + SetResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "reset_unix_name"); + fds[fd]->reset_unix_path_name (name); + ReleaseResourceLock (LOCK_FD_LIST, WRITE_LOCK | READ_LOCK, "reset_unix_name"); +} + select_record * dtable::select_read (int fd, select_record *s) { -- cgit v1.2.3