From 8746bf1201eb0309eab1fd868ec4a7c519029d51 Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Mon, 25 Oct 2004 14:02:00 +0000 Subject: [PATCH] (tgets): return whatever fgets returns git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14321 ec53bebd-3082-4978-b11e-865c3cabbd6b --- appl/popper/popper.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/appl/popper/popper.c b/appl/popper/popper.c index 14159872e..2cbf16ba3 100644 --- a/appl/popper/popper.c +++ b/appl/popper/popper.c @@ -36,17 +36,19 @@ ring(int sig) static char * tgets(char *str, int size, FILE *fp, int timeout) { - signal(SIGALRM, ring); - alarm(timeout); - if (setjmp(env)) { - alarm(0); - signal(SIGALRM,SIG_DFL); - return NULL; - } - fgets(str,size,fp); - alarm(0); - signal(SIGALRM,SIG_DFL); - return(str); + char *ret; + + signal(SIGALRM, ring); + alarm(timeout); + if (setjmp(env)) { + alarm(0); + signal(SIGALRM, SIG_DFL); + return NULL; + } + ret = fgets(str, size, fp); + alarm(0); + signal(SIGALRM, SIG_DFL); + return ret; } /*