Update from HEAD

[oweals/openssl.git] / crypto / ui / ui_openssl.c

diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c
index fad17024a03e09c84800ddffc8bdb28a02f593dd..ef930bf2476e9c4fae856697750709add1241933 100644 (file)
--- a/crypto/ui/ui_openssl.c
+++ b/crypto/ui/ui_openssl.c
@@ -117,10 +117,14 @@
 
 #include <openssl/e_os2.h>
 
+/* need for #define _POSIX_C_SOURCE arises whenever you pass -ansi to gcc
+ * [maybe others?], because it masks interfaces not discussed in standard,
+ * sigaction and fileno included. -pedantic would be more appropriate for
+ * the intended purposes, but we can't prevent users from adding -ansi.
+ */
 #define _POSIX_C_SOURCE 1
 #include <signal.h>
 #include <stdio.h>
-#undef _POSIX_C_SOURCE
 #include <string.h>
 #include <errno.h>
 
@@ -574,7 +578,9 @@ static int close_console(UI *ui)
 /* Internal functions to handle signals and act on them */
 static void pushsig(void)
        {
+#ifndef OPENSSL_SYS_WIN32
        int i;
+#endif
 #ifdef SIGACTION
        struct sigaction sa;
 
@@ -582,6 +588,14 @@ static void pushsig(void)
        sa.sa_handler=recsig;
 #endif
 
+#ifdef OPENSSL_SYS_WIN32
+       savsig[SIGABRT]=signal(SIGABRT,recsig);
+       savsig[SIGFPE]=signal(SIGFPE,recsig);
+       savsig[SIGILL]=signal(SIGILL,recsig);
+       savsig[SIGINT]=signal(SIGINT,recsig);
+       savsig[SIGSEGV]=signal(SIGSEGV,recsig);
+       savsig[SIGTERM]=signal(SIGTERM,recsig);
+#else
        for (i=1; i<NX509_SIG; i++)
                {
 #ifdef SIGUSR1
@@ -602,6 +616,7 @@ static void pushsig(void)
                savsig[i]=signal(i,recsig);
 #endif
                }
+#endif
 
 #ifdef SIGWINCH
        signal(SIGWINCH,SIG_DFL);
@@ -610,8 +625,15 @@ static void pushsig(void)
 
 static void popsig(void)
        {
+#ifdef OPENSSL_SYS_WIN32
+       signal(SIGABRT,savsig[SIGABRT]);
+       signal(SIGFPE,savsig[SIGFPE]);
+       signal(SIGILL,savsig[SIGILL]);
+       signal(SIGINT,savsig[SIGINT]);
+       signal(SIGSEGV,savsig[SIGSEGV]);
+       signal(SIGTERM,savsig[SIGTERM]);
+#else
        int i;
-
        for (i=1; i<NX509_SIG; i++)
                {
 #ifdef SIGUSR1
@@ -628,6 +650,7 @@ static void popsig(void)
                signal(i,savsig[i]);
 #endif
                }
+#endif
        }
 
 static void recsig(int i)
@@ -654,6 +677,8 @@ static int noecho_fgets(char *buf, int size, FILE *tty)
                size--;
 #ifdef WIN16TTY
                i=_inchar();
+#elif defined(_WIN32)
+               i=_getch();
 #else
                i=getch();
 #endif