mingw: make mingw_signal return the correct handler

Returning the SIGALRM handler for SIGINT is not very useful.

Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/compat/mingw.c b/compat/mingw.c
index b67362558046f354b167fe185369b3d2b98879c1..dae30a081c03b28aa7b89489ffd01b6ce24e8070 100644 (file)
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1677,14 +1677,16 @@ int sigaction(int sig, struct sigaction *in, struct sigaction *out)
 #undef signal
 sig_handler_t mingw_signal(int sig, sig_handler_t handler)
 {
 #undef signal
 sig_handler_t mingw_signal(int sig, sig_handler_t handler)
 {

-       sig_handler_t old = timer_fn;
+       sig_handler_t old;

 
        switch (sig) {
        case SIGALRM:
 
        switch (sig) {
        case SIGALRM:

+               old = timer_fn;

                timer_fn = handler;
                break;
 
        case SIGINT:
                timer_fn = handler;
                break;
 
        case SIGINT:

+               old = sigint_fn;

                sigint_fn = handler;
                break;
 
                sigint_fn = handler;
                break;