From a998dd705576606f85e3598e5a38ea8d3805f798 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 24 Mar 2008 14:48:58 +0000 Subject: * fhandler.cc (fhandler_base::dup): Drop setting flags in the parent. Implement advisory file locking. * cygheap.h (struct init_cygheap): Add inode_list member. * cygwin.din (lockf): Export. * dcrt0.cc (child_info_spawn::handle_spawn): Call fixup_lockf_after_exec. * dtable.h (class dtable): Add fhandler_disk_file as friend class. * fhandler.cc (fhandler_base::close): Call del_my_locks if node is set. (fhandler_base::fhandler_base): Initialize node to NULL. (fhandler_base::fixup_after_fork): Ditto. * fhandler.h (class fhandler_base): Add member node. * fhandler_disk_file.cc (fhandler_disk_file::lock): Delete. * flock.cc: Implement all advisory file locking here. (fhandler_disk_file::lock): Implement here. (flock): Call fcntl with F_FLOCK bit set. Remove test main function. (lockf): New function. * fork.cc (frok::child): Call fixup_lockf_after_fork. * ntdll.h (DIRECTORY_ALL_ACCESS): Define. (struct _OBJECT_BASIC_INFORMATION): Define. (enum _EVENT_TYPE): Define. (NtCreateDirectoryObject): Declare. (NtCreateEvent): Declare. (NtCreateMutant): Declare. (NtOpenEvent): Declare. (NtOpenMutant): Declare. * include/cygwin/version.h: Bump API minor number. --- winsup/cygwin/fhandler.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'winsup/cygwin/fhandler.h') diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index a80ae8dd4..02cab5e11 100644 --- a/winsup/cygwin/fhandler.h +++ b/winsup/cygwin/fhandler.h @@ -38,6 +38,7 @@ extern const int proc_len; class select_record; class fhandler_disk_file; +class inode_t; typedef struct __DIR DIR; struct dirent; struct iovec; @@ -136,6 +137,8 @@ class fhandler_base size_t raixput; size_t rabuflen; + inode_t *node; /* Used for advisory file locking. See flock.cc. */ + DWORD fs_flags; HANDLE read_state; int wait_overlapped (bool&, bool, DWORD *) __attribute__ ((regparm (3))); -- cgit v1.2.3