Skip to content

Commit c0dded0

Browse files
committed
runtime: do not explicitly exit on ctrl handler
The default ctrl+c handler should process exits in situations where it makes sense, like console apps, but not in situations where it doesn't, like libraries or services. Therefore, we should remove the exit(2) so that the default handler is used for this. This also uses the more proper windows exit code of STATUS_CONTROL_C_EXIT, with the base case handler installed by KernelBase.dll. In particular, this helps in the case of services, which previously would terminate when receiving shutdown signals, instead of passing them onward to the service program. In this CL, contrary to CL 244959, we do not need to special case services with expensive detection algorithms, or rely on hard-coded library/archive flags. Fixes #40167. Fixes #40074. Change-Id: I9bf6ed6f65cefeff754d270aa33fa4df8d0b451f Reviewed-on: https://go-review.googlesource.com/c/go/+/243597 Run-TryBot: Jason A. Donenfeld <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Alex Brainman <[email protected]> Reviewed-by: Jason A. Donenfeld <[email protected]>
1 parent 69d34e2 commit c0dded0

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

src/runtime/os_windows.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,11 +1010,6 @@ func ctrlhandler1(_type uint32) uint32 {
10101010
if sigsend(s) {
10111011
return 1
10121012
}
1013-
if !islibrary && !isarchive {
1014-
// Only exit the program if we don't have a DLL.
1015-
// See https://golang.org/issues/35965.
1016-
exit(2) // SIGINT, SIGTERM, etc
1017-
}
10181013
return 0
10191014
}
10201015

0 commit comments

Comments
 (0)