Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 13:21:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some bugs with the pendingCommand escaping code: First, extra spaces were being inserted (so much for s///x). Second, the escaping was actually modifying the original keys. Third, there were some logic errors that caused underescaping or resulted in the wrong key being escaped.

Browse Source
This commit is contained in:
ian%hixie.ch 2002-05-07 01:50:22 +00:00
parent 521b18afe1
commit 7f1b1bc44d
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
webtools/PLIF/PLIF/Input.pm
View File

@ -94,13 +94,13 @@ sub escapeString {
# escape for the separator and doubling for the escape character,
# e.g. '\;' and '\\', then you get all kinds of confusion when the
# string contains lots of '\' and ';' characters.
$substring =~ s/ \# / \#h /gosx;
$substring =~ s/ \| / \#b /gosx;
$substring =~ s/ \; / \#s /gosx;
$substring =~ s/ \ / \#w /gosx;
$substring =~ s/ \n / \#n /gosx;
$substring =~ s/ \r / \#r /gosx;
$substring =~ s/ \t / \#t /gosx;
$substring =~ s/\#/\#h/gos;
$substring =~ s/\|/\#b/gos;
$substring =~ s/\;/\#s/gos;
$substring =~ s/\ /\#w/gos;
$substring =~ s/\n/\#n/gos;
$substring =~ s/\r/\#r/gos;
$substring =~ s/\t/\#t/gos;
return $substring;
}
@ -108,13 +108,13 @@ sub escapeString {
sub unescapeString {
my $self = shift;
my($substring) = @_;
$substring =~ s/ \#b / \| /gosx;
$substring =~ s/ \#s / \; /gosx;
$substring =~ s/ \#w / \ /gosx;
$substring =~ s/ \#n / \n /gosx;
$substring =~ s/ \#r / \r /gosx;
$substring =~ s/ \#t / \t /gosx;
$substring =~ s/ \#h / \# /gosx;
$substring =~ s/\#b/\|/gos;
$substring =~ s/\#s/\;/gos;
$substring =~ s/\#w/\ /gos;
$substring =~ s/\#n/\n/gos;
$substring =~ s/\#r/\r/gos;
$substring =~ s/\#t/\t/gos;
$substring =~ s/\#h/\#/gos;
return $substring;
}
@ -123,19 +123,19 @@ sub getArgumentsAsString {
my $self = shift;
my $hash = $self->getArguments();
my $string = '';
foreach my $key (keys %$hash) {
$key = $self->escapeString($key);
foreach my $key (keys(%$hash)) {
$string .= $self->escapeString($key);
if (ref($hash->{$key}) eq 'ARRAY') {
$string .= "$key;";
$string .= ';';
foreach my $substring (@{$hash->{$key}}) {
$substring = $self->escapeString($substring);
$string .= "$substring|";
$string .= $self->escapeString($substring);
$string .= '|';
}
chop $string;
$string .= ";";
} else {
$string .= "$key;".($hash->{$key}).';';
$string .= $self->escapeString($hash->{$key});
}
$string .= ';';
}
chop $string;
return $string;