dahdi_genconf configuration separated from the kernel config.

* Using /etc/dahdi/genconf_parameters.
* A shiny new format (sample file included).
* xpp_fxloader is configured from /etc/dahdi/init.conf (like the init.d
  script).
* Yet some more string cleanups.


git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/trunk@4484 a0bf4364-ded3-4de4-8d8a-66a801d63aff

1 files changed, 44 insertions, 21 deletions

diff --git a/xpp/perl_modules/Dahdi/Config/GenconfDefaults.pm b/xpp/perl_modules/Dahdi/Config/GenconfDefaults.pm
index 9988929..45250de 100644
--- a/xpp/perl_modules/Dahdi/Config/GenconfDefaults.pm
+++ b/xpp/perl_modules/Dahdi/Config/GenconfDefaults.pm
@@ -9,31 +9,54 @@ package Dahdi::Config::GenconfDefaults;
 #
 use strict;
 
-# Use the shell to source a file and expand a given list
-# of variables.
-sub do_source($@) {
-	my $file = shift;
-	my @vars = @_;
-	my @output = `env -i sh -ec '. $file; export @vars; for i in @vars; do eval echo \$i=\\\$\$i; done'`;
-	die "$0: Sourcing '$file' exited with $?" if $?;
-	my %vars;
-	
-	foreach my $line (@output) {
-		chomp $line;
-		my ($k, $v) = split(/=/, $line, 2);
-		$vars{$k} = $v if grep /^$k$/, @vars;
+sub new($$) {
+	my $pack = shift || die;
+	my $cfg_file = shift || die;
+	my $self = { GENCONF_FILE => $cfg_file };
+	bless $self, $pack;
+	open(F, $cfg_file) || die "$0: Cannot read '$cfg_file': $!\n";
+	my $array_key;
+	while(<F>) {
+		my ($key, $val);
+		chomp;
+		s/#.*$//;
+		s/\s+$//;	# trim tail whitespace
+		next unless /\S/;
+		if(defined $array_key && /^\s+/) {
+			s/^\s+//;	# trim beginning whitespace
+			push(@{$self->{$array_key}}, $_);
+			next; 
+		}
+		undef $array_key;
+		($key, $val) = split(/\s+/, $_, 2);
+		$key = lc($key);
+		if(! defined $val) {
+			$array_key = $key;
+			next;
+		}
+		die "$cfg_file:$.: Duplicate key '$key'\n", if exists $self->{$key};
+		$self->{$key} = $val;
 	}
-	return %vars;
+	close F;
+	return $self;
 }
 
-sub source_vars {
-	my @vars = @_;
-	my $default_file = $ENV{GENCONF_PARAMETERS} || "/etc/dahdi/genconf_parameters";
-	if (! -r $default_file) {
-		return ("", ());
+sub dump($) {
+	my $self = shift || die;
+	foreach my $k (sort keys %$self) {
+		my $val = $self->{$k};
+		my $ref = ref $val;
+		if($ref eq '') {
+			printf STDERR "%-20s %s\n", $k, $val;
+		} elsif($ref eq 'ARRAY') {
+			printf STDERR "%s\n", $k;
+			foreach my $v (@{$val}) {
+				printf STDERR "\t%s\n", $v;
+			}
+		} else {
+			printf STDERR "%-20s (%s) %s\n", $k, $ref, $val;
+		}
 	}
-	my %vars = do_source($default_file, @vars);
-	return ($default_file, %vars);
 }
 
 1;