Do not print first digits of IRQ number if whole number doesn't fit.

This commit is contained in:
Alexander Motin 2010-06-18 18:18:03 +00:00
parent 8aa8e94d34
commit cb9c9783b4
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=209312

View File

@ -254,24 +254,23 @@ initkre(void)
cp1++;
if (cp1 != cp && *cp1 == ':' &&
*(cp1 + 1) == ' ') {
sz = strlen(cp);
*cp1 = '\0';
cp1 = cp1 + 2;
cp2 = strdup(cp);
bcopy(cp1, cp, strlen(cp1) + 1);
strcat(cp, " ");
strcat(cp, cp2);
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) {
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;
}