mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-20 09:47:51 +02:00
Correct handling of columns with embedded spaces
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
parent
8b49641e07
commit
c8866ef8bf
@ -2003,7 +2003,7 @@ sub split_columns( $ ) {
|
|||||||
if ( $element eq '' ) {
|
if ( $element eq '' ) {
|
||||||
$element = $_;
|
$element = $_;
|
||||||
} else {
|
} else {
|
||||||
$element = join( ',', $element, $_ );
|
$element = join( ' ', $element, $_ );
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( ( $count = tr/)/)/ ) > 0 ) {
|
if ( ( $count = tr/)/)/ ) > 0 ) {
|
||||||
@ -2015,7 +2015,7 @@ sub split_columns( $ ) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} elsif ( ( $count = tr/)/)/ ) > 0 ) {
|
} elsif ( ( $count = tr/)/)/ ) > 0 ) {
|
||||||
$element = join (',', $element, $_ );
|
$element = join (' ', $element, $_ );
|
||||||
if ( ! ( $opencount -= $count ) ) {
|
if ( ! ( $opencount -= $count ) ) {
|
||||||
push @list2 , $element;
|
push @list2 , $element;
|
||||||
$element = '';
|
$element = '';
|
||||||
@ -2025,7 +2025,7 @@ sub split_columns( $ ) {
|
|||||||
} elsif ( $element eq '' ) {
|
} elsif ( $element eq '' ) {
|
||||||
push @list2 , $_;
|
push @list2 , $_;
|
||||||
} else {
|
} else {
|
||||||
$element = join ',', $element , $_;
|
$element = join ' ', $element , $_;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user