Cygwin: pty: Disable FreeConsole() on close for non cygwin process.
- After commite1a0775dc0
, the problem reported in https://www.cygwin.com/ml/cygwin/2020-01/msg00093.html occurs. For Gnu scren and tmux, calling FreeConsole() on pty close is necessary. However, if FreeConsole() is called, cygwin setup with '-h' option does not work. Therefore, the commite1a0775dc0
delayed closing pty. This is the cause of the problem above. Now, instead of delaying pty close, FreeConsole() is not called if the process is non cygwin processes such as cygwin setup.
This commit is contained in:
committed by
Corinna Vinschen
parent
783eaa888f
commit
2f415d5efa
@@ -607,6 +607,8 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,
|
||||
attach_to_console = true;
|
||||
}
|
||||
ptys->fixup_after_attach (!iscygwin (), fd);
|
||||
if (mode == _P_OVERLAY)
|
||||
ptys->set_freeconsole_on_close (iscygwin ());
|
||||
}
|
||||
}
|
||||
else if (fh && fh->get_major () == DEV_CONS_MAJOR)
|
||||
@@ -809,6 +811,8 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,
|
||||
NtClose (old_winpid_hdl);
|
||||
real_path.get_wide_win32_path (myself->progname); // FIXME: race?
|
||||
sigproc_printf ("new process name %W", myself->progname);
|
||||
if (!iscygwin ())
|
||||
close_all_files ();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -907,8 +911,6 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,
|
||||
wait_for_myself ();
|
||||
}
|
||||
myself.exit (EXITCODE_NOSET);
|
||||
if (!iscygwin ())
|
||||
close_all_files ();
|
||||
break;
|
||||
case _P_WAIT:
|
||||
case _P_SYSTEM:
|
||||
|
Reference in New Issue
Block a user