quick fix to the backslash conversion problem.

git-svn-id: http://svn.klever.net/kin/pumpkin/trunk@46 fe716a7a-6dde-0310-88d9-d003556173a8

4 files changed, 16 insertions, 12 deletions

diff --git a/PumpKINDlg.cpp b/PumpKINDlg.cpp
index 1e6d03f..0b3bf41 100644
--- a/PumpKINDlg.cpp
+++ b/PumpKINDlg.cpp
@@ -1213,19 +1213,23 @@ CWRQSocket::CWRQSocket(CPumpKINDlg* daddy,LPCTSTR fileName,LPCTSTR type,SOCKADDR
 

 BOOL CWRQSocket::Create(LPCTSTR localFile,LPCTSTR hostName)

 {

 	if(!CAsyncSocket::Create(0,SOCK_DGRAM))

 		return FALSE;

 	ASSERT(m_Daddy);

 	ASSERT(m_Peer.sin_addr.s_addr!=INADDR_NONE || hostName);

 	m_Daddy->m_Xfers[m_hSocket]=this;

-	TurnSlashes(m_FileName,TRUE);

 	UpdateList();

-CString fn = localFile?ApplyRootGently(localFile):ApplyRoot(m_FileName);

+CString lf;

+ 	if(!localFile) {

+		lf = m_FileName;

+		TurnSlashes(lf,TRUE);

+	}

+CString fn = localFile?ApplyRootGently(localFile):ApplyRoot(lf);

 	if(!localFile){	// This is an incoming request..

 		if(CheckBadRelativeness(m_FileName)){

 			Deny(tftp::errAccessViolation,IDS_TFTP_ERROR_ACCESS);

 			return TRUE;

 		}

 	BOOL exists;

 		if(!_access((LPCTSTR)fn,0))

 			m_Rename=exists=TRUE;

diff --git a/install/install.cpp b/install/install.cpp
index 62f1e20..6fa4ae4 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -1,12 +1,12 @@
 #include "resource.h"
 #include "../shared-code/install.h"

 

-#define	KINAME "PumpKIN 2.5"

+#define	KINAME "PumpKIN 2.5.1-trunk"

 #define SKINAME "PumpKIN"
 
 BOOL Install(void)
 {
 STRING dPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group",SKINAME "Path");

 STRING kPath = strFETCH_REG_KEY(HKEY_LOCAL_MACHINE,"Software\\Klever Group","KINPath");

 LPCSTR qPath = ((LPCSTR)dPath)?(LPCSTR)dPath:(((LPCSTR)kPath)?(LPSTR)kPath:"C:\\Program Files\\Klever\\Nothings");

 STRING path = REQUESTPATH("  " KINAME,"\nEnter destination path:",qPath);

diff --git a/install/install.rc b/install/install.rc
index b1a3037..30907ad 100644
--- a/install/install.rc
+++ b/install/install.rc
@@ -126,41 +126,41 @@ IDI_ICON                ICON    DISCARDABLE     "../shared-data/install-icon.ico
 

 #ifndef _MAC

 /////////////////////////////////////////////////////////////////////////////

 //

 // Version

 //

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 2,5,0,0

- PRODUCTVERSION 2,5,0,0

+ FILEVERSION 2,5,1,0

+ PRODUCTVERSION 2,5,1,0

  FILEFLAGSMASK 0x3fL

 #ifdef _DEBUG

  FILEFLAGS 0x1L

 #else

  FILEFLAGS 0x0L

 #endif

  FILEOS 0x40004L

  FILETYPE 0x1L

  FILESUBTYPE 0x0L

 BEGIN

     BLOCK "StringFileInfo"

     BEGIN

         BLOCK "040904b0"

         BEGIN

             VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"

             VALUE "FileDescription", "INSTALL: PumpKIN, tftp client/daemon\0"

-            VALUE "FileVersion", "2, 5, 0, 0\0"

+            VALUE "FileVersion", "2, 5, 1, 0\0"

             VALUE "InternalName", "INSTALL\0"

             VALUE "LegalCopyright", "Copyright © 1997-2004 Klever Group (http://www.klever.net/)\0"

             VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"

             VALUE "OriginalFilename", "INSTALL.EXE\0"

             VALUE "ProductName", "PumpKIN\0"

-            VALUE "ProductVersion", "2, 5, 0, 0\0"

+            VALUE "ProductVersion", "2, 5, 1, 0\0"

         END

     END

     BLOCK "VarFileInfo"

     BEGIN

         VALUE "Translation", 0x409, 1200

     END

 END

 

diff --git a/pumpkin.rc b/pumpkin.rc
index 67e5b24..7380e12 100644
--- a/pumpkin.rc
+++ b/pumpkin.rc
@@ -77,17 +77,17 @@ IDI_PLAY                ICON    DISCARDABLE     "shared-data/play-icon.ico"
 //

 

 IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 217, 74

 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU

 CAPTION "About PumpKIN"

 FONT 8, "MS Sans Serif"

 BEGIN

     ICON            IDR_MAINFRAME,IDC_STATIC,7,17,18,20

-    LTEXT           "PumpKIN, Version 2.5",IDC_STATIC,40,15,119,8,SS_NOPREFIX

+    LTEXT           "PumpKIN, Version 2.5.1-trunk",IDC_STATIC,40,15,119,8,SS_NOPREFIX

     LTEXT           "Copyright © 1997-2004 Klever Group",IDC_STATIC,40,30,170,

                     8

     DEFPUSHBUTTON   "OK",IDOK,178,7,32,14,WS_GROUP

     PUSHBUTTON      "http://www.klever.net/",IDC_KLEVERNET,124,53,86,14

 END

 

 IDD_PUMPKIN_DIALOG DIALOGEX 0, 0, 362, 191

 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | 

@@ -281,41 +281,41 @@ END
 

 #ifndef _MAC

 /////////////////////////////////////////////////////////////////////////////

 //

 // Version

 //

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 2,5,0,0

- PRODUCTVERSION 2,5,0,0

+ FILEVERSION 2,5,1,0

+ PRODUCTVERSION 2,5,1,0

  FILEFLAGSMASK 0x3fL

 #ifdef _DEBUG

  FILEFLAGS 0x1L

 #else

  FILEFLAGS 0x0L

 #endif

  FILEOS 0x4L

  FILETYPE 0x1L

  FILESUBTYPE 0x0L

 BEGIN

     BLOCK "StringFileInfo"

     BEGIN

         BLOCK "040904b0"

         BEGIN

             VALUE "CompanyName", "Klever Group (http://www.klever.net/)\0"

             VALUE "FileDescription", "PumpKIN, tftp client/daemon\0"

-            VALUE "FileVersion", "2, 5, 0, 0\0"

+            VALUE "FileVersion", "2, 5, 1, 0\0"

             VALUE "InternalName", "PUMPKIN\0"

             VALUE "LegalCopyright", "Copyright © 1997-2004 Klever Group (http://www.klever.net)\0"

             VALUE "LegalTrademarks", "Klever Group (http://www.klever.net/)\0"

             VALUE "OriginalFilename", "PUMPKIN.EXE\0"

             VALUE "ProductName", "PumpKIN\0"

-            VALUE "ProductVersion", "2, 5, 0, 0\0"

+            VALUE "ProductVersion", "2, 5, 1, 0\0"

         END

     END

     BLOCK "VarFileInfo"

     BEGIN

         VALUE "Translation", 0x409, 1200

     END

 END