summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-12-23 14:52:38 (GMT)
committeraxis <qt-info@nokia.com>2011-03-04 10:42:49 (GMT)
commit5b3f54a344a6e228389989ecf4fc9e770287db3a (patch)
treebcd2555dffc43a1561759227eba4f8596e3df86d
parent3afec58f28a6fbe1cd23fc5bbb5a2f71844a0cfa (diff)
downloadQt-5b3f54a344a6e228389989ecf4fc9e770287db3a.zip
Qt-5b3f54a344a6e228389989ecf4fc9e770287db3a.tar.gz
Qt-5b3f54a344a6e228389989ecf4fc9e770287db3a.tar.bz2
Fixed a bug in elf2e32_qtwrapper regarding spaces in def files.
It would not parse the line correctly if a space was missing between the "@" and the ordinal number. RevBy: Trust me
-rwxr-xr-xbin/elf2e32_qtwrapper.pl6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/elf2e32_qtwrapper.pl b/bin/elf2e32_qtwrapper.pl
index 4eeb098..64d485b 100755
--- a/bin/elf2e32_qtwrapper.pl
+++ b/bin/elf2e32_qtwrapper.pl
@@ -106,7 +106,7 @@ while (1) {
$origDefLine = <$origDefFile>;
if (defined($origDefLine)) {
$origDefLine =~ s/[\n\r]//;
- if ($origDefLine =~ /([a-z0-9_]+) +\@ ([0-9]+) (.*)/i) {
+ if ($origDefLine =~ /([a-z0-9_]+) +\@ *([0-9]+) (.*)/i) {
$origSym = $1;
$origOrdinal = $2;
$origExtraData = $3;
@@ -121,7 +121,7 @@ while (1) {
if ($savedNewDefFileLine) {
# This happens if the new def file was missing an entry.
$newDefLine = $savedNewDefFileLine;
- $newDefLine =~ /([a-z0-9_]+) +\@ ([0-9]+) (.*)/i or die("$0: Shouldn't happen");
+ $newDefLine =~ /([a-z0-9_]+) +\@ *([0-9]+) (.*)/i or die("$0: Shouldn't happen");
$newSym = $1;
$newOrdinal = $2;
$newExtraData = $3;
@@ -131,7 +131,7 @@ while (1) {
$newDefLine = <$newDefFile>;
if (defined($newDefLine)) {
$newDefLine =~ s/[\n\r]//;
- if ($newDefLine =~ /([a-z0-9_]+) +\@ ([0-9]+) (.*)/i) {
+ if ($newDefLine =~ /([a-z0-9_]+) +\@ *([0-9]+) (.*)/i) {
$newSym = $1;
$newOrdinal = $2;
$newExtraData = $3;