* dcrt0.cc (dll_crt0_0): Don't bother with setting init_console_handler here
since it will be set later when we discover if we have a ctty or not. * exceptions.cc (init_console_handler): Properly remove NULL handler.
This commit is contained in:
		@@ -1,3 +1,10 @@
 | 
			
		||||
2006-03-19  Christopher Faylor  <cgf@timesys.com>
 | 
			
		||||
 | 
			
		||||
	* dcrt0.cc (dll_crt0_0): Don't bother with setting init_console_handler
 | 
			
		||||
	here since it will be set later when we discover if we have a ctty or
 | 
			
		||||
	not.
 | 
			
		||||
	* exceptions.cc (init_console_handler): Properly remove NULL handler.
 | 
			
		||||
 | 
			
		||||
2006-03-18  Christopher Faylor  <cgf@timesys.com>
 | 
			
		||||
 | 
			
		||||
	* pinfo.h (EXITCODE_OK): Define new constant.
 | 
			
		||||
 
 | 
			
		||||
@@ -707,10 +707,7 @@ dll_crt0_0 ()
 | 
			
		||||
 | 
			
		||||
  child_proc_info = get_cygwin_startup_info ();
 | 
			
		||||
  if (!child_proc_info)
 | 
			
		||||
    {
 | 
			
		||||
      memory_init ();
 | 
			
		||||
      init_console_handler (!!GetConsoleCP ());
 | 
			
		||||
    }
 | 
			
		||||
    memory_init ();
 | 
			
		||||
  else
 | 
			
		||||
    {
 | 
			
		||||
      cygwin_user_h = child_proc_info->user_h;
 | 
			
		||||
 
 | 
			
		||||
@@ -104,8 +104,9 @@ init_console_handler (bool install_handler)
 | 
			
		||||
{
 | 
			
		||||
  BOOL res;
 | 
			
		||||
 | 
			
		||||
  while (SetConsoleCtrlHandler (ctrl_c_handler, FALSE))
 | 
			
		||||
    continue;
 | 
			
		||||
   SetConsoleCtrlHandler (ctrl_c_handler, FALSE);
 | 
			
		||||
   if (wincap.has_null_console_handler_routine ())
 | 
			
		||||
     SetConsoleCtrlHandler (NULL, FALSE);
 | 
			
		||||
  if (install_handler)
 | 
			
		||||
    res = SetConsoleCtrlHandler (ctrl_c_handler, TRUE);
 | 
			
		||||
  else if (wincap.has_null_console_handler_routine ())
 | 
			
		||||
@@ -114,7 +115,6 @@ init_console_handler (bool install_handler)
 | 
			
		||||
    res = SetConsoleCtrlHandler (dummy_ctrl_c_handler, TRUE);
 | 
			
		||||
  if (!res)
 | 
			
		||||
    system_printf ("SetConsoleCtrlHandler failed, %E");
 | 
			
		||||
  return;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
extern "C" void
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user