From owner-svn-src-all@FreeBSD.ORG  Mon Jul 19 02:26:59 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E5E42106566B;
	Mon, 19 Jul 2010 02:26:59 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D5DB98FC16;
	Mon, 19 Jul 2010 02:26:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6J2Qxgt031799;
	Mon, 19 Jul 2010 02:26:59 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6J2QxLE031798;
	Mon, 19 Jul 2010 02:26:59 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201007190226.o6J2QxLE031798@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 19 Jul 2010 02:26:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r210228 - head/usr.bin/systat
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Jul 2010 02:27:00 -0000

Author: mav
Date: Mon Jul 19 02:26:59 2010
New Revision: 210228
URL: http://svn.freebsd.org/changeset/base/210228

Log:
  Partially revert r209312, restoring ability to fit "stray irqX" names into
  into available 10 characters by dropping "irq" in the middle of string.

Modified:
  head/usr.bin/systat/vmstat.c

Modified: head/usr.bin/systat/vmstat.c
==============================================================================
--- head/usr.bin/systat/vmstat.c	Sun Jul 18 22:35:46 2010	(r210227)
+++ head/usr.bin/systat/vmstat.c	Mon Jul 19 02:26:59 2010	(r210228)
@@ -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;
 		}