Correct printing of line numbers when includes are used. Closes: #650952

Turned out unexapectedly subtle.

diff --git a/debian/changelog b/debian/changelog
index fe70063222f1d13a62463ea1524b772a4fd44a49..b02ee83d1d624ee7269ef7f49b6f340c812f71e9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ mr (1.07) UNRELEASED; urgency=low
   * Added support for vcsh, enable with: include = cat /usr/share/mr/vcsh
     Thanks, Richard Hartmann 
   * Block tty control codes in untrusted mr config files.
   * Added support for vcsh, enable with: include = cat /usr/share/mr/vcsh
     Thanks, Richard Hartmann 
   * Block tty control codes in untrusted mr config files.

-  * Show the line when failing to parse a config file. Closes: #650952
+  * Correct printing of line numbers when includes are used. Closes: #650952

 
  -- Joey Hess <joeyh@debian.org>  Tue, 29 Nov 2011 18:15:51 -0400
 
 
  -- Joey Hess <joeyh@debian.org>  Tue, 29 Nov 2011 18:15:51 -0400
 

diff --git a/mr b/mr
index 9a81f61a654070fa2b3318c417af5dada3b8bdf6..d3c79ac94fa2954b55c62f6fe252cad63befbae2 100755 (executable)
--- a/mr
+++ b/mr
@@ -1179,11 +1179,38 @@ sub loadconfig {
        close $in unless ref $f eq 'GLOB';
 
        my $section;
        close $in unless ref $f eq 'GLOB';
 
        my $section;

+
+       # Keep track of the current line in the config file;
+       # when a file is included track the current line from the include.

        my $line=0;
        my $line=0;

+       my $included=undef;
+       my $includeline=0;
+       my $nextline = sub {
+               if ($included) {
+                       $includeline++;
+                       $included--;
+               }
+               else {
+                       $included=undef;
+                       $includeline=0;
+                       $line++;
+               }
+               my $l=shift @lines;
+               chomp $l;
+               return $l
+       };
+       my $lineerror = sub {
+               my $msg=shift;
+               if (defined $included) {
+                       die "mr: $f line $line include line $includeline: $msg\n";
+               }
+               else {
+                       die "mr: $f line $line: $msg\n";
+               }
+       };
+

        while (@lines) {
        while (@lines) {

-               $_=shift @lines;
-               $line++;
-               chomp;
+               $_=$nextline->();

 
                if (! $trusted && /[[:cntrl:]]/) {
                        trusterror("mr: illegal control character", $f, $line, $bootstrap_url);
 
                if (! $trusted && /[[:cntrl:]]/) {
                        trusterror("mr: illegal control character", $f, $line, $bootstrap_url);


@@ -1214,10 +1241,9 @@ sub loadconfig {
 
                        # continued value
                        while (@lines && $lines[0]=~/^\s(.+)/) {
 
                        # continued value
                        while (@lines && $lines[0]=~/^\s(.+)/) {

-                               shift(@lines);
-                               $line++;

                                $value.="\n$1";
                                chomp $value;
                                $value.="\n$1";
                                chomp $value;

+                               $nextline->();

                        }
 
                        if (! $trusted) {
                        }
 
                        if (! $trusted) {


@@ -1243,15 +1269,17 @@ sub loadconfig {
 
                        if ($parameter eq "include") {
                                print "mr: including output of \"$value\"\n" if $verbose;
 
                        if ($parameter eq "include") {
                                print "mr: including output of \"$value\"\n" if $verbose;

-                               unshift @lines, `$value`;
+                               my @inc=`$value`;

                                if ($?) {
                                        print STDERR "mr: include command exited nonzero ($?)\n";
                                }
                                if ($?) {
                                        print STDERR "mr: include command exited nonzero ($?)\n";
                                }

+                               $included += @inc;
+                               unshift @lines, @inc;

                                next;
                        }
 
                        if (! defined $section) {
                                next;
                        }
 
                        if (! defined $section) {

-                               die "$f line $.: parameter ($parameter) not in section\n";
+                               $lineerror->("parameter ($parameter) not in section");

                        }
                        if ($section eq 'ALIAS') {
                                $alias{$parameter}=$value;
                        }
                        if ($section eq 'ALIAS') {
                                $alias{$parameter}=$value;


@@ -1292,7 +1320,7 @@ sub loadconfig {
                        }
                }
                else {
                        }
                }
                else {

-                       die "$f line $line: '$_': parse error\n";
+                       $lineerror->("parse error");

                }
        }
 
                }
        }