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

First batch of changes from FailSafeC

Browse Source 
This is all tiny stuff - allow overriding WIDENED_PROTOTYPES from the hints
file, missing NO_SIGNAL conditionals, remove a GCC-ism, conditional indentation,
void return in a non-void function.
This commit is contained in:
keni
2010-02-10 16:08:51 +00:00
parent 0c0d68a631
commit cbd2a516e1
7 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/end.c
View File

@@ -228,13 +228,14 @@ NH_panictrace_gdb(){
char *gdbpath = GDBPATH;
char *greppath = GREPPATH;
char buf[BUFSZ];
FILE *gdb;
if(gdbpath == NULL || gdbpath[0] == 0) return FALSE;
if(greppath == NULL || greppath[0] == 0) return FALSE;
sprintf(buf, "%s -n -q %s %d 2>&1 | %s '^#'",
gdbpath, ARGV0, getpid(), greppath);
FILE *gdb = popen(buf, "w");
gdb = popen(buf, "w");
if(gdb){
raw_print("Generating more information you may report:\n");
fprintf(gdb, "bt\nquit\ny");
@@ -327,7 +328,9 @@ done2()
# endif
# endif
if ((c = ynq(tmp)) == 'y') {
# ifndef NO_SIGNAL
(void) signal(SIGINT, (SIG_RET_TYPE) done1);
# endif
exit_nhwindows((char *)0);
NH_abort();
} else if (c == 'q') done_stopprint++;

14
src/files.c
View File

@@ -1281,13 +1281,23 @@ boolean uncomp;
uncomp ? "un" : "", filename);
return;
}
# ifndef NO_SIGNAL
(void) signal(SIGINT, SIG_IGN);
(void) signal(SIGQUIT, SIG_IGN);
(void) wait((int *)&i);
(void) signal(SIGINT, (SIG_RET_TYPE) done1);
# ifdef WIZARD
# ifdef WIZARD
if (wizard) (void) signal(SIGQUIT, SIG_DFL);
# endif
# endif
#else
/* I don't think we can really cope with external compression
* without signals, so we'll declare that compress failed and
* go on. (We could do a better job by forcing off external
* compression if there are no signals, but we want this for
* testing with FailSafeC
*/
i = 1;
#endif
if (i == 0) {
/* (un)compress succeeded: remove file left behind */
if (uncomp)