* cygheap.cc (init_cygheap::manage_console_count): Turn console control handler

on/off depending on whether we have allocated a console or not.
* dcrt0.cc (child_info_fork::fork_retry): Add more potential retry statuses.
(dll_crt0_0): Turn on/off console control depending on whether we have a
controlling tty or not.
* exceptions.cc (init_console_handler): Change BOOL to bool.
* fhandler_console.cc (fhandler_console::need_invisible): Cosmetic change.
* winsup.h (init_console_handler): Reflect argument type change.
* wincap.h (supports_setconsolectrlhandler_null): Remove duplicate capability
throughout.
* wincap.cc: Ditto.

1 files changed, 5 insertions, 18 deletions

diff --git a/winsup/cygwin/wincap.cc b/winsup/cygwin/wincap.cc
index e1b09a05b..caef37873 100644
--- a/winsup/cygwin/wincap.cc
+++ b/winsup/cygwin/wincap.cc
@@ -66,7 +66,6 @@ static NO_COPY wincaps wincap_unknown = {
   has_disabled_user_tos_setting:false,
   has_fileid_dirinfo:false,
   has_exclusiveaddruse:false,
-  supports_setconsolectrlhandler_null:false
 };
 
 static NO_COPY wincaps wincap_95 = {
@@ -124,7 +123,6 @@ static NO_COPY wincaps wincap_95 = {
   has_disabled_user_tos_setting:false,
   has_fileid_dirinfo:false,
   has_exclusiveaddruse:false,
-  supports_setconsolectrlhandler_null:false
 };
 
 static NO_COPY wincaps wincap_95osr2 = {
@@ -182,7 +180,6 @@ static NO_COPY wincaps wincap_95osr2 = {
   has_disabled_user_tos_setting:false,
   has_fileid_dirinfo:false,
   has_exclusiveaddruse:false,
-  supports_setconsolectrlhandler_null:false
 };
 
 static NO_COPY wincaps wincap_98 = {
@@ -240,7 +237,6 @@ static NO_COPY wincaps wincap_98 = {
   has_disabled_user_tos_setting:false,
   has_fileid_dirinfo:false,
   has_exclusiveaddruse:false,
-  supports_setconsolectrlhandler_null:false
 };
 
 static NO_COPY wincaps wincap_98se = {
@@ -298,7 +294,6 @@ static NO_COPY wincaps wincap_98se = {
   has_disabled_user_tos_setting:false,
   has_fileid_dirinfo:false,
   has_exclusiveaddruse:false,
-  supports_setconsolectrlhandler_null:false
 };
 
 static NO_COPY wincaps wincap_me = {
@@ -356,7 +351,6 @@ static NO_COPY wincaps wincap_me = {
   has_disabled_user_tos_setting:false,
   has_fileid_dirinfo:false,
   has_exclusiveaddruse:false,
-  supports_setconsolectrlhandler_null:false
 };
 
 static NO_COPY wincaps wincap_nt3 = {
@@ -414,7 +408,6 @@ static NO_COPY wincaps wincap_nt3 = {
   has_disabled_user_tos_setting:false,
   has_fileid_dirinfo:false,
   has_exclusiveaddruse:false,
-  supports_setconsolectrlhandler_null:true
 };
 
 static NO_COPY wincaps wincap_nt4 = {
@@ -472,7 +465,6 @@ static NO_COPY wincaps wincap_nt4 = {
   has_disabled_user_tos_setting:false,
   has_fileid_dirinfo:false,
   has_exclusiveaddruse:false,
-  supports_setconsolectrlhandler_null:true
 };
 
 static NO_COPY wincaps wincap_nt4sp4 = {
@@ -529,8 +521,7 @@ static NO_COPY wincaps wincap_nt4sp4 = {
   has_working_virtual_lock:true,
   has_disabled_user_tos_setting:false,
   has_fileid_dirinfo:false,
-  has_exclusiveaddruse:true,
-  supports_setconsolectrlhandler_null:true
+  has_exclusiveaddruse:true
 };
 
 static NO_COPY wincaps wincap_2000 = {
@@ -587,8 +578,7 @@ static NO_COPY wincaps wincap_2000 = {
   has_working_virtual_lock:true,
   has_disabled_user_tos_setting:true,
   has_fileid_dirinfo:true,
-  has_exclusiveaddruse:true,
-  supports_setconsolectrlhandler_null:true
+  has_exclusiveaddruse:true
 };
 
 static NO_COPY wincaps wincap_xp = {
@@ -645,8 +635,7 @@ static NO_COPY wincaps wincap_xp = {
   has_working_virtual_lock:true,
   has_disabled_user_tos_setting:true,
   has_fileid_dirinfo:true,
-  has_exclusiveaddruse:true,
-  supports_setconsolectrlhandler_null:true
+  has_exclusiveaddruse:true
 };
 
 static NO_COPY wincaps wincap_2003 = {
@@ -703,8 +692,7 @@ static NO_COPY wincaps wincap_2003 = {
   has_working_virtual_lock:true,
   has_disabled_user_tos_setting:true,
   has_fileid_dirinfo:true,
-  has_exclusiveaddruse:true,
-  supports_setconsolectrlhandler_null:true
+  has_exclusiveaddruse:true
 };
 
 static NO_COPY wincaps wincap_vista = {
@@ -761,8 +749,7 @@ static NO_COPY wincaps wincap_vista = {
   has_working_virtual_lock:true,
   has_disabled_user_tos_setting:true,
   has_fileid_dirinfo:true,
-  has_exclusiveaddruse:true,
-  supports_setconsolectrlhandler_null:true
+  has_exclusiveaddruse:true
 };
 
 wincapc wincap __attribute__((section (".cygwin_dll_common"), shared));