* Fix line number display for config file parse errors.

diff --git a/debian/changelog b/debian/changelog
index 767966aa4fc732361a3116772836e39030fb3568..a6e1e9b54b7f8315cdaa3c201fc6d3c5056ce8ce 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mr (0.2) UNRELEASED; urgency=low
+
+  * Fix line number display for config file parse errors.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 14 Oct 2007 19:03:22 -0400
+

 mr (0.1) unstable; urgency=low
 
   * First release.
 mr (0.1) unstable; urgency=low
 
   * First release.

diff --git a/mr b/mr
index f725318b0dfea0f69f67d57a4ed25a8123245a8f..11d1c2beb9874c310d2178d188f71b270775468e 100755 (executable)
--- a/mr
+++ b/mr
@@ -527,8 +527,10 @@ sub loadconfig { #{{{
        close $in;
 
        my $section;
        close $in;
 
        my $section;

+       my $line=0;

        while (@lines) {
                $_=shift @lines;
        while (@lines) {
                $_=shift @lines;

+               $line++;

                chomp;
                next if /^\s*\#/ || /^\s*$/;
                if (/^\[([^\]]*)\]\s*$/) {
                chomp;
                next if /^\s*\#/ || /^\s*$/;
                if (/^\[([^\]]*)\]\s*$/) {


@@ -541,6 +543,7 @@ sub loadconfig { #{{{
                        # continued value
                        while (@lines && $lines[0]=~/^\s(.+)/) {
                                shift(@lines);
                        # continued value
                        while (@lines && $lines[0]=~/^\s(.+)/) {
                                shift(@lines);

+                               $line++;

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


@@ -572,7 +575,7 @@ sub loadconfig { #{{{
                        }
                }
                else {
                        }
                }
                else {

-                       die "$f line $.: parse error\n";
+                       die "$f line $line: parse error\n";

                }
        }
 
                }
        }