Merge pull request #3 from sakura-editor/master

2021-01-02 09:32:29

Author: EldersJavas

sakura_core/CBackupAgent.cpp

@@ -445,34 +445,26 @@ bool CBackupAgent::FormatBackUpPath(
 		}
 
 	}else{ // 詳細設定使用する
-		WCHAR szFormat[1024];
-
+		SYSTEMTIME time = {};
 		switch( bup_setting.GetBackupTypeAdv() ){
 		case 4:	//	ファイルの日付，時刻
 			{
 				// 2005.10.20 ryoji FindFirstFileを使うように変更
 				CFileTime ctimeLastWrite;
 				GetLastWriteTimestamp( target_file, &ctimeLastWrite );
-				if( !GetDateTimeFormat( szFormat, _countof(szFormat), bup_setting.m_szBackUpPathAdvanced , ctimeLastWrite.GetSYSTEMTIME() ) ){
-					return false;
-				}
+				time = ctimeLastWrite.GetSYSTEMTIME();
 			}
 			break;
 		case 2:	//	現在の日付，時刻
 		default:
-			{
-				// 2012.12.26 aroka	詳細設定のファイル保存日時と現在時刻で書式を合わせる
-				SYSTEMTIME	SystemTime;
-				// 2016.07.28 UTC→ローカル時刻に変更
-				::GetLocalTime(&SystemTime);			// 現在時刻を取得
-
-				if( !GetDateTimeFormat( szFormat, _countof(szFormat), bup_setting.m_szBackUpPathAdvanced , SystemTime ) ){
-					return false;
-				}
-			}
+			// 2012.12.26 aroka	詳細設定のファイル保存日時と現在時刻で書式を合わせる
+			// 2016.07.28 UTC→ローカル時刻に変更
+			::GetLocalTime( &time );			// 現在時刻を取得
 			break;
 		}
 
+		std::wstring formatString = GetDateTimeFormat( bup_setting.m_szBackUpPathAdvanced.c_str(), time );
+
 		{
 			// make keys
 			// $0-$9に対応するフォルダ名を切り出し
@@ -503,11 +495,14 @@ bool CBackupAgent::FormatBackUpPath(
 			{
 				// $0-$9を置換
 				//wcscpy( szNewPath, L"" );
-				WCHAR *q= szFormat;
-				WCHAR *q2 = szFormat;
+				WCHAR *q = formatString.data();
+				WCHAR *q2 = q;
 				while( *q ){
 					if( *q==L'$' ){
 						++q;
+						if( *q == L'\0' ){
+							break;
+						}
 						if( isdigit(*q) ){
 							q[-1] = L'\0';
 							wcscat( szNewPath, q2 );

sakura_core/doc/CDocFileOperation.cpp

@@ -269,14 +269,10 @@ bool CDocFileOperation::SaveFileDialog(
 	if( pSaveInfo->cFilePath[0] == L'\0' ){
 		SYSTEMTIME localTime = {};
 		::GetLocalTime( &localTime );
-		WCHAR dateTimeString[20] = {};
-		if( !GetDateTimeFormat( dateTimeString, _countof(dateTimeString), L"_%Y%m%d_%H%M%S", localTime ) ){
-			dateTimeString[0] = L'\0';
-		}
-
+		auto dateTimeString = GetDateTimeFormat( L"_%Y%m%d_%H%M%S", localTime );
 		const EditNode* node = CAppNodeManager::getInstance()->GetEditNode( m_pcDocRef->m_pcEditWnd->GetHwnd() );
 		const int nId = (node != NULL && 0 < node->m_nId) ? node->m_nId : 0;
-		auto_sprintf_s( pSaveInfo->cFilePath, pSaveInfo->cFilePath.GetBufferCount(), L"%s%.0d%s", LS(STR_NO_TITLE2), nId, dateTimeString );
+		auto_sprintf_s( pSaveInfo->cFilePath, pSaveInfo->cFilePath.GetBufferCount(), L"%s%.0d%s", LS(STR_NO_TITLE2), nId, dateTimeString.c_str() );
 	}
 
 	// ダイアログを表示

sakura_core/util/format.cpp

@@ -26,78 +26,61 @@
 #include "StdAfx.h"
 #include "format.h"
 
-/*!	日時をフォーマット
+/*!	書式文字列に従い日時を変換
 
-	@param[out] 書式変換後の文字列
-	@param[in] バッファサイズ
-	@param[in] format 書式
+	@param[in] format 書式文字列
 	@param[in] systime 書式化したい日時
-	@return bool true
-
-	@note  %Y %y %m %d %H %M %S の変換に対応
-
-	@author aroka
-	@date 2005.11.21 新規
-	
-	@todo 出力バッファのサイズチェックを行う
+	@return 書式変換後の文字列
+
+	@note 書式文字列では以下の変換指定子が使用できます。
+	@li "%Y" 西暦
+	@li "%y" 下2桁の西暦
+	@li "%m" 2桁の月
+	@li "%d" 2桁の日
+	@li "%H" 2桁の時
+	@li "%M" 2桁の分
+	@li "%S" 2桁の秒
+	@note 書式文字列は末尾または最初のnull文字までを変換対象とします。
 */
-bool GetDateTimeFormat( WCHAR* szResult, int size, const WCHAR* format, const SYSTEMTIME& systime )
+std::wstring GetDateTimeFormat( std::wstring_view format, const SYSTEMTIME& systime )
 {
-	WCHAR szTime[10];
-	const WCHAR *p = format;
-	WCHAR *q = szResult;
-	int len;
-	
-	while( *p ){
-		if( *p == L'%' ){
-			++p;
-			switch(*p){
-			case L'Y':
-				len = wsprintf(szTime,L"%d",systime.wYear);
-				wcscpy( q, szTime );
-				break;
-			case L'y':
-				len = wsprintf(szTime,L"%02d",(systime.wYear%100));
-				wcscpy( q, szTime );
-				break;
-			case L'm':
-				len = wsprintf(szTime,L"%02d",systime.wMonth);
-				wcscpy( q, szTime );
-				break;
-			case L'd':
-				len = wsprintf(szTime,L"%02d",systime.wDay);
-				wcscpy( q, szTime );
-				break;
-			case L'H':
-				len = wsprintf(szTime,L"%02d",systime.wHour);
-				wcscpy( q, szTime );
-				break;
-			case L'M':
-				len = wsprintf(szTime,L"%02d",systime.wMinute);
-				wcscpy( q, szTime );
-				break;
-			case L'S':
-				len = wsprintf(szTime,L"%02d",systime.wSecond);
-				wcscpy( q, szTime );
-				break;
-				// A Z
-			case L'%':
-			default:
-				*q = *p;
-				len = 1;
-				break;
+	std::wstring result;
+	wchar_t str[6] = {};
+	bool inSpecifier = false;
+
+	result.reserve( format.length() * 2 );
+
+	for( const auto f : format ){
+		if( inSpecifier ){
+			inSpecifier = false;
+			if( f == L'Y' ){
+				swprintf( str, _countof(str), L"%d", systime.wYear );
+			}else if( f == L'y' ){
+				swprintf( str, _countof(str), L"%02d", systime.wYear % 100 );
+			}else if( f == L'm' ){
+				swprintf( str, _countof(str), L"%02d", systime.wMonth );
+			}else if( f == L'd' ){
+				swprintf( str, _countof(str), L"%02d", systime.wDay );
+			}else if( f == L'H' ){
+				swprintf( str, _countof(str), L"%02d", systime.wHour );
+			}else if( f == L'M' ){
+				swprintf( str, _countof(str), L"%02d", systime.wMinute );
+			}else if( f == L'S' ){
+				swprintf( str, _countof(str), L"%02d", systime.wSecond );
+			}else{
+				swprintf( str, _countof(str), L"%c", f );
 			}
-			q+=len;//q += strlen(szTime);
-			++p;
-		}
-		else{
-			*q = *p;
-			q++;
-			p++;
+			result.append( str );
+		}else if( f == L'%' ){
+			inSpecifier = true;
+		}else if( f == L'\0' ){
+			break;
+		}else{
+			result.push_back( f );
 		}
 	}
-	*q = *p;
-	return true;
+
+	return result;
 }
 
 /*!	バージョン番号の解析

sakura_core/util/format.h

@@ -27,8 +27,11 @@
 #define SAKURA_FORMAT_A006AC9B_ADE2_499D_9CC6_00A649F32B4F_H_
 #pragma once
 
+#include <string>
+#include <string_view>
+
 // 20051121 aroka
-bool GetDateTimeFormat( WCHAR* szResult, int size, const WCHAR* format, const SYSTEMTIME& systime );
+std::wstring GetDateTimeFormat( std::wstring_view format, const SYSTEMTIME& systime );
 UINT32 ParseVersion( const WCHAR* ver );	//バージョン番号の解析
 int CompareVersion( const WCHAR* verA, const WCHAR* verB );	//バージョン番号の比較
 #endif /* SAKURA_FORMAT_A006AC9B_ADE2_499D_9CC6_00A649F32B4F_H_ */

tests/unittests/test-format.cpp

@@ -0,0 +1,63 @@
+/*! @file */
+/*
+	Copyright (C) 2018-2020 Sakura Editor Organization
+
+	This software is provided 'as-is', without any express or implied
+	warranty. In no event will the authors be held liable for any damages
+	arising from the use of this software.
+
+	Permission is granted to anyone to use this software for any purpose,
+	including commercial applications, and to alter it and redistribute it
+	freely, subject to the following restrictions:
+
+		1. The origin of this software must not be misrepresented;
+		   you must not claim that you wrote the original software.
+		   If you use this software in a product, an acknowledgment
+		   in the product documentation would be appreciated but is
+		   not required.
+
+		2. Altered source versions must be plainly marked as such,
+		   and must not be misrepresented as being the original software.
+
+		3. This notice may not be removed or altered from any source
+		   distribution.
+*/
+#include <gtest/gtest.h>
+#include <Windows.h>
+#include "util/format.h"
+
+/*!
+ * @brief GetDateTimeFormatのテスト
+ */
+TEST( format, GetDateTimeFormat )
+{
+	SYSTEMTIME time = {};
+
+	// 変換指定子の解釈
+	auto result1 = GetDateTimeFormat( L"%%-%1-%", time );
+	ASSERT_STREQ( L"%-1-", result1.c_str() );
+
+	// 数字桁数少
+	time.wYear = 1;
+	time.wMonth = 2;
+	time.wDay = 3;
+	time.wHour = 1;
+	time.wMinute = 2;
+	time.wSecond = 3;
+	auto result2 = GetDateTimeFormat( L"%Y-%y-%m-%d %H:%M:%S", time );
+	ASSERT_STREQ( L"1-01-02-03 01:02:03", result2.c_str() );
+
+	// 数字桁数多
+	time.wYear = 12345;
+	time.wMonth = 12;
+	time.wDay = 23;
+	time.wHour = 12;
+	time.wMinute = 34;
+	time.wSecond = 56;
+	auto result3 = GetDateTimeFormat( L"%Y-%y-%m-%d %H:%M:%S", time );
+	ASSERT_STREQ( L"12345-45-12-23 12:34:56", result3.c_str() );
+
+	// 途中にnull文字
+	auto result4 = GetDateTimeFormat( L"%Y-%y-%m-%d\0%H:%M:%S", time );
+	ASSERT_STREQ( L"12345-45-12-23", result4.c_str() );
+}

tests/unittests/tests1.vcxproj

@@ -114,6 +114,7 @@
     <ClCompile Include="test-cprofile.cpp" />
     <ClCompile Include="test-editinfo.cpp" />
     <ClCompile Include="test-file.cpp" />
+    <ClCompile Include="test-format.cpp" />
     <ClCompile Include="test-grepinfo.cpp" />
     <ClCompile Include="test-int2dec.cpp" />
     <ClCompile Include="test-is_mailaddress.cpp" />

tests/unittests/tests1.vcxproj.filters

@@ -11,6 +11,11 @@
       <UniqueIdentifier>{0eefa0df-ca7f-489c-9844-9a182e1dba18}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
+  <ItemGroup Condition="Exists('$(VCInstallDir)\Auxiliary\VS\include\CodeCoverage\CodeCoverage.h')">
+    <ClCompile Include="coverage.cpp">
+      <Filter>Other Files</Filter>
+    </ClCompile>
+  </ItemGroup>
   <ItemGroup>
     <Text Include="CMakeLists.txt">
       <Filter>Other Files</Filter>
@@ -56,9 +61,6 @@
     <ClCompile Include="test-grepinfo.cpp">
       <Filter>Test Files</Filter>
     </ClCompile>
-    <ClCompile Include="coverage.cpp">
-      <Filter>Other Files</Filter>
-    </ClCompile>
     <ClCompile Include="test-loadstring.cpp">
       <Filter>Test Files</Filter>
     </ClCompile>
@@ -83,6 +85,9 @@
     <ClCompile Include="test-file.cpp">
       <Filter>Test Files</Filter>
     </ClCompile>
+    <ClCompile Include="test-format.cpp">
+      <Filter>Test Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="StartEditorProcessForTest.h">