michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-08-07 00:10:40 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Use standard split_quoted_string function

Browse Source
This commit is contained in:
Jamie Cameron
2026-08-04 11:02:37 -07:00
parent 93ceede9bb
commit e9c8746a34
1 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
logrotate/logrotate-lib.pl
View File

@@ -68,7 +68,7 @@ while(<$fh>) {
s/#.*$//;
if (/^\s*(.*)\{\s*$/) {
# Start of a section
push(@name, &split_words($1));
push(@name, &split_quoted_string($1));
$section = { 'name' => [ @name ],
'members' => [ ],
'index' => scalar(@$addto),
@@ -83,7 +83,7 @@ while(<$fh>) {
elsif ((/^\s*\// || /^\s*"\//) && !$section) {
# A path before a section
$namestart = $lnum if (!@name);
push(@name, &split_words($_));
push(@name, &split_quoted_string($_));
}
elsif (/^\s*}\s*$/) {
# End of a section
@@ -160,19 +160,6 @@ if (!$argfile) {
return wantarray ? (\@rv, $lnum, \@files) : \@rv;
}
# split_words(string)
# Split a string like 'foo "bar" baz' into words
sub split_words
{
my ($str) = @_;
my @rv;
while($str =~ /^\s*"(.*)"(.*)$/ || $str =~ /^\s*(\S+)(.*)$/) {
push(@rv, $1);
$str = $2;
}
return @rv;
}
# join_words(word, ...)
# Joins an array of words into a string, with quotes if needed
sub join_words