projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert to the use of siglongjmp()
[mmh]
/
sbr
/
getans.c
diff --git
a/sbr/getans.c
b/sbr/getans.c
index
173e1b4
..
682a3b1
100644
(file)
--- a/
sbr/getans.c
+++ b/
sbr/getans.c
@@
-9,11
+9,11
@@
#include <h/mh.h>
#include <h/signals.h>
#include <h/mh.h>
#include <h/signals.h>
-#include <setjmp.h>
+#include <h/m_setjmp.h>
#include <signal.h>
static char ansbuf[BUFSIZ];
#include <signal.h>
static char ansbuf[BUFSIZ];
-static jmp_buf sigenv;
+static sigjmp_buf sigenv;
/*
* static prototypes
/*
* static prototypes
@@
-28,10
+28,11
@@
getans (char *prompt, struct swit *ansp)
SIGNAL_HANDLER istat = NULL;
char *cp, **cpp;
SIGNAL_HANDLER istat = NULL;
char *cp, **cpp;
- if (!(setjmp (sigenv))) {
+ if (!(sigsetjmp(sigenv, 1))) {
istat = SIGNAL (SIGINT, intrser);
} else {
SIGNAL (SIGINT, istat);
istat = SIGNAL (SIGINT, intrser);
} else {
SIGNAL (SIGINT, istat);
+ printf("returning NULL\n");
return NULL;
}
return NULL;
}
@@
-40,8
+41,10
@@
getans (char *prompt, struct swit *ansp)
fflush (stdout);
cp = ansbuf;
while ((i = getchar ()) != '\n') {
fflush (stdout);
cp = ansbuf;
while ((i = getchar ()) != '\n') {
- if (i == EOF)
- longjmp (sigenv, 1);
+ if (i == EOF) {
+ printf("Got EOF\n");
+ siglongjmp (sigenv, 1);
+ }
if (cp < &ansbuf[sizeof ansbuf - 1])
*cp++ = i;
}
if (cp < &ansbuf[sizeof ansbuf - 1])
*cp++ = i;
}
@@
-75,5
+78,5
@@
intrser (int i)
/*
* should this be siglongjmp?
*/
/*
* should this be siglongjmp?
*/
- longjmp (sigenv, 1);
+ siglongjmp (sigenv, 1);
}
}