diff options
author | Daniel Stenberg <daniel@haxx.se> | 2003-04-29 12:38:32 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2003-04-29 12:38:32 +0000 |
commit | 56a6d59237450bada8b92e5dfb87d07e005db3c4 (patch) | |
tree | 3fcedc3017a8576ca9949f5c6aee7e86c7f75afc | |
parent | 0e712a4b260233b1ff5f9a54266d941053d01686 (diff) | |
download | rockbox-56a6d59237450bada8b92e5dfb87d07e005db3c4.tar.gz rockbox-56a6d59237450bada8b92e5dfb87d07e005db3c4.zip |
Anchor the regexes better, some of them caused problems with perl 5.8.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3629 a1c6a512-1295-4272-9138-f99709370657
-rwxr-xr-x | tools/binlang | 6 | ||||
-rwxr-xr-x | tools/uplang | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tools/binlang b/tools/binlang index 2f3753a7cd..bb47238db7 100755 --- a/tools/binlang +++ b/tools/binlang | |||
@@ -60,7 +60,7 @@ while(<ENG>) { | |||
60 | } | 60 | } |
61 | # get rid of DOS newlines | 61 | # get rid of DOS newlines |
62 | $_ =~ s/\r//g; | 62 | $_ =~ s/\r//g; |
63 | if($_ =~ / *([a-z]+): *(.*)/) { | 63 | if($_ =~ /^ *([a-z]+): *(.*)/) { |
64 | ($var, $value) = ($1, $2); | 64 | ($var, $value) = ($1, $2); |
65 | $set{$var} = $value; | 65 | $set{$var} = $value; |
66 | 66 | ||
@@ -75,13 +75,13 @@ while(<ENG>) { | |||
75 | close(ENG); | 75 | close(ENG); |
76 | 76 | ||
77 | while(<LANG>) { | 77 | while(<LANG>) { |
78 | if($_ =~ / *\#/) { | 78 | if($_ =~ /^ *\#/) { |
79 | # comment | 79 | # comment |
80 | next; | 80 | next; |
81 | } | 81 | } |
82 | # get rid of DOS newlines | 82 | # get rid of DOS newlines |
83 | $_ =~ s/\r//g; | 83 | $_ =~ s/\r//g; |
84 | if($_ =~ / *([a-z]+): *(.*)/) { | 84 | if($_ =~ /^ *([a-z]+): *(.*)/) { |
85 | ($var, $value) = ($1, $2); | 85 | ($var, $value) = ($1, $2); |
86 | # print "$var => $value\n"; | 86 | # print "$var => $value\n"; |
87 | 87 | ||
diff --git a/tools/uplang b/tools/uplang index d0897ba46c..41730fb3d3 100755 --- a/tools/uplang +++ b/tools/uplang | |||
@@ -11,12 +11,12 @@ MOO | |||
11 | my %ids; | 11 | my %ids; |
12 | open(ENG, "<$ARGV[0]"); | 12 | open(ENG, "<$ARGV[0]"); |
13 | while(<ENG>) { | 13 | while(<ENG>) { |
14 | if($_ =~ / *\#/) { | 14 | if($_ =~ /^ *\#/) { |
15 | # comment | 15 | # comment |
16 | next; | 16 | next; |
17 | } | 17 | } |
18 | $_ =~ s/\r//g; | 18 | $_ =~ s/\r//g; |
19 | if($_ =~ / *([a-z]+): *(.*)/) { | 19 | if($_ =~ /^ *([a-z]+): *(.*)/) { |
20 | ($var, $value) = ($1, $2); | 20 | ($var, $value) = ($1, $2); |
21 | # print "$var => $value\n"; | 21 | # print "$var => $value\n"; |
22 | 22 | ||
@@ -37,13 +37,13 @@ close(ENG); | |||
37 | undef %set; | 37 | undef %set; |
38 | open(NEW, "<$ARGV[1]"); | 38 | open(NEW, "<$ARGV[1]"); |
39 | while(<NEW>) { | 39 | while(<NEW>) { |
40 | if($_ =~ / *\#/) { | 40 | if($_ =~ /^ *\#/) { |
41 | # comment | 41 | # comment |
42 | next; | 42 | next; |
43 | } | 43 | } |
44 | $_ =~ s/\r//g; | 44 | $_ =~ s/\r//g; |
45 | 45 | ||
46 | if($_ =~ / *([a-z]+): *(.*)/) { | 46 | if($_ =~ /^ *([a-z]+): *(.*)/) { |
47 | ($var, $value) = ($1, $2); | 47 | ($var, $value) = ($1, $2); |
48 | 48 | ||
49 | $set{$var} = $value; | 49 | $set{$var} = $value; |