mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-18 19:21:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

scstadmin: Allow hash signs to be escaped (merge r4391 from trunk)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.2.x@4592 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2012-11-03 14:48:14 +00:00
parent ff41d8c887
commit bc6da2b006
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
scstadmin/scstadmin.sysfs/scstadmin
View File

@@ -1247,6 +1247,17 @@ sub readWorkingConfig {
return FALSE;
}
# Escape metacharacters (space, backslash and hash sign).
sub escapeMeta {
my $value = shift;
$value =~ s/([\\\#])/\\\1/g;
if ($value =~ / /) {
$value = "\"$value\"";
}
return $value;
}
# Serialize key attributes.
# $prefix: output prefix, e.g. "\t\t".
# $attributes: reference to a hash with attributes and their values.
@@ -1269,10 +1280,7 @@ sub serializeKeyAttr {
my $value =
$$attributes{$attribute}->{'keys'}->{$key}->{'value'};
if ($value ne '') {
if ($value =~ / /) {
$value = "\"$value\"";
}
$result .= "$prefix$attribute $value\n";
$result .= "$prefix$attribute " . escapeMeta($value) . "\n";
}
}
} elsif ($attribute eq 'enabled' || $attribute eq 'hw_target') {
@@ -1305,10 +1313,7 @@ sub serializeNkAttr {
&& $attribute ne 'hw_target') {
my $value = $$attributes{$attribute}->{'value'};
if ($value ne '') {
if ($value =~ / /) {
$value = "\"$value\"";
}
$result .= "$prefix$attribute $value\n";
$result .= "$prefix$attribute " . escapeMeta($value) . "\n";
}
}
}
@@ -5056,7 +5061,8 @@ sub readConfigFile {
if (!$io);
while (my $line = <$io>) {
($line, undef) = split(/\#/, $line, 2);
$line =~ s/^\#.*//;
$line =~ s/[^\\]\#.*//;
if ($line =~ /\[(.*)\s+.*\]/) {
my $parm = $1;
@@ -5069,6 +5075,7 @@ sub readConfigFile {
}
}
$line =~ s/\\(.)/\1/g;
$buffer .= $line;
}