From 96b979715897ac02d1bcbd472c569b0a103f7641 Mon Sep 17 00:00:00 2001
From: filatov <filatov@5a941883-869f-0410-b6e7-a816b635d326>
Date: Thu, 21 Jul 2016 15:46:09 +0000
Subject: [PATCH] fix a bug in cstrlastpathelement

---
 tools/itscertgen/cshared/cshared.vcxproj | 8 ++++----
 tools/itscertgen/cshared/cstr.c          | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/tools/itscertgen/cshared/cshared.vcxproj b/tools/itscertgen/cshared/cshared.vcxproj
index c11a01283..653eaa315 100644
--- a/tools/itscertgen/cshared/cshared.vcxproj
+++ b/tools/itscertgen/cshared/cshared.vcxproj
@@ -59,12 +59,12 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)build\MSVC-$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\MSVC-$(Configuration)\obj\$(ProjectName)\</IntDir>
+    <OutDir>$(SolutionDir)build\msvc\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\msvc\$(Configuration)\$(ProjectName)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)build\MSVC-$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)build\MSVC-$(Configuration)\obj\$(ProjectName)\</IntDir>
+    <OutDir>$(SolutionDir)build\msvc\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\msvc\$(Configuration)\$(ProjectName)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/tools/itscertgen/cshared/cstr.c b/tools/itscertgen/cshared/cstr.c
index 41bcd923f..bd8835f51 100644
--- a/tools/itscertgen/cshared/cstr.c
+++ b/tools/itscertgen/cshared/cstr.c
@@ -243,7 +243,8 @@ const pchar_t * cstrlastpathelement(const pchar_t * str)
 	const pchar_t * p2 = pchar_rchr(str, '\\');
 	if(p<p2)p=p2;
 #endif
-	else if(p == NULL) p = str;
+	if(p == NULL) p = str;
+	else p++;
 	return p;
 }
 
-- 
GitLab