Import of old SSLeay release: SSLeay 0.9.0b

[openssl.git] / crypto / des / read_pwd.c

diff --git a/crypto/des/read_pwd.c b/crypto/des/read_pwd.c
index 75d035cf9c08d8b9b17981818d04952c7640210f..99920f2f86df722bf18947de16e1993d86f381cb 100644 (file)
--- a/crypto/des/read_pwd.c
+++ b/crypto/des/read_pwd.c
@@ -1,5 +1,5 @@
 /* crypto/des/read_pwd.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -56,6 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
+/* #define SIGACTION */ /* Define this if you have sigaction() */
 #ifdef WIN16TTY
 #undef WIN16
 #undef _WINDOWS
@@ -164,10 +165,14 @@ static int noecho_fgets();
 #endif
 #endif
 
-#ifndef NOPROTO
-static void (*savsig[NX509_SIG])(int );
+#ifdef SIGACTION
+ static struct sigaction savsig[NX509_SIG];
 #else
-static void (*savsig[NX509_SIG])();
+# ifndef NOPROTO
+  static void (*savsig[NX509_SIG])(int );
+# else
+  static void (*savsig[NX509_SIG])();
+# endif
 #endif
 static jmp_buf save;
 
@@ -241,6 +246,13 @@ int verify;
                if (errno == ENOTTY)
                        is_a_tty=0;
                else
+#endif
+#ifdef EINVAL
+               /* Ariel Glenn ariel@columbia.edu reports that solaris
+                * can return EINVAL instead.  This should be ok */
+               if (errno == EINVAL)
+                       is_a_tty=0;
+               else
 #endif
                        return(-1);
                }
@@ -359,7 +371,21 @@ static void pushsig()
        int i;
 
        for (i=1; i<NX509_SIG; i++)
+               {
+#ifdef SIGUSR1
+               if (i == SIGUSR1)
+                       continue;
+#endif
+#ifdef SIGUSR2
+               if (i == SIGUSR2)
+                       continue;
+#endif
+#ifdef SIGACTION
+               sigaction(i,NULL,&savsig[i]);
+#else
                savsig[i]=signal(i,recsig);
+#endif
+               }
 
 #ifdef SIGWINCH
        signal(SIGWINCH,SIG_DFL);
@@ -371,7 +397,21 @@ static void popsig()
        int i;
 
        for (i=1; i<NX509_SIG; i++)
+               {
+#ifdef SIGUSR1
+               if (i == SIGUSR1)
+                       continue;
+#endif
+#ifdef SIGUSR2
+               if (i == SIGUSR2)
+                       continue;
+#endif
+#ifdef SIGACTION
+               sigaction(i,&savsig[i],NULL);
+#else
                signal(i,savsig[i]);
+#endif
+               }
        }
 
 static void recsig(i)