zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Protect against strange values of SIGRTMIN and SIGRTMAX, 

and change alignment of numbers.
This commit is contained in:
Hisham 2016-09-16 13:37:07 -03:00
parent 46d8f2eef2
commit 5df425867c
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
SignalsPanel.c
View File

@ -40,26 +40,17 @@ Panel* SignalsPanel_new() {
} }
} }
#if (defined(SIGRTMIN) && defined(SIGRTMAX)) #if (defined(SIGRTMIN) && defined(SIGRTMAX))
// Real-time signals. if (SIGRTMAX - SIGRTMIN <= 100) {
// SIGRTMIN and SIGRTMAX expand to libc internal functions and we have to static char buf[15];
// grab their numbers at runtime. for (int sig = SIGRTMIN; sig <= SIGRTMAX; i++, sig++) {
static char buf[15]; // 15 == sizeof("xx SIGRTMIN+nn")
int rtmax;
for (int sig = SIGRTMIN; sig <= (rtmax = SIGRTMAX); i++, sig++) {
// Every signal between SIGRTMIN and SIGRTMAX are denoted in "SIGRTMIN+n"
// notation. This matches glibc's strsignal(3) behavior.
// We deviate from behaviors of Bash, ksh and Solaris intentionally.
if (sig == rtmax) {
snprintf(buf, 15, "%2d SIGRTMAX", sig);
} else {
int n = sig - SIGRTMIN; int n = sig - SIGRTMIN;
snprintf(buf, 15, "%2d SIGRTMIN%+d", sig, n); snprintf(buf, 15, "%2d SIGRTMIN%-+3d", sig, n);
if (n == 0) { if (n == 0) {
buf[11] = '\0'; buf[11] = '\0';
} }
}
Panel_set(this, i, (Object*) ListItem_new(buf, sig)); Panel_set(this, i, (Object*) ListItem_new(buf, sig));
} }
}
#endif #endif
Panel_setHeader(this, "Send signal:"); Panel_setHeader(this, "Send signal:");
Panel_setSelected(this, defaultPosition); Panel_setSelected(this, defaultPosition);