michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 16:50:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Use standard function for reading an entire file

Browse Source
This commit is contained in:
Jamie Cameron
2021-03-27 12:55:32 -07:00
parent e6017f7761
commit cbfeb6aa01
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
webmin/gnupg-lib.pl
View File

@@ -159,7 +159,7 @@ while(1) {
close($fh);
&reset_environment();
unlink($srcfile);
my $dst = &read_entire_file($dstfile);
my $dst = &read_file_contents($dstfile);
unlink($dstfile);
if ($dst) {
${$_[1]} = $dst;
@@ -207,7 +207,7 @@ while(1) {
close($fh);
&reset_environment();
unlink($srcfile);
my $dst = &read_entire_file($dstfile);
my $dst = &read_file_contents($dstfile);
unlink($dstfile);
if (!$keyid) {
return $text{'gnupg_ecryptid'};
@@ -272,7 +272,7 @@ while(1) {
}
close($fh);
unlink($srcfile);
my $dst = &read_entire_file($dstfile);
my $dst = &read_file_contents($dstfile);
unlink($dstfile);
if ($error || $seen_pass > 1) {
return "<pre>$wait_for_input</pre>";
@@ -333,18 +333,6 @@ else {
}
}
# read_entire_file(file)
sub read_entire_file
{
my ($rv, $buf);
open(FILE, "<".$_[0]) || return undef;
while(read(FILE, $buf, 1024) > 0) {
$rv .= $buf;
}
close(FILE);
return $rv;
}
# write_entire_file(file, data)
sub write_entire_file
{