diff -u3pr src/daemon/common/commonInteractive.ml src/daemon/common/commonInteractive.ml --- src/daemon/common/commonInteractive.ml Wed Sep 14 18:03:33 2005 +++ src/daemon/common/commonInteractive.ml Sat Sep 17 08:56:54 2005 @@ -75,7 +75,10 @@ let canonize_basename name = Charset.add_uchar buf uc' end done; - Charset.to_locale (Buffer.contents buf) + if Sys.os_type <> "Win32" then + Charset.to_locale (Buffer.contents buf) + else + Buffer.contents buf let file_commited_name incoming_dir file = let network = file_network file in diff -u3pr src/networks/donkey/donkeyInteractive.ml src/networks/donkey/donkeyInteractive.ml --- src/networks/donkey/donkeyInteractive.ml Wed Sep 14 18:03:38 2005 +++ src/networks/donkey/donkeyInteractive.ml Sat Sep 17 08:57:42 2005 @@ -754,7 +754,7 @@ function submitRenameForm(i) { var formID = document.getElementById(\\\"renameForm\\\" + i) var regExp = new RegExp (' ', 'gi') ; var renameTextOut = formID.newName.value.replace(regExp, '+'); -parent.fstatus.location.href='submit?q=rename+'+i+'+\\\"'+renameTextOut+'\\\"'; +parent.fstatus.location.href='submit?q=rename+'+i+'+\\\"'+encodeURI(renameTextOut)+'\\\"'; } //--\\> \\"; @@ -1235,7 +1235,7 @@ function submitRenameForm(i) { var formID = document.getElementById(\\\"renameForm\\\" + i) var regExp = new RegExp (' ', 'gi') ; var renameTextOut = formID.newName.value.replace(regExp, '+'); -parent.fstatus.location.href='submit?q=rename+%d+\\\"'+renameTextOut+'\\\"'; +parent.fstatus.location.href='submit?q=rename+%d+\\\"'+encodeURI(renameTextOut)+'\\\"'; } //--\\> \\" (file_num file)