From 4435ed85c3acb4df42135e009b133fb8e9d2f09c Mon Sep 17 00:00:00 2001
From: Michael Krelin <hacker@klever.net>
Date: Sun, 12 Sep 2004 11:46:21 +0000
Subject: quick fix to the backslash conversion problem.

git-svn-id: http://svn.klever.net/kin/pumpkin/trunk@46 fe716a7a-6dde-0310-88d9-d003556173a8
---
diff --git a/PumpKINDlg.cpp b/PumpKINDlg.cpp
index 1e6d03f..0b3bf41 100644
--- a/PumpKINDlg.cpp
+++ b/PumpKINDlg.cpp
@@ -1218,9 +1218,13 @@ BOOL CWRQSocket::Create(LPCTSTR localFile,LPCTSTR hostName)
 	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);
diff --git a/install/install.cpp b/install/install.cpp
index 62f1e20..6fa4ae4 100644
--- a/install/install.cpp
+++ b/install/install.cpp
@@ -1,7 +1,7 @@
 #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)
diff --git a/install/install.rc b/install/install.rc
index b1a3037..30907ad 100644
--- a/install/install.rc
+++ b/install/install.rc
@@ -131,8 +131,8 @@ IDI_ICON                ICON    DISCARDABLE     "../shared-data/install-icon.ico
 //
 
 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
@@ -149,13 +149,13 @@ BEGIN
         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"
diff --git a/pumpkin.rc b/pumpkin.rc
index 67e5b24..7380e12 100644
--- a/pumpkin.rc
+++ b/pumpkin.rc
@@ -82,7 +82,7 @@ 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
@@ -286,8 +286,8 @@ END
 //
 
 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
@@ -304,13 +304,13 @@ BEGIN
         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"
--
cgit v0.9.0.2