summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfukachan <fukachan>2001-10-13 03:00:12 +0000
committerfukachan <fukachan>2001-10-13 03:00:12 +0000
commitdda97a9402222a36dfa9a3899ede5efcbc004f98 (patch)
tree3e5cd8035014ca84c3c0166204491c856f644666
parent94d058bb87cfb9abb9024927a4405c37b2418e8f (diff)
downloadfml8-dda97a9402222a36dfa9a3899ede5efcbc004f98.tar.gz
fml8-dda97a9402222a36dfa9a3899ede5efcbc004f98.tar.bz2
fml8-dda97a9402222a36dfa9a3899ede5efcbc004f98.zip
expand_variable_in_buffer can take optional $args
-rw-r--r--fml/lib/FML/Config.pm8
1 files changed, 6 insertions, 2 deletions
diff --git a/fml/lib/FML/Config.pm b/fml/lib/FML/Config.pm
index ce0be180..5554042f 100644
--- a/fml/lib/FML/Config.pm
+++ b/fml/lib/FML/Config.pm
@@ -1,7 +1,7 @@
#-*- perl -*-
# Copyright (C) 2000-2001 Ken'ichi Fukamachi
#
-# $FML: Config.pm,v 1.42 2001/10/10 14:53:45 fukachan Exp $
+# $FML: Config.pm,v 1.43 2001/10/12 00:14:19 fukachan Exp $
#
package FML::Config;
@@ -503,7 +503,7 @@ expand $varname to $config->{ varname } in C<$rbuf>.
# Return Value: none
sub expand_variable_in_buffer
{
- my ($config, $rbuf) = @_;
+ my ($config, $rbuf, $args) = @_;
while ($$rbuf =~ /\$([\w\d\_]+)/) {
my $varname = $1;
@@ -511,6 +511,10 @@ sub expand_variable_in_buffer
my $x = $config->{ $varname };
$$rbuf =~ s/\$$varname/$x/;
}
+ if (defined $args->{ $varname }) {
+ my $x = $args->{ $varname };
+ $$rbuf =~ s/\$$varname/$x/;
+ }
}
}