Skip to content

Commit

Permalink
Conditionalize use of SIGRTMIN in psiginfo.
Browse files Browse the repository at this point in the history
  • Loading branch information
Samuel Thibault authored and Roland McGrath committed Feb 16, 2011
1 parent c1d0e63 commit f75286c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
6 changes: 6 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
2011-02-16 Samuel Thibault <samuel.thibault@ens-lyon.org>

* stdio-common/psiginfo.c (psiginfo): Check pinfo->si_signo against
SIGRTMIN and SIGRTMAX and print information in that case only when
SIGRTMIN is defined.

2011-02-11 Jakub Jelinek <jakub@redhat.com>

* stdio-common/printf-parsemb.c (__parse_one_specmb): Handle
Expand Down
7 changes: 6 additions & 1 deletion stdio-common/psiginfo.c
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,12 @@ psiginfo (const siginfo_t *pinfo, const char *s)
const char *desc;
if (pinfo->si_signo >= 0 && pinfo->si_signo < NSIG
&& ((desc = INTUSE(_sys_siglist)[pinfo->si_signo]) != NULL
|| (pinfo->si_signo >= SIGRTMIN && pinfo->si_signo < SIGRTMAX)))
#ifdef SIGRTMIN
|| (pinfo->si_signo >= SIGRTMIN && pinfo->si_signo < SIGRTMAX)
#endif
))
{
#ifdef SIGRTMIN
if (desc == NULL)
{
if (pinfo->si_signo - SIGRTMIN < SIGRTMAX - pinfo->si_signo)
Expand All @@ -106,6 +110,7 @@ psiginfo (const siginfo_t *pinfo, const char *s)
}
}
else
#endif
fprintf (fp, "%s (", _(desc));

const char *base = NULL;
Expand Down

0 comments on commit f75286c

Please sign in to comment.