Modify copyright.pl so all lines are processed, not just the first

match, so files that contain embedded copyrights are updated, e.g.
pgsql/help.c.

Backpatch to 9.2.

diff --git a/src/tools/copyright.pl b/src/tools/copyright.pl
index c78f20e119e3c92503afeebd61c47ef7d60c4ba0..5911586b8e4f03bff8a9ba01a2671ca6b419f940 100755 (executable)
--- a/src/tools/copyright.pl
+++ b/src/tools/copyright.pl
@@ -48,12 +48,10 @@ sub wanted
                # We only care about lines with a copyright notice.
                next unless $line =~ m/$cc.*$pgdg/;
 
-               # We stop when we've done one substitution.  This is both for
-               # efficiency and, at least in the case of this program, for
-               # correctness.
-               last if $line =~ m/$cc.*$year.*$pgdg/;
-               last if $line =~ s/($cc\d{4})(, $pgdg)/$1-$year$2/;
-               last if $line =~ s/($cc\d{4})-\d{4}(, $pgdg)/$1-$year$2/;
+               # We process all lines because some files have copyright
+               # strings embedded in them, e.g. src/bin/psql/help.c
+               $line =~ s/($cc\d{4})(, $pgdg)/$1-$year$2/;
+               $line =~ s/($cc\d{4})-\d{4}(, $pgdg)/$1-$year$2/;
        }
        untie @lines;
 }