diff options
author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-08-23 22:20:07 +0000 |
---|---|---|
committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-08-23 22:20:07 +0000 |
commit | 440ed2707997d8b5e9e0766b74bc100e0368113a (patch) | |
tree | 162afe1dada459e880e0e3cfbc0583c4a5ccdde1 | |
parent | 8794c5dacda69ea456d270f4bf8598677b3cf47e (diff) | |
download | ATCD-440ed2707997d8b5e9e0766b74bc100e0368113a.tar.gz |
ChangeLogTag:Fri Aug 23 16:59:51 2002 Nanbor Wang <nanbor@cs.wustl.edu>
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ChangeLogs/ChangeLog-03a | 5 | ||||
-rwxr-xr-x | bin/svcconf-convert.pl | 8 |
3 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 99c32ab2001..42316f11e39 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Aug 23 16:59:51 2002 Nanbor Wang <nanbor@cs.wustl.edu> + + * bin/svcconf-convert.pl: Fixed regex to handle empty option + strings in static/dynamic entries correctly. + Fri Aug 23 16:25:47 2002 Krishnakumar B <kitty@cs.wustl.edu> * ace/OS.i: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 99c32ab2001..42316f11e39 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,8 @@ +Fri Aug 23 16:59:51 2002 Nanbor Wang <nanbor@cs.wustl.edu> + + * bin/svcconf-convert.pl: Fixed regex to handle empty option + strings in static/dynamic entries correctly. + Fri Aug 23 16:25:47 2002 Krishnakumar B <kitty@cs.wustl.edu> * ace/OS.i: diff --git a/bin/svcconf-convert.pl b/bin/svcconf-convert.pl index 978628690fe..650bf1aae6d 100755 --- a/bin/svcconf-convert.pl +++ b/bin/svcconf-convert.pl @@ -172,7 +172,7 @@ while (length ($_) != 0) { print "close module\n" if ($verbose); } - if (s/^\s*stream\s+dynamic\s+(\w+)\s+(\w+)\s*\*\s*(\S+):(\S+)\s*\(\s*\)(\s+(active|inactive))?(\s+"([^"]+)")?//) { + if (s/^\s*stream\s+dynamic\s+(\w+)\s+(\w+)\s*\*\s*(\S+):(\S+)\s*\(\s*\)(\s+(active|inactive))?(\s+"([^"]*)")?//) { $name = $1; $type = $2; $path = $3; @@ -203,7 +203,7 @@ while (length ($_) != 0) { print "stream dynamic $name $type * $init:$path \"$param\" $state\n" if ($verbose); } - if (s/^\s*stream\s+static\s+(\w+)(\s+("(.+)"))?//) { + if (s/^\s*stream\s+static\s+(\w+)(\s+("(.*)"))?//) { $name = $1; $param = $4; acexml_start ("streamdef", 0); @@ -227,7 +227,7 @@ while (length ($_) != 0) { print "stream $name\n" if ($verbose); } - if (s/^\s*dynamic\s+(\w+)\s+(\w+)\s*\*\s*(\S+):(\S+)\s*\(\s*\)(\s+(active|inactive))?(\s+"([^"]+)")?//) { + if (s/^\s*dynamic\s+(\w+)\s+(\w+)\s*\*\s*(\S+):(\S+)\s*\(\s*\)(\s+(active|inactive))?(\s+"([^"]*)")?//) { $name = $1; $type = $2; $path = $3; @@ -256,7 +256,7 @@ while (length ($_) != 0) { print "dynamic $name $type * $init:$path \"$param\" $state\n" if ($verbose); } - if (s/^\s*static\s+(\w+)(\s+("(.+)"))?//) { + if (s/^\s*static\s+(\w+)(\s+("(.*)"))?//) { $name = $1; $param = $4; if ($param ne "") { |