3.2.1

WinSCP3.bpr

@@ -88,8 +88,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=2
-Release=0
-Build=173
+Release=1
+Build=174
 Debug=0
 PreRelease=0
 Special=0
@@ -101,13 +101,13 @@ CodePage=1252
 [Version Info Keys]
 CompanyName=Martin Prikryl
 FileDescription=Windows SCP/SFTP client
-FileVersion=3.2.0.173
+FileVersion=3.2.1.174
 InternalName=winscp3
 LegalCopyright=(c) 2000-2003 Martin Prikryl
 LegalTrademarks=
-OriginalFilename=winscp320.exe
+OriginalFilename=winscp321.exe
 ProductName=WinSCP
-ProductVersion=3.2.0.0
+ProductVersion=3.2.1.0
 
 [Compiler]
 ShowInfoMsgs=1

core/SftpFileSystem.cpp

@@ -1856,13 +1856,16 @@ int __fastcall TSFTPFileSystem::SFTPOpenRemote(void * AOpenParams, void * /*Para
     try
     {
       OpenRequest.ChangeType(SSH_FXP_OPEN);
-      OpenType = 0;
       if (FTerminal->Configuration->ConfirmOverwriting &&
           !OpenType && !OperationProgress->YesToAll && !OpenParams->Resume &&
           !(OpenParams->Params & cpNoConfirmation))
       {
         OpenType |= SSH_FXF_EXCL;
       }
+      else
+      {
+        OpenType &= ~SSH_FXF_EXCL;
+      }
       if (!OpenParams->Resume)
       {
         OpenType |= SSH_FXF_TRUNC;

forms/ImportSessions.dfm

@@ -23,10 +23,10 @@ object ImportSessionsDialog: TImportSessionsDialog
     Height = 65
     Anchors = [akLeft, akTop, akRight]
     AutoSize = False
-    Caption = 
+    Caption =
       'Following list contains sessions stored in PuTTY SSH client. Che' +
-      'ck sessions you want to import and press OK button. '#13#10#13#10'Notice: ' +
-      'This application always connects using SSH protocol.'
+      'ck sessions you want to import and press OK button. '#13#10 +
+      #13#10'Notice: This application always connects using SSH protocol.'
     WordWrap = True
   end
   object OKButton: TButton

putty/README.TXT

@@ -1,34 +1,34 @@
-PuTTY README
-============
-
-This is the README file for the PuTTY installer distribution. If
-you're reading this, you've probably just run our installer and
-installed PuTTY on your system.
-
-What should I do next?
-----------------------
-
-If you want to use PuTTY to connect to other computers, or use PSFTP
-to transfer files, you should just be able to run them from the
-Start menu.
-
-If you want to use the command-line-only file transfer utility PSCP,
-you will probably want to put the PuTTY installation directory to be
-on your PATH. How you do this depends on your version of Windows. On
-Windows NT and 2000, you can set it using Control Panel > System; on
-Windows 95 you will need to edit AUTOEXEC.BAT. Consult your Windows
-manuals for details.
-
-What do I do if it doesn't work?
---------------------------------
-
-The PuTTY home web site is
-
-    http://www.chiark.greenend.org.uk/~sgtatham/putty/
-
-Here you will find our list of known bugs and pending feature
-requests. If your problem is not listed in there, or in the FAQ, or
-in the manuals, read the Feedback page to find out how to report
-bugs to us. PLEASE read the Feedback page carefully: it is there to
-save you time as well as us. Do not send us one-line bug reports
-telling us `it doesn't work'.
+PuTTY README
+============
+
+This is the README file for the PuTTY installer distribution. If
+you're reading this, you've probably just run our installer and
+installed PuTTY on your system.
+
+What should I do next?
+----------------------
+
+If you want to use PuTTY to connect to other computers, or use PSFTP
+to transfer files, you should just be able to run them from the
+Start menu.
+
+If you want to use the command-line-only file transfer utility PSCP,
+you will probably want to put the PuTTY installation directory to be
+on your PATH. How you do this depends on your version of Windows. On
+Windows NT and 2000, you can set it using Control Panel > System; on
+Windows 95 you will need to edit AUTOEXEC.BAT. Consult your Windows
+manuals for details.
+
+What do I do if it doesn't work?
+--------------------------------
+
+The PuTTY home web site is
+
+    http://www.chiark.greenend.org.uk/~sgtatham/putty/
+
+Here you will find our list of known bugs and pending feature
+requests. If your problem is not listed in there, or in the FAQ, or
+in the manuals, read the Feedback page to find out how to report
+bugs to us. PLEASE read the Feedback page carefully: it is there to
+save you time as well as us. Do not send us one-line bug reports
+telling us `it doesn't work'.

putty/TESTBACK.C

@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: testback.c,v 1.9 2003/05/10 11:57:55 ben Exp $ */
 /*
  * Copyright (c) 1999 Simon Tatham
  * Copyright (c) 1999 Ben Harris

putty/charset/MACENC.C

@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: macenc.c,v 1.2 2003/01/25 19:21:56 ben Exp $ */
 /*
  * Copyright (c) 2003 Ben Harris
  * All rights reserved.