From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 30 Aug 2013 15:04:27 +0000 (+0100)
Subject: fix defaulting
X-Git-Tag: test~43
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=72f9cd8561f06431dbbf7df9021a4573e99b1feb;p=d.git

fix defaulting
---

diff --git a/fyvzl b/fyvzl
index 8fe4e73..86e760f 100755
--- a/fyvzl
+++ b/fyvzl
@@ -117,13 +117,18 @@ sub insertrow ($) {
 }
 
 sub rhsargs ($) {
-    my ($row) = @_;
+    my ($defrow) = @_;
+    my $row = { };
     while (@ARGV) {
 	$_ = shift @ARGV;
 	my $f = (s/^\#// ? 'comment' : 'redirect');
 	die "$f supplied twice\n" if exists $row->{$f};
 	$row->{$f} = $_;
     }
+    foreach my $f (keys %$defrow) {
+	next if defined $row->{$f};
+	$row->{$f} = $defrow->{$f};
+    }
     qualify $row->{'redirect'};
     return $row;
 }