Here's a possible fix - pls see attachments (also a fix for Bug#470089).
--
paolo
GPG/PGP id:0x3A47DE45 - B5F9 AAA0 44BD 2B63 81E0 971F C6C0 0B87 3A47 DE45
- 9/11: the outrageous deception and ongoing coverup: http://911review.org -
--- cmd.tcl 2008-03-09 01:39:38.000000000 +0100
+++ /usr/lib/filerunner/cmd.tcl 2008-03-09 01:30:46.000000000 +0100
@@ -120,9 +120,15 @@
set glob(forceupdate) 1
Try { FTP_PutFile $ftpI $frompwd/[lindex $elem 1] $directory/[lindex
$elem 1] [lindex $elem 3] } "" 1
} else {
- if {[CheckWhoOwns $topwd/[lindex $elem 1] overwrite]} {
- Try { file copy -force -- $frompwd/[lindex $elem 1] $topwd } "" 1
+ if {[CheckWhoOwns $topwd/[lindex $elem 1] overwrite] &&
+ [CheckRead $frompwd/[lindex $elem 1]]} {
+ if {[file exists $topwd/[lindex $elem 1]]} {
+ set r [tk_dialog_fr .apop "!" \
+ "File:\n\n[lindex $elem 1]\n\nalready exists in destination
directory.\nOverwrite?" "" 1 "Yes" "No"]
+ if {$r != 0} {return 1}
+ }
}
+ Try { file copy -force -- $frompwd/[lindex $elem 1] $topwd } "" 1
}
}
d {
--- fr 2008-03-09 01:42:34.000000000 +0100
+++ /usr/lib/filerunner/fr 2008-03-09 01:26:29.000000000 +0100
@@ -71,10 +71,17 @@
proc ShowWindow {} {
global glob tk_version argv argv0 config env win
+ set pw [winfo parent .]
+ if {$pw == ""} {set pw "."}
+ set wmxs [wm maxsize $pw]
+ wm maxsize . [lindex $wmxs 0] [lindex $wmxs 1]
+ wm minsize . 600 440
+ #puts stderr "[lindex $wmxs 0] [lindex $wmxs 1] [winfo vrootwidth .] [winfo
vrootheight .]"
wm positionfrom . user
wm sizefrom . ""
wm title . "FileRunner v$glob(version)"
wm geometry . $config(geometry,main)
+ #puts stderr "[winfo reqwidth .] [winfo reqheight .] $config(geometry,main)"
wm protocol . WM_DELETE_WINDOW { CleanUp 0 }
wm iconname . "FileRunner v$glob(version)"
wm command . [concat $argv0 $argv]
@@ -2961,7 +2968,7 @@
set text "$text\n\n...etc..."
}
label $w.msg -justify left -text $text \
- -font $config(gui,font) -wraplength 700
+ -font $config(gui,font) -wraplength 700 -bg white
#-Adobe-Times-Medium-R-Normal--*-180-*-*-*-*-*-*
pack $w.msg -in $w.top -side right -expand 1 -fill both -padx 3m -pady 3m
if {$bitmap != ""} {
@@ -2977,12 +2984,12 @@
if {$i == $default} {
frame $w.default -relief sunken -bd 1
raise $w.button$i $w.default
- pack $w.default -in $w.bot -side left -expand 1 -padx 3m -pady 2m
- pack $w.button$i -in $w.default -padx 2m -pady 2m
+ pack $w.default -in $w.bot -side left -expand 1 -padx 2m -pady 1m
+ pack $w.button$i -in $w.default -padx 1m -pady 1m
bind $w <Return> "$w.button$i flash; set tkPriv(button) $i"
} else {
pack $w.button$i -in $w.bot -side left -expand 1 \
- -padx 3m -pady 2m
+ -padx 2m -pady 1m
}
incr i
}
@@ -3355,10 +3362,20 @@
return $a
}
+proc CheckRead { file } {
+ set fr [file readable $file]
+ if {$fr == 1} {
+ return 1
+ }
+ PopErrorSimple "File\n\n'$file'\n\nnot readable (by you)."
+ return $fr
+}
+
proc CheckOwner { file } {
if {! [file exists $file]} {
return 1
}
+ PopErrorSimple "File\n\n'$file'\n\nnot owned by you."
return [file owned $file]
}
