Changeset 132

Timestamp:

1999-02-02T22:55:46+13:00 (25 years ago)

Author:

rjmcnab

Message:

Enabled the configuration files to be more readable.

File:

• trunk/gsdl/perllib/cfgread.pm (modified) (1 diff)

trunk/gsdl/perllib/cfgread.pm

@@ -7 +7 @@
     my ($handle) = @_;
     my $line = "";
+    my @line = ();
+    my $linecontinues = 0;
 
     while (defined($line = <$handle>)) {
-    $line =~ s/^\#.*$//; # remove comments
+    $line =~ s/^\#.*$//;   # remove comments
     $line =~ s/\cM|\cJ//g; # remove end-of-line characters
-    if ($line =~ /\w/) {
-        my @line = split(/\t/, $line);
+    $line =~ s/^\s+//;     # remove initial white space
+    $linecontinues = $line =~ s/\\$//;
+    while ($line =~ s/\s*(\"[^\"]*\"|\'[^\']*\'|\S+)\s*//) {
+        if (defined $1) {
+        # remove any enclosing quotes
+        my $entry = $1;
+        $entry =~ s/^([\"\'])(.*)\1$/$2/;
+
+        # substitute an environment variables
+        $entry =~ s/\$(\w+)/$ENV{$1}/g;
+        $entry =~ s/\$\{(\w+)\}/$ENV{$1}/g;
+
+        push (@line, $entry);
+        } else {
+        push (@line, "");
+        }
+    }
+
+    if (scalar(@line) > 0 && !$linecontinues) {
+#       print STDERR "line: \"" . join ("\" \"", @line) . "\"\n";
         return \@line;
     }
     }
+
     return undef;
 }