#include <signal.h>
#include <stdio.h>
#include <string.h>
-#include <setjmp.h>
#include <errno.h>
#ifdef OPENSSL_SYS_VMS /* prototypes for sys$whatever */
# define SGTTY
#endif
+#if defined(OPENSSL_SYS_VSWORKS)
+#undef TERMIOS
+#undef TERMIO
+#undef SGTTY
+#endif
+
#ifdef TERMIOS
# include <termios.h>
# define TTY_STRUCT struct termios
#else
static void (*savsig[NX509_SIG])(int );
#endif
-static jmp_buf save;
#ifdef OPENSSL_SYS_VMS
static struct IOSB iosb;
static long status;
static unsigned short channel = 0;
#else
-#ifndef OPENSSL_SYS_MSDOS
+#if !defined(OPENSSL_SYS_MSDOS) || defined(__DJGPP__)
static TTY_STRUCT tty_orig,tty_new;
#endif
#endif
} while (strchr(buf,'\n') == NULL);
}
+static sig_atomic_t intr_signal;
+
static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl)
{
static int ps;
char *p;
#ifndef OPENSSL_SYS_WIN16
- if ((ok = setjmp(save)))
- {
- if (ok == 1) ok=0;
- goto error;
- }
+ intr_signal=0;
ok=0;
ps=0;
pushsig();
ps=1;
- if (!echo) noecho_console(ui);
+ if (!echo && !noecho_console(ui))
+ goto error;
ps=2;
result[0]='\0';
#ifdef OPENSSL_SYS_MSDOS
if (!echo)
+ {
noecho_fgets(result,maxsize,tty_in);
+ p=result; /* FIXME: noecho_fgets doesn't return errors */
+ }
else
- fgets(result,maxsize,tty_in);
+ p=fgets(result,maxsize,tty_in);
#else
- fgets(result,maxsize,tty_in);
+ p=fgets(result,maxsize,tty_in);
#endif
+ if(!p)
+ goto error;
if (feof(tty_in)) goto error;
if (ferror(tty_in)) goto error;
if ((p=(char *)strchr(result,'\n')) != NULL)
ok=1;
error:
+ if (intr_signal == SIGINT)
+ ok=-1;
if (!echo) fprintf(tty_out,"\n");
- if (ps >= 2 && !echo)
- echo_console(ui);
+ if (ps >= 2 && !echo && !echo_console(ui))
+ ok=0;
if (ps >= 1)
popsig();
CRYPTO_w_lock(CRYPTO_LOCK_UI);
is_a_tty = 1;
-#if defined(OPENSSL_SYS_MACINTOSH_CLASSIC)
+#if defined(OPENSSL_SYS_MACINTOSH_CLASSIC) || defined(OPENSSL_SYS_VSWORKS)
tty_in=stdin;
tty_out=stderr;
#else
tty_out=stderr;
#endif
-#if defined(TTY_get) && !defined(VMS)
+#if defined(TTY_get) && !defined(OPENSSL_SYS_VMS)
if (TTY_get(fileno(tty_in),&tty_orig) == -1)
{
#ifdef ENOTTY
static void recsig(int i)
{
- switch(i)
- {
- case SIGINT:
- longjmp(save,-1);
- break;
- default:
- break;
- }
- longjmp(save,1);
+ intr_signal=i;
}
-
/* Internal functions specific for Windows */
#if defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_WIN16)
static int noecho_fgets(char *buf, int size, FILE *tty)