maint: make update-b4-copyright easier to use

* build-aux/update-b4-copyright: In warnings, report line
numbers rather than character positions.
* cfg.mk (update-copyright-local): Set to update-b4-copyright so
that update-copyright runs it.
* gnulib: Update.

4 files changed, 26 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index d558bf0e..be422d29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-08-06  Joel E. Denny  <jdenny@clemson.edu>
+
+	maint: make update-b4-copyright easier to use
+	* build-aux/update-b4-copyright: In warnings, report line
+	numbers rather than character positions.
+	* cfg.mk (update-copyright-local): Set to update-b4-copyright so
+	that update-copyright runs it.
+	* gnulib: Update.
+
 2009-08-05  Joel E. Denny  <jdenny@clemson.edu>
 
 	maint: clean up update-b4-copyright code
diff --git a/build-aux/update-b4-copyright b/build-aux/update-b4-copyright
index 06d3cb76..af43407d 100755
--- a/build-aux/update-b4-copyright
+++ b/build-aux/update-b4-copyright
@@ -117,29 +117,34 @@ while (/($old_re)/gx)
 
 while (/(\bb4_copyright\()/g)
   {
-    my $pos = pos ();
-    pos () -= length ($1);
+    my $start = pos () - length ($1);
+    my $end = pos ();
     my $re = $old_re;
+    pos () = $start;
     $re =~ s/\#BEFORE/\\G/;
     if (!/$re/x)
       {
+        my $line = (substr ($_, 0, $start) =~ s/\n/\n/g) + 1;
         print STDERR
-          "$ARGV: warning: failed to update a b4_copyright before char"
-          . " $pos\n";
+          "$ARGV:$line: warning: failed to update a b4_copyright\n";
       }
-    pos () = $pos;
+    pos () = $end;
   }
 
-while (/\[b4_copyright_years]/g)
+while (/(\[b4_copyright_years])/g)
   {
-    my $pos = pos ();
+    my $start = pos () - length ($1);
+    my $end = pos ();
     my $re = $old_re;
     $re =~ s/\#AFTER/\\G/;
     if (!/$re/x)
       {
+        # The substr operation blows away pos (), so restoring pos ()
+        # at the end is necessary.
+        my $line = (substr ($_, 0, $start) =~ s/\n/\n/g) + 1;
         print STDERR
-          "$ARGV: warning: failed to update a b4_copyright_years before"
-          . " char $pos\n";
+          "$ARGV:$line: warning: failed to update a"
+          . " b4_copyright_years\n";
       }
-    pos () = $pos;
+    pos () = $end;
   }
diff --git a/cfg.mk b/cfg.mk
index 2b6041ac..66a2bc6f 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -42,3 +42,5 @@ local-checks-to-skip = changelog-check
 gnulib_dir = $(srcdir)/../../gnulib
 
 bootstrap-tools = autoconf,automake,flex,gnulib
+
+update-copyright-local = update-b4-copyright
diff --git a/gnulib b/gnulib
-Subproject 8bdaa78f311ff9e5e03ff37ee5f546af1491380
+Subproject 109f2942075bba4454bd92141b1803cf1b79684