Improve error reporting

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 3996b60622e4a6433c4737c48584a261893631d2..9a81f61a654070fa2b3318c417af5dada3b8bdf6 100755 (executable)
--- a/mr
+++ b/mr
@@ -1184,6 +1184,11 @@ sub loadconfig {
                $_=shift @lines;
                $line++;
                chomp;
                $_=shift @lines;
                $line++;
                chomp;

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

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


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

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

                }
        }
 
                }
        }