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

Don't flush files opened for reading only

Browse Source
This commit is contained in:
Jamie Cameron
2007-04-18 23:34:54 +00:00
parent 64580ce549
commit bb559d588f
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
postfix/postfix-lib.pl
View File

@@ -114,7 +114,7 @@ sub get_current_value
{
# First try to get the value from main.cf directly
my ($name,$key)=split /:/,$_[0];
my $lref = &read_file_lines($config{'postfix_config_file'});
my $lref = &read_file_lines($config{'postfix_config_file'}, 1);
my $out;
foreach my $l (@$lref) {
if ($l =~ /^\s*([a-z0-9\_]+)\s*=\s*(.*)/ &&

23
web-lib-funcs.pl
View File

@@ -1874,7 +1874,7 @@ else { splice(@lines, $_[1], 1); }
&close_tempfile(FILE);
}
# read_file_lines(file)
# read_file_lines(file, [readonly])
# Returns a reference to an array containing the lines from some file. This
# array can be modified, and will be written out when flush_file_lines()
# is called.
@@ -1894,12 +1894,14 @@ if (!$main::file_cache{$realfile}) {
}
close(READFILE);
$main::file_cache{$realfile} = \@lines;
$main::file_cache_noflush{$realfile} = $_[1];
}
return $main::file_cache{$realfile};
}
# flush_file_lines([file], [eol])
# Write out to a file previously read by read_file_lines to disk
# Write out to a file previously read by read_file_lines to disk (except
# for those marked readonly).
sub flush_file_lines
{
local $f;
@@ -1915,14 +1917,17 @@ else {
}
local $eol = $_[1] || "\n";
foreach $f (@files) {
&open_tempfile(FLUSHFILE, ">$f");
local $line;
foreach $line (@{$main::file_cache{$f}}) {
(print FLUSHFILE $line,$eol) ||
&error(&text("efilewrite", $f, $!));
}
&close_tempfile(FLUSHFILE);
if (!$main::file_cache_noflush{$f}) {
&open_tempfile(FLUSHFILE, ">$f");
local $line;
foreach $line (@{$main::file_cache{$f}}) {
(print FLUSHFILE $line,$eol) ||
&error(&text("efilewrite", $f, $!));
}
&close_tempfile(FLUSHFILE);
}
delete($main::file_cache{$f});
delete($main::file_cache_noflush{$f});
}
}