X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/0439a487b3430d96a5ee756b8279274280b8da1f..8533154739967d8a22b897d1507616a6c5a4e666:/barcat

diff --git a/barcat b/barcat
index 189c8ff..6dbddd9 100755
--- a/barcat
+++ b/barcat
@@ -384,10 +384,19 @@ sub show_stat {
 sub varfmt {
 	my ($fmt, $vars) = @_;
 	$fmt =~ s[\$\{ (\w+) (?<cmd>; (?: [^{}]+ | \{.*?\} )*)? \}]{
-		local $_ = $vars->{$1}; #TODO //
-		$_ = $opt{'value-format'}->($_) if $opt{reformat};
-		eval $+{cmd} if $+{cmd}; #TODO $@
-		$_;
+		local $_ = $vars->{$1};
+		if (defined) {
+			$_ = $opt{'value-format'}->($_) if $opt{reformat};
+			if ($+{cmd}) {
+				eval $+{cmd};
+				warn "Error in \$$1 report: $@" if $@;
+			}
+			$_;
+		}
+		else {
+			warn "Unknown variable \$$1 in report\n";
+			"\$$1";
+		}
 	}eg;
 	return $fmt;
 }