From owner-svn-src-head@freebsd.org  Fri Feb 14 18:50:04 2020
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 437E523DFB4;
 Fri, 14 Feb 2020 18:50:04 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 48K2W00wczz41vr;
 Fri, 14 Feb 2020 18:50:04 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1B0311A0;
 Fri, 14 Feb 2020 18:50:04 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01EIo3Kd099640;
 Fri, 14 Feb 2020 18:50:03 GMT (envelope-from kevans@FreeBSD.org)
Received: (from kevans@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01EIo311099639;
 Fri, 14 Feb 2020 18:50:03 GMT (envelope-from kevans@FreeBSD.org)
Message-Id: <202002141850.01EIo311099639@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kevans set sender to
 kevans@FreeBSD.org using -f
From: Kyle Evans <kevans@FreeBSD.org>
Date: Fri, 14 Feb 2020 18:50:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r357924 - head/usr.bin/dtc
X-SVN-Group: head
X-SVN-Commit-Author: kevans
X-SVN-Commit-Paths: head/usr.bin/dtc
X-SVN-Commit-Revision: 357924
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Feb 2020 18:50:04 -0000

Author: kevans
Date: Fri Feb 14 18:50:03 2020
New Revision: 357924
URL: https://svnweb.freebsd.org/changeset/base/357924

Log:
  dtc: re-apply r353961, r354115
  
  I missed in final review of r357923's diff that these ones hadn't yet been
  sent upstream and inadvertently reverted them. =-( Re-apply now.

Modified:
  head/usr.bin/dtc/dtb.cc
  head/usr.bin/dtc/fdt.cc

Modified: head/usr.bin/dtc/dtb.cc
==============================================================================
--- head/usr.bin/dtc/dtb.cc	Fri Feb 14 18:46:34 2020	(r357923)
+++ head/usr.bin/dtc/dtb.cc	Fri Feb 14 18:50:03 2020	(r357924)
@@ -36,6 +36,7 @@
 #include <sys/types.h>
 #include <inttypes.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
 

Modified: head/usr.bin/dtc/fdt.cc
==============================================================================
--- head/usr.bin/dtc/fdt.cc	Fri Feb 14 18:46:34 2020	(r357923)
+++ head/usr.bin/dtc/fdt.cc	Fri Feb 14 18:50:03 2020	(r357924)
@@ -1563,11 +1563,11 @@ device_tree::parse_file(text_input_buffer &input,
 {
 	input.next_token();
 	// Read the header
-	if (input.consume("/dts-v1/;"))
+	while (input.consume("/dts-v1/;"))
 	{
 		read_header = true;
+		input.next_token();
 	}
-	input.next_token();
 	if (input.consume("/plugin/;"))
 	{
 		is_plugin = true;