Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-01-18 07:31:34 +00:00
Code Issues Projects Releases Wiki Activity

remove alarm() calls which were functioning as a primitive

Browse Source 
watchdog function, presumably to catch infinite loop bugs. 
(control-C can do the same thing, and the alarms were too short in
any case.)  also, switch to sigsetjmp/siglongjmp in order to allow
repeated use of control-C -- otherwise it works once, then not again.
This commit is contained in:
Paul Fox 2008-03-17 15:28:07 +00:00
parent fb274df079
commit 2724fa9d8a
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
editors/vi.c
View File

@ -201,7 +201,7 @@ struct globals {
#endif #endif
/* a few references only */ /* a few references only */
#if ENABLE_FEATURE_VI_USE_SIGNALS #if ENABLE_FEATURE_VI_USE_SIGNALS
jmp_buf restart; // catch_sig() sigjmp_buf restart; // catch_sig()
#endif #endif
struct termios term_orig, term_vi; // remember what the cooked mode was struct termios term_orig, term_vi; // remember what the cooked mode was
#if ENABLE_FEATURE_VI_COLON #if ENABLE_FEATURE_VI_COLON
@ -516,7 +516,7 @@ static void edit_file(char *fn)
catch_sig(0); catch_sig(0);
signal(SIGWINCH, winch_sig); signal(SIGWINCH, winch_sig);
signal(SIGTSTP, suspend_sig); signal(SIGTSTP, suspend_sig);
sig = setjmp(restart); sig = sigsetjmp(restart, 1);
if (sig != 0) { if (sig != 0) {
screenbegin = dot = text; screenbegin = dot = text;
} }
@ -799,7 +799,6 @@ static void colon(char *buf)
else if (strncmp(cmd, "!", 1) == 0) { // run a cmd else if (strncmp(cmd, "!", 1) == 0) { // run a cmd
int retcode; int retcode;
// :!ls run the <cmd> // :!ls run the <cmd>
alarm(0); // wait for input- no alarms
place_cursor(rows - 1, 0, FALSE); // go to Status line place_cursor(rows - 1, 0, FALSE); // go to Status line
clear_to_eol(); // clear the line clear_to_eol(); // clear the line
cookmode(); cookmode();
@ -808,7 +807,6 @@ static void colon(char *buf)
printf("\nshell returned %i\n\n", retcode); printf("\nshell returned %i\n\n", retcode);
rawmode(); rawmode();
Hit_Return(); // let user see results Hit_Return(); // let user see results
alarm(3); // done waiting for input
} }
#endif #endif
else if (strncmp(cmd, "=", i) == 0) { // where is the address else if (strncmp(cmd, "=", i) == 0) { // where is the address
@ -2153,7 +2151,7 @@ static void catch_sig(int sig)
{ {
signal(SIGINT, catch_sig); signal(SIGINT, catch_sig);
if (sig) if (sig)
longjmp(restart, sig); siglongjmp(restart, sig);
} }
#endif /* FEATURE_VI_USE_SIGNALS */ #endif /* FEATURE_VI_USE_SIGNALS */
@ -2217,7 +2215,6 @@ static char readit(void) // read (maybe cursor) key from stdin
}; };
enum { ESCCMDS_COUNT = ARRAY_SIZE(esccmds) }; enum { ESCCMDS_COUNT = ARRAY_SIZE(esccmds) };
alarm(0); // turn alarm OFF while we wait for input
fflush(stdout); fflush(stdout);
n = chars_to_parse; n = chars_to_parse;
// get input from User- are there already input chars in Q? // get input from User- are there already input chars in Q?
@ -2273,7 +2270,6 @@ static char readit(void) // read (maybe cursor) key from stdin
// remove key sequence from Q // remove key sequence from Q
chars_to_parse -= n; chars_to_parse -= n;
memmove(readbuffer, readbuffer + n, sizeof(readbuffer) - n); memmove(readbuffer, readbuffer + n, sizeof(readbuffer) - n);
alarm(3); // we are done waiting for input, turn alarm ON
return c; return c;
} }
@ -3054,14 +3050,6 @@ static void do_cmd(char c)
case VI_K_PAGEUP: // Cursor Key Page Up case VI_K_PAGEUP: // Cursor Key Page Up
dot_scroll(rows - 2, -1); dot_scroll(rows - 2, -1);
break; break;
#if ENABLE_FEATURE_VI_USE_SIGNALS
case 0x03: // ctrl-C interrupt
longjmp(restart, 1);
break;
case 26: // ctrl-Z suspend
suspend_sig(SIGTSTP);
break;
#endif
case 4: // ctrl-D scroll down half screen case 4: // ctrl-D scroll down half screen
dot_scroll((rows - 2) / 2, 1); dot_scroll((rows - 2) / 2, 1);
break; break;
@ -4037,7 +4025,6 @@ static void crash_test()
} }
if (msg[0]) { if (msg[0]) {
alarm(0);
printf("\n\n%d: \'%c\' %s\n\n\n%s[Hit return to continue]%s", printf("\n\n%d: \'%c\' %s\n\n\n%s[Hit return to continue]%s",
totalcmds, last_input_char, msg, SOs, SOn); totalcmds, last_input_char, msg, SOs, SOn);
fflush(stdout); fflush(stdout);
@ -4045,7 +4032,6 @@ static void crash_test()
if (d[0] == '\n' || d[0] == '\r') if (d[0] == '\n' || d[0] == '\r')
break; break;
} }
alarm(3);
} }
tim = time(NULL); tim = time(NULL);
if (tim >= (oldtim + 3)) { if (tim >= (oldtim + 3)) {