diff options
-rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
-rwxr-xr-x | winsup/cygwin/update-copyright | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 5ababd9bc..ba930290e 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 2013-01-20 Christopher Faylor <me.cygwin2013@cgf.cx> + * update-copyright (update_maybe): Accommodate perl-style copyright + comments. + +2013-01-20 Christopher Faylor <me.cygwin2013@cgf.cx> + * update-copyright: Silently skip nonexistent files. Display filename on update. Don't update non-Red Hat copyrights. diff --git a/winsup/cygwin/update-copyright b/winsup/cygwin/update-copyright index 47ab14f32..112592eb3 100755 --- a/winsup/cygwin/update-copyright +++ b/winsup/cygwin/update-copyright @@ -54,7 +54,7 @@ sub update_maybe($%) { while (<>) { if ($copyright) { push @file, $_; - } elsif (/^\s*Copyright/o) { + } elsif (/^[#\s]*Copyright/o) { $copyright = $_; $copyright .= scalar <> while $copyright =~ /,\s*$/o; if ($copyright !~ /Red Hat, Inc\.\n/o) { @@ -64,7 +64,7 @@ sub update_maybe($%) { for my $date ($copyright =~ /(\d+)/g) { $dates{$date} = 1; } - my $indent = ($copyright =~ /\A(\s*)/o)[0]; + my $indent = ($copyright =~ /\A([#\s]*)/o)[0]; my $newcopyright = addwrap $indent, $indent . 'Copyright ' . (join ', ', sort {$a <=> $b} sort keys %dates) . |