diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2005-01-10 12:28:31 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2005-01-10 12:28:31 +0000 |
| commit | ed3d84ea11d16eb6b66f313933513d4bd6db9463 (patch) | |
| tree | 510645159c71c503dd61d74c37db39f45abc386a | |
| parent | 405f49e9f6c19686899d8f2e5ae05faf929fd643 (diff) | |
| download | MPC-ed3d84ea11d16eb6b66f313933513d4bd6db9463.tar.gz | |
ChangeLogTag: Mon Jan 10 06:27:33 2005 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | modules/AutomakeWorkspaceCreator.pm | 10 |
2 files changed, 13 insertions, 4 deletions
@@ -1,3 +1,10 @@ +Mon Jan 10 06:27:33 2005 Chad Elliott <elliott_c@ociweb.com> + + * modules/AutomakeWorkspaceCreator.pm: + + Before using the project name as a regular expression, we must + escape all of the regular expression specific characters. + Fri Jan 7 13:59:31 2005 Chad Elliott <elliott_c@ociweb.com> * modules/Creator.pm: diff --git a/modules/AutomakeWorkspaceCreator.pm b/modules/AutomakeWorkspaceCreator.pm index 28e62c55..f2262688 100644 --- a/modules/AutomakeWorkspaceCreator.pm +++ b/modules/AutomakeWorkspaceCreator.pm @@ -178,8 +178,9 @@ sub write_comps { if (open($pfh, $local)) { my($in_condition) = 0; - my($inc_pattern) = $project_name . '_include_HEADERS'; - my($pkg_pattern) = $project_name . '_pkginclude_HEADERS'; + my($regok) = $self->escape_regex_special($project_name); + my($inc_pattern) = $regok . '_include_HEADERS'; + my($pkg_pattern) = $regok . '_pkginclude_HEADERS'; while (<$pfh>) { # Don't look at comments next if (/^#/); @@ -303,8 +304,9 @@ sub write_comps { else { $project_name = 'nobase'; } - my($inc_pattern) = $project_name . '_include_HEADERS'; - my($pkg_pattern) = $project_name . '_pkginclude_HEADERS'; + my($regok) = $self->escape_regex_special($project_name); + my($inc_pattern) = $regok . '_include_HEADERS'; + my($pkg_pattern) = $regok . '_pkginclude_HEADERS'; if (/^$inc_pattern\s*=\s*/ || /^$pkg_pattern\s*=\s*/) { $_ =~ s/^$project_name/nobase/; if (/^(nobase_include_HEADERS)\s*=\s*/ || |