From owner-svn-src-head@FreeBSD.ORG  Wed Mar  7 18:46:21 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 9600510656EE;
	Wed,  7 Mar 2012 18:46:21 +0000 (UTC)
	(envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8608F8FC12;
	Wed,  7 Mar 2012 18:46:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q27IkLh9005864;
	Wed, 7 Mar 2012 18:46:21 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q27IkL9I005862;
	Wed, 7 Mar 2012 18:46:21 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201203071846.q27IkL9I005862@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 7 Mar 2012 18:46:21 +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: r232666 - head/usr.sbin/crashinfo
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Mar 2012 18:46:21 -0000

Author: emaste
Date: Wed Mar  7 18:46:21 2012
New Revision: 232666
URL: http://svn.freebsd.org/changeset/base/232666

Log:
  Improve multi-line kernel ident parsing
  
  Instead of blindly grabbing the line with 'Version string' and the
  following one from the core info file, take all lines after 'Version
  string' until the one one that matches the field format in the core info
  file.  This provides compatibility with VendorBSD modifications that have
  a different kernel ident format.
  
  Reviewed by:	jhb

Modified:
  head/usr.sbin/crashinfo/crashinfo.sh

Modified: head/usr.sbin/crashinfo/crashinfo.sh
==============================================================================
--- head/usr.sbin/crashinfo/crashinfo.sh	Wed Mar  7 18:33:11 2012	(r232665)
+++ head/usr.sbin/crashinfo/crashinfo.sh	Wed Mar  7 18:46:21 2012	(r232666)
@@ -45,10 +45,11 @@ find_kernel()
 		nextline=1
 		next
 	}
-	// {
-		if (nextline) {
-			print
+	nextline==1 {
+		if ($0 ~ "^  [A-Za-z ]+: ") {
 			nextline=0
+		} else {
+			print
 		}
 	}' $INFO)