* exceptions.cc (set_console_handler): Don't allocate

console_handler_thread_waiter.  It is obsolete.
(ctrl_c_handler): Don't use console_handler_thread_waiter.
* path.cc (hash_path_name): Fix handling of relative names.  Make case
insensitive.
* path.h (suffix_info): Use initializers.
* pinfo.h (_pinfo): Avoid initializers for null case.
* resource.cc (fill_rusage): Zero rest of rusage structure.
* security.cc (set_process_privileges): Don't reopen parent process.  Just use
hMainProc.
* signal.cc (signal): Track when a signal handler has been used.
(sigaction): Ditto.
* sigproc.cc (pchildren): Use default initializer.
(zombies): Ditto.
(sigproc_terminate): Avoid closing handles that will be closed on exit anyway.
(wait_sig): Send signal to "parent" on EXECing, not FORKing.
(wait_subproc): Send SIGCHLD here rather than in proc_wait to avoid potential
muto conflicts.
* sigproc.h (sigthread): Don't initialize to zero.  It's the default.
* spawn.cc (spawn_guts): Fill in resources from exec parent prior to
termination.
* sync.h (muto): Don't initialize to zero.
* syscalls.cc (close_all_files): Use one lock around entire loop and call
fhandler close/release stuff directly.
(_read): Don't use ready_for_read if there are not signal handlers active.
* dcrt0.cc (dll_crt0_1): Fix display of "title".
(do_exit): Use pinfo exit method to exit.
(__api_fatal): Ditto.
* exceptions.cc (signal_exit): Ditto.
* fork.cc (fork_child): Remove debugging stuff.  Use pinfo_fixup_after fork in
place of exec_fixup_after_fork.
* pinfo.cc (pinfo_fixup_after_fork): New method.
(pinfo_fixup_in_spawned_child): Ditto.
(_pinfo::exit): New method.
(_pinfo::init): Remove recursion.  Detect pathological case where pinfo
structure already exists for new pid.
* pinfo.h (_pinfo): Reorganize slightly.  Add new method and new function
declarations.
* sigproc.cc (proc_exists): Previous simplification was a little to simple.
Try harder to detect if a process exists.
(proc_terminate): Use PID_EXITED setting to determine if process is still
around.
(WFSO): Remove debugging statement.
(WFMO): Ditto.
* spawn.cc (exec_fixup_after_fork): Eliminate.
(spawn_guts): Always set old_title to NULL.  Is it really needed?  Move
hexec_proc to pinfo.cc.  Call pinfo_fixup_in_spawned_child to eliminate handle
link after a spawn.
* include/sys/cygwin.h: Remove PID_NOT_IN_USE.  Add PID_EXITED.

1 files changed, 12 insertions, 6 deletions

diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index 65d439284..f54cc1ccf 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -53,10 +53,16 @@ extern BOOL allow_ntsec;
 void __stdcall
 close_all_files (void)
 {
-  for (int i = 0; i < (int)fdtab.size; i++)
+  SetResourceLock(LOCK_FD_LIST,WRITE_LOCK|READ_LOCK," close");
+
+  for (int i = 0; i < (int) fdtab.size; i++)
     if (!fdtab.not_open (i))
-      _close (i);
+      {
+	fdtab[i]->close ();
+	fdtab.release (i);
+      }
 
+  ReleaseResourceLock(LOCK_FD_LIST,WRITE_LOCK|READ_LOCK," close");
   cygwin_shared->delqueue.process_queue ();
 }
 
@@ -200,6 +206,7 @@ extern "C" int
 _read (int fd, void *ptr, size_t len)
 {
   sigframe thisframe (mainthread);
+  extern int sigcatchers;
   if (fdtab.not_open (fd))
     {
       set_errno (EBADF);
@@ -211,10 +218,10 @@ _read (int fd, void *ptr, size_t len)
   DWORD wait = (fh->get_flags () & (O_NONBLOCK | OLD_O_NDELAY)) ? 0 : INFINITE;
 
   /* Could block, so let user know we at least got here.  */
-  syscall_printf ("read (%d, %p, %d) %sblocking", fd, ptr, len, wait ? "" : "non");
+  syscall_printf ("read (%d, %p, %d) %sblocking, sigcatchers %d", fd, ptr, len, wait ? "" : "non", sigcatchers);
 
   int res;
-  if (wait && (!fh->is_slow () || fh->get_r_no_interrupt ()))
+  if (wait && (!sigcatchers || !fh->is_slow () || fh->get_r_no_interrupt ()))
     debug_printf ("non-interruptible read\n");
   else if (!fh->ready_for_read (fd, wait, 0))
     {
@@ -236,7 +243,6 @@ _read (int fd, void *ptr, size_t len)
       myself->process_state &= ~PID_TTYIN;
     }
 
-
 out:
   syscall_printf ("%d = read (%d<%s>, %p, %d), errno %d", res, fd, fh->get_name (),
 		  ptr, len, get_errno ());
@@ -988,7 +994,7 @@ suffix_info stat_suffixes[] =
 /* Cygwin internal */
 static int
 stat_worker (const char *caller, const char *name, struct stat *buf,
-	      int nofollow)
+	     int nofollow)
 {
   int res = -1;
   int oret = 1;