Changeset 7692

Timestamp:

2004-07-02T09:26:51+12:00 (20 years ago)

Author:

mdewsnip

Message:

Fixed up the parsing of quoted strings so strings like "Hello
" (with escaped backslashes before the quotes) are dealt with correctly.

File:

• trunk/gsdl/perllib/cfgread.pm (modified) (2 diffs)

trunk/gsdl/perllib/cfgread.pm

@@ -42 +42 @@
     if ($line =~ m/[^\\]([\"\'])/) {
         my $quote=$1;
-        while ($line !~ m/$quote(.*?[^\\])?$quote/) {
+        while ($line !~ m/$quote(.*?[^\\])?(\\\\)*$quote/) {
         my $nextline = <$handle>;
         if (defined($nextline)) {
@@ -54 +54 @@
     $linecontinues = $line =~ s/\\$//;
 
-    while ($line =~ s/\s*(\".*?[^\\]\"|\'.*?[^\\]\'|\S+)\s*//) {
+    while ($line =~ s/\s*(\".*?[^\\](\\\\)*\"|\'.*?[^\\](\\\\)*\'|\S+)\s*//) {
         if (defined $1) {
         # remove any enclosing quotes