JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

with this, we don't need the special list of pre-known signal names

Browse Source 
any more either, and can make use of code sharing between detection
of sys_siglist and sys_signame (and the underscored variants); nuke
the now-useless signames.c file too (merge struct into histrap.c)
This commit is contained in:
tg
2007-06-05 21:47:49 +00:00
parent 5835e7d3aa
commit 91431e4cf6
4 changed files with 40 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
histrap.c
View File

@@ -3,7 +3,7 @@
#include "sh.h"
__RCSID("$MirOS: src/bin/mksh/histrap.c,v 1.47 2007/06/04 21:33:28 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/histrap.c,v 1.48 2007/06/05 21:47:48 tg Exp $");
Trap sigtraps[NSIG + 1];
static struct sigaction Sigact_ign, Sigact_trap;
@@ -949,11 +949,14 @@ sprinkle(int fd)
}
#endif
#if HAVE_SYS_SIGNAME
#elif HAVE__SYS_SIGNAME
#define sys_signame _sys_signame
#else
#include "signames.c"
#if !HAVE_SYS_SIGNAME
static const struct mksh_sigpair {
int nr;
const char *const name;
} mksh_sigpairs[] = {
#include "signames.inc"
{ 0, NULL }
};
#endif
void
@@ -969,7 +972,7 @@ inittraps(void)
sigtraps[i].name = "ERR";
sigtraps[i].mess = "Error handler";
} else {
#if HAVE_SYS_SIGNAME || HAVE__SYS_SIGNAME
#if HAVE_SYS_SIGNAME
cs = sys_signame[i];
#else
const struct mksh_sigpair *pair = mksh_sigpairs;