nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

hangup() cleanup; SIGXCPU handling

Browse Source
This commit is contained in:
nethack.rankin
2007-01-09 05:29:17 +00:00
parent 1c20fe6223
commit f2d8a53718
7 changed files with 60 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
sys/unix/unixmain.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)unixmain.c 3.5 2006/04/01 */
/* SCCS Id: @(#)unixmain.c 3.5 2007/01/08 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -157,29 +157,7 @@ char *argv[];
* It seems you really want to play.
*/
u.uhp = 1; /* prevent RIP on early quits */
#ifdef SA_RESTART
/* don't want reads to restart. If SA_RESTART is defined, we know
* sigaction exists and can be used to ensure reads won't restart.
* If it's not defined, assume reads do not restart. If reads restart
* and a signal occurs, the game won't do anything until the read
* succeeds (or the stream returns EOF, which might not happen if
* reading from, say, a window manager). */
{
struct sigaction sact;
(void) memset((char*) &sact, 0, sizeof(struct sigaction));
sact.sa_handler = (SIG_RET_TYPE)hangup;
(void) sigaction(SIGHUP, &sact, (struct sigaction*)0);
#ifdef SIGXCPU
(void) sigaction(SIGXCPU, &sact, (struct sigaction*)0);
#endif
}
#else
(void) signal(SIGHUP, (SIG_RET_TYPE) hangup);
#ifdef SIGXCPU
(void) signal(SIGXCPU, (SIG_RET_TYPE) hangup);
#endif
#endif
sethanguphandler((SIG_RET_TYPE)hangup);
process_options(argc, argv); /* command line options */
init_nhwindows(&argc, argv); /* now we can set up window system */
@@ -519,6 +497,33 @@ whoami() {
return TRUE;
}
void
sethanguphandler(handler)
void FDECL((*handler), (int));
{
#ifdef SA_RESTART
/* don't want reads to restart. If SA_RESTART is defined, we know
* sigaction exists and can be used to ensure reads won't restart.
* If it's not defined, assume reads do not restart. If reads restart
* and a signal occurs, the game won't do anything until the read
* succeeds (or the stream returns EOF, which might not happen if
* reading from, say, a window manager). */
struct sigaction sact;
(void) memset((genericptr_t)&sact, 0, sizeof sact);
sact.sa_handler = (SIG_RET_TYPE)handler;
(void) sigaction(SIGHUP, &sact, (struct sigaction *)0);
# ifdef SIGXCPU
(void) sigaction(SIGXCPU, &sact, (struct sigaction *)0);
# endif
#else /* !SA_RESTART */
(void) signal(SIGHUP, (SIG_RET_TYPE)handler);
# ifdef SIGXCPU
(void) signal(SIGXCPU, (SIG_RET_TYPE)handler);
# endif
#endif /* ?SA_RESTART */
}
#ifdef PORT_HELP
void
port_help()

13
sys/vms/vmsmain.c
View File

@@ -122,7 +122,7 @@ char *argv[];
/* used to clear hangup stuff while still giving standard traceback */
VAXC$ESTABLISH(vms_handler);
#endif
(void) signal(SIGHUP, (SIG_RET_TYPE) hangup);
sethanguphandler(hangup);
process_options(argc, argv); /* command line options */
@@ -389,8 +389,8 @@ byebye()
extern unsigned long FDECL(sys$delprc,(unsigned long *,const genericptr_t));
/* clean up any subprocess we've spawned that may still be hanging around */
if (dosh_pid) (void) sys$delprc(&dosh_pid, 0), dosh_pid = 0;
if (mail_pid) (void) sys$delprc(&mail_pid, 0), mail_pid = 0;
if (dosh_pid) (void) sys$delprc(&dosh_pid, (genericptr_t)0), dosh_pid = 0;
if (mail_pid) (void) sys$delprc(&mail_pid, (genericptr_t)0), mail_pid = 0;
#endif
/* SIGHUP doesn't seem to do anything on VMS, so we fudge it here... */
@@ -429,6 +429,13 @@ genericptr_t sigargs, mechargs; /* [0] is argc, [1..argc] are the real args */
}
#endif
void
sethanguphandler(handler)
void FDECL((*handler), (int));
{
(void)signal(SIGHUP, (SIG_RET_TYPE)handler);
}
#ifdef PORT_HELP
void
port_help()

7
sys/vms/vmstty.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)vmstty.c 3.5 2005/11/19 */
/* SCCS Id: @(#)vmstty.c 3.5 2007/01/08 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
/* tty.c - (VMS) version */
@@ -478,14 +478,15 @@ void
error VA_DECL(const char *,s)
VA_START(s);
VA_INIT(s, const char *);
if(settty_needed)
if (settty_needed)
settty((char *)0);
Vprintf(s,VA_ARGS);
(void) putchar('\n');
VA_END();
#ifndef SAVE_ON_FATAL_ERROR
/* prevent vmsmain's exit handler byebye() from calling hangup() */
(void)signal(SIGHUP, SIG_DFL);
sethanguphandler((void FDECL((*),(int)))SIG_DFL);
#endif
exit(EXIT_FAILURE);
}