diff options
| author | Mike Bland <mbland@acm.org> | 2014-06-24 00:39:33 -0400 |
|---|---|---|
| committer | Geoff Thorpe <geoff@openssl.org> | 2014-11-16 16:44:44 -0500 |
| commit | 8308411297a1ac68105a90967b8b851096e31a46 (patch) | |
| tree | a35eb281dfd6fa1512e0d2538cee635fb5d91272 /util | |
| parent | a4b8457db9974802167785f1a8eab35d2a8796d3 (diff) | |
Improve variable parsing when generating MINFO
Before this change, variables for which a '=' appeared in the assignment would
be parsed as the entire string up until the final '='. For example:
BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
would result in the variable name "BUILD_CMD=shlib_target". This doesn't
appear to harm the current generation of MINFO, but creates problems for other
Makefile-related work I'm attempting.
Change-Id: I1f3a606d67fd5464bb459e8f36c23b3e967b77e1
Signed-off-by: Mike Bland <mbland@acm.org>
Signed-off-by: Geoff Thorpe <geoff@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/files.pl | 4 | ||||
| -rwxr-xr-x | util/mkfiles.pl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/util/files.pl b/util/files.pl index b15407f0c9..d5c78bafc1 100755 --- a/util/files.pl +++ b/util/files.pl @@ -4,7 +4,7 @@ # It is basically a list of all variables from the passed makefile # -while ($ARGV[0] =~ /^(\S+)\s*=(.*)$/) +while ($ARGV[0] =~ /^([^\s=]+)\s*=\s*(.*)$/) { $sym{$1} = $2; shift; @@ -15,7 +15,7 @@ while (<>) { chop; s/#.*//; - if (/^(\S+)\s*=\s*(.*)$/) + if (/^([^\s=]+)\s*=\s*(.*)$/) { $o=""; ($s,$b)=($1,$2); diff --git a/util/mkfiles.pl b/util/mkfiles.pl index 7dff4a695d..42db466688 100755 --- a/util/mkfiles.pl +++ b/util/mkfiles.pl @@ -110,7 +110,7 @@ while (<IN>) { chop; s/#.*//; - if (/^(\S+)\s*=\s*(.*)$/) + if (/^([^\s=]+)\s*=\s*(.*)$/) { $o=""; ($s,$b)=($1,$2); |