libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-02-28 03:27:46 +08:00
Code Issues Projects Releases Wiki Activity

* flock.cc (create_lock_in_parent): Make lf_obj handle inheritable.

Browse Source 
Explain why.
	(lockf_t::create_lock_obj): Use FALSE, rather than 0 for BOOL argument.
	(lockf_t::del_lock_obj): Check if NtSetEvent succeeded and print system
	message if not.
This commit is contained in:
Corinna Vinschen 2014-12-02 15:39:57 +00:00
parent 44cacc7f44
commit df386ddac8
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,11 @@
2014-12-02 Corinna Vinschen <corinna@vinschen.de>
* flock.cc (create_lock_in_parent): Make lf_obj handle inheritable.
Explain why.
(lockf_t::create_lock_obj): Use FALSE, rather than 0 for BOOL argument.
(lockf_t::del_lock_obj): Check if NtSetEvent succeeded and print system
message if not.
2014-12-02 Corinna Vinschen <corinna@vinschen.de> 2014-12-02 Corinna Vinschen <corinna@vinschen.de>
* uinfo.cc (fetch_windows_home): New function fetching Windows-compliant * uinfo.cc (fetch_windows_home): New function fetching Windows-compliant

12
winsup/cygwin/flock.cc
View File

@ -703,6 +703,12 @@ create_lock_in_parent (PVOID param)
NtClose (lf_obj); NtClose (lf_obj);
return 0; return 0;
} }
/* The handle gets created non-inheritable. That's fine, unless the parent
starts another process accessing this object. So, after it's clear we
have to store the handle for further use, make sure it gets inheritable
by child processes. */
if (!SetHandleInformation (lf_obj, HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT))
goto err;
/* otherwise generate inode from directory name... */ /* otherwise generate inode from directory name... */
node = inode_t::get (dev, ino, true, false); node = inode_t::get (dev, ino, true, false);
/* ...and generate lock from object name. */ /* ...and generate lock from object name. */
@ -810,7 +816,7 @@ lockf_t::create_lock_obj ()
return; return;
} }
if (!DuplicateHandle (GetCurrentProcess (), lf_obj, parent_proc, if (!DuplicateHandle (GetCurrentProcess (), lf_obj, parent_proc,
&parent_lf_obj, TRUE, 0, DUPLICATE_SAME_ACCESS)) &parent_lf_obj, TRUE, FALSE, DUPLICATE_SAME_ACCESS))
debug_printf ("DuplicateHandle (lf_obj): %E"); debug_printf ("DuplicateHandle (lf_obj): %E");
else else
{ {
@ -873,7 +879,9 @@ lockf_t::del_lock_obj (HANDLE fhdl, bool signal)
if ((lf_flags & F_POSIX) || signal if ((lf_flags & F_POSIX) || signal
|| (fhdl && get_obj_handle_count (fhdl) <= 1)) || (fhdl && get_obj_handle_count (fhdl) <= 1))
{ {
NtSetEvent (lf_obj, NULL); NTSTATUS status = NtSetEvent (lf_obj, NULL);
if (!NT_SUCCESS (status))
system_printf ("NtSetEvent, %y", status);
/* For BSD locks, notify the parent process. */ /* For BSD locks, notify the parent process. */
if (lf_flags & F_FLOCK) if (lf_flags & F_FLOCK)
{ {

1
winsup/cygwin/spawn.cc
View File

@ -467,6 +467,7 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,
} }
} }
debug_printf ("ping 1");
if (mode == _P_DETACH) if (mode == _P_DETACH)
c_flags |= DETACHED_PROCESS; c_flags |= DETACHED_PROCESS;
else else