A configuration file registered as UTF-8 will be automatically decoded from UTF-8 to Perl's internal string format after reading and encoded in the other direction before writing.
Signed-off-by: Fiona Ebner <[email protected]> --- src/PVE/Cluster.pm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/PVE/Cluster.pm b/src/PVE/Cluster.pm index e829687..2f38fba 100644 --- a/src/PVE/Cluster.pm +++ b/src/PVE/Cluster.pm @@ -517,7 +517,7 @@ sub verify_token { my $file_info = {}; sub cfs_register_file { - my ($filename, $parser, $writer) = @_; + my ($filename, $parser, $writer, $utf8) = @_; $observed->{$filename} || die "unknown file '$filename'"; @@ -526,11 +526,12 @@ sub cfs_register_file { $file_info->{$filename} = { parser => $parser, writer => $writer, + utf8 => $utf8, }; } my $ccache_read = sub { - my ($filename, $parser, $version) = @_; + my ($filename, $parser, $version, $utf8) = @_; $ccache->{$filename} = {} if !$ccache->{$filename}; @@ -540,6 +541,7 @@ my $ccache_read = sub { # we always call the parser, even when the file does not exist # (in that case $data is undef) my $data = get_config($filename); + $data = decode('utf8', $data) if $utf8; $ci->{data} = &$parser("/etc/pve/$filename", $data); $ci->{version} = $version; } @@ -577,7 +579,7 @@ sub cfs_read_file { my ($version, $info) = cfs_file_version($filename); my $parser = $info->{parser}; - return &$ccache_read($filename, $parser, $version); + return &$ccache_read($filename, $parser, $version, $info->{utf8}); } sub cfs_write_file { @@ -595,6 +597,8 @@ sub cfs_write_file { $ci->{version} = undef; } + $force_utf8 = 1 if $info->{utf8}; + PVE::Tools::file_set_contents($fsname, $raw, undef, $force_utf8); } -- 2.47.3 _______________________________________________ pve-devel mailing list [email protected] https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
