From 14133da11bc4ecd7777ddb4e6e8bee8046ad780c Mon Sep 17 00:00:00 2001 From: The Squid Software Foundation <> Date: Wed, 2 Oct 2013 23:47:53 -0600 Subject: [PATCH] Fixed detection of various custom lines around "numerous individuals" boilers. Recognize more custom lines inside boilerplates. Recognize multi-author lines with a single AUTHOR prefix. Split multi-author claims (does not fully work in a few some complex cases, but that is OK). Cleaned up reported claims a little. Preserve "inspired by" comments when replacing their home boilerplates. --- scripts/source-mangler.pl | 150 +++++++++++++++++++++++++++++--------- 1 file changed, 116 insertions(+), 34 deletions(-) diff --git a/scripts/source-mangler.pl b/scripts/source-mangler.pl index 4c4907c5f0..f88b1b9179 100755 --- a/scripts/source-mangler.pl +++ b/scripts/source-mangler.pl @@ -30,18 +30,49 @@ my $reDebug = qr{ # Copyright-related claims inside a boilerplate comment my $reClaims = qr{ ( - (?:AUTHOR\b| # either author - COPYRIGHT\b(?!\sfile)) # or copyright (except "COPYRIGHT file") + (?: + AUTHOR\b(?:.|\n)*?\*[/\s]*$| # all authors until an "empty" line + ORIGINAL\s+AUTHOR\b| # or not the latest author + COPYRIGHT\b(?!\sfile)| # or copyright (except "COPYRIGHT file") + Portions\scopyright| # or partial copyright + (?