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

Fixed rename failure bug

Browse Source
This commit is contained in:
Jamie Cameron
2007-05-03 23:26:05 +00:00
parent d07650c0e7
commit f4c92f1554
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
web-lib-funcs.pl
View File

@@ -946,7 +946,9 @@ return @pids;
# to the name of the operation that failed.
sub error
{
print STDERR "Error: ",@_,"\n";
if (!$main::error_must_die) {
print STDERR "Error: ",@_,"\n";
}
&load_theme_library();
if ($main::error_must_die) {
die @_;
@@ -3502,7 +3504,8 @@ while(1) {
last;
}
}
if (kill('TERM', $pid)) {
close(OUT);
if (kill('TERM', $pid) && time() - $start >= $_[1]) {
$timed_out = 1;
}
close(OUT);
@@ -3570,7 +3573,7 @@ if (&is_readonly_mode()) {
}
local $ok = rename(&translate_filename($_[0]),
&translate_filename($_[1]));
if (!$ok) {
if (!$ok && $! !~ /permission/i) {
# Try the mv command, in case this is a cross-filesystem rename
if ($gconfig{'os_type'} eq 'windows') {
# Need to use rename