From: Mark Andrews <marka@isc.org>
Date: Tue, 6 Oct 2015 07:19:24 +0000 (+1100)
Subject: handle <!ENTITY within <!DOCTYPE
X-Git-Tag: v9.11.0a1~363
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=3db767c98f8dfaadef4b389150e1257b67b3dacb;p=thirdparty%2Fbind9.git

handle <!ENTITY within <!DOCTYPE
---

diff --git a/util/update_copyrights b/util/update_copyrights
index aa7d676376d..89300539d4a 100644
--- a/util/update_copyrights
+++ b/util/update_copyrights
@@ -317,6 +317,25 @@ foreach $file (keys %file_types) {
                 while (/^<!DOCTYPE/ || /^<!ENTITY/ || /^<\?xml-stylesheet/ || /^<\?xml /) {
 			# print "SGML: $_";
 			$before_copyright = "$before_copyright$_";
+			if (/\]>$/ ) {
+				$_ = <SOURCE>;
+				close(SOURCE) if (eof(SOURCE));
+				next;
+			}
+			if (/^<!DOCTYPE/) {
+				while (!eof(SOURCE)) {
+					$_ = <SOURCE>;
+					next if (eof(SOURCE));
+					$before_copyright =
+						 "$before_copyright$_";
+					if (/]>$/) {
+						$_ = <SOURCE>;
+						last;
+					}
+				}
+				close(SOURCE) if (eof(SOURCE));
+				next;
+			}
 			if (/>$/ ) {
 				$_ = <SOURCE>;
 				close(SOURCE) if (eof(SOURCE));