From 6e913c9c083d6aa9b74d7d9b6145c108289684ec Mon Sep 17 00:00:00 2001
From: kevans <kevans@FreeBSD.org>
Date: Fri, 14 Feb 2020 18:50:03 +0000
Subject: [PATCH] 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.
---
 usr.bin/dtc/dtb.cc | 1 +
 usr.bin/dtc/fdt.cc | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/usr.bin/dtc/dtb.cc b/usr.bin/dtc/dtb.cc
index d7aecba02800..6346d63cc0af 100644
--- a/usr.bin/dtc/dtb.cc
+++ b/usr.bin/dtc/dtb.cc
@@ -36,6 +36,7 @@
 #include <sys/types.h>
 #include <inttypes.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
 
diff --git a/usr.bin/dtc/fdt.cc b/usr.bin/dtc/fdt.cc
index 494604e191df..3c7b2a8bd9ab 100644
--- a/usr.bin/dtc/fdt.cc
+++ b/usr.bin/dtc/fdt.cc
@@ -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;