Mercurial > hg > early-roguelike
changeset 162:600873555ec0
Don't swap signal handlers in md_shellescape().
md_shellescape() sets SIGINT and SIGQUIT to be ignored, storing the
previous handlers, and restores them after the shell exits. But it
mixed up the two handlers.
Since the signals were usually handled by the same function, this fix
doesn't have much effect, but anything that makes signal code less
confusing is a good thing.
| author | John "Elwin" Edwards |
|---|---|
| date | Mon, 08 Jun 2015 10:01:25 -0400 |
| parents | 78ca6502d2a6 |
| children | 89deb1197a2d |
| files | arogue5/mdport.c arogue7/mdport.c rogue3/mdport.c rogue4/mdport.c rogue5/mdport.c srogue/mdport.c |
| diffstat | 6 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/arogue5/mdport.c Fri Jun 05 18:02:17 2015 -0400 +++ b/arogue5/mdport.c Mon Jun 08 10:01:25 2015 -0400 @@ -403,9 +403,9 @@ while (wait(&ret_status) != pid) continue; - signal(SIGINT, myquit); + signal(SIGINT, myend); #ifdef SIGQUIT - signal(SIGQUIT, myend); + signal(SIGQUIT, myquit); #endif }
--- a/arogue7/mdport.c Fri Jun 05 18:02:17 2015 -0400 +++ b/arogue7/mdport.c Mon Jun 08 10:01:25 2015 -0400 @@ -385,9 +385,9 @@ while (wait(&ret_status) != pid) continue; - signal(SIGINT, myquit); + signal(SIGINT, myend); #ifdef SIGQUIT - signal(SIGQUIT, myend); + signal(SIGQUIT, myquit); #endif }
--- a/rogue3/mdport.c Fri Jun 05 18:02:17 2015 -0400 +++ b/rogue3/mdport.c Mon Jun 08 10:01:25 2015 -0400 @@ -596,9 +596,9 @@ while (wait(&ret_status) != pid) continue; - signal(SIGINT, myquit); + signal(SIGINT, myend); #ifdef SIGQUIT - signal(SIGQUIT, myend); + signal(SIGQUIT, myquit); #endif } return(ret_status);
--- a/rogue4/mdport.c Fri Jun 05 18:02:17 2015 -0400 +++ b/rogue4/mdport.c Mon Jun 08 10:01:25 2015 -0400 @@ -432,9 +432,9 @@ while (wait(&ret_status) != pid) continue; - signal(SIGINT, myquit); + signal(SIGINT, myend); #ifdef SIGQUIT - signal(SIGQUIT, myend); + signal(SIGQUIT, myquit); #endif }
--- a/rogue5/mdport.c Fri Jun 05 18:02:17 2015 -0400 +++ b/rogue5/mdport.c Mon Jun 08 10:01:25 2015 -0400 @@ -598,9 +598,9 @@ while (wait(&ret_status) != pid) continue; - signal(SIGINT, myquit); + signal(SIGINT, myend); #ifdef SIGQUIT - signal(SIGQUIT, myend); + signal(SIGQUIT, myquit); #endif } return(ret_status);
--- a/srogue/mdport.c Fri Jun 05 18:02:17 2015 -0400 +++ b/srogue/mdport.c Mon Jun 08 10:01:25 2015 -0400 @@ -610,9 +610,9 @@ while (wait(&ret_status) != pid) continue; - signal(SIGINT, myquit); + signal(SIGINT, myend); #ifdef SIGQUIT - signal(SIGQUIT, myend); + signal(SIGQUIT, myquit); #endif } return(ret_status);