d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Partially revert r209312, restoring ability to fit "stray irqX" names into

Browse Source 
into available 10 characters by dropping "irq" in the middle of string.
This commit is contained in:
Alexander Motin 2010-07-19 02:26:59 +00:00
parent 6ec1ef63d1
commit f91b7a2526
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
usr.bin/systat/vmstat.c
View File

@ -259,18 +259,22 @@ initkre(void)
cp1 = cp1 + 2;
cp2 = strdup(cp);
bcopy(cp1, cp, sz - (cp1 - cp) + 1);
/* If line is long - drop "irq",
if too long - drop "irqN". */
if (sz <= 10 + 1) {
strcat(cp, " ");
strcat(cp, cp2);
} else if (sz <= 10 + 4) {
if (sz <= 10 + 4) {
strcat(cp, " ");
strcat(cp, cp2 + 3);
}
free(cp2);
}
}
/*
* Convert "name irqN" to "name N" if the former is
* longer than the field width.
*/
if ((cp1 = strstr(cp, "irq")) != NULL &&
strlen(cp) > 10)
bcopy(cp1 + 3, cp1, strlen(cp1 + 3) + 1);
intrname[i] = cp;
cp = nextcp;
}