Grep機能の改善

sakura_core/_main/CCommandLine.cpp

@@ -12,7 +12,7 @@
 	Copyright (C) 2005, D.S.Koba, genta, susu
 	Copyright (C) 2006, ryoji
 	Copyright (C) 2007, ryoji
-	Copyright (C) 2018-2022, Sakura Editor Organization
+	Copyright (C) 2018-2026, Sakura Editor Organization
 
 	This source code is designed for sakura editor.
 	Please contact the copyright holder to use this code for other purpose.
@@ -274,17 +274,18 @@ void CCommandLine::ParseCommandLine( LPCWSTR pszCmdLineSrc, bool bResponse )
 	}
 
 	CNativeW cmResponseFile = L"";
-	LPWSTR pszCmdLineWork = new WCHAR[lstrlen( pszCmdLineSrc ) + 1];
-	wcscpy( pszCmdLineWork, pszCmdLineSrc );
-	int nCmdLineWorkLen = lstrlen( pszCmdLineWork );
+	const int nCmdLineWorkSize = lstrlen( pszCmdLineSrc ) + 1;
+	LPWSTR pszCmdLineWork = new WCHAR[nCmdLineWorkSize];
+	wcscpy_s( pszCmdLineWork, nCmdLineWorkSize, pszCmdLineSrc );
+	int nCmdLineWorkLen = nCmdLineWorkSize - 1;
 	LPWSTR pszToken = my_strtok<WCHAR>( pszCmdLineWork, nCmdLineWorkLen, &nPos, L" " );
 	while( pszToken != nullptr )
 	{
 		DEBUG_TRACE( L"OPT=[%s]\n", pszToken );
 
 		//	2007.09.09 genta オプション判定ルール変更．オプション解析停止と""で囲まれたオプションを考慮
-		if( ( bParseOptDisabled ||
-			! (pszToken[0] == '-' || (pszToken[0] == '"' && pszToken[1] == '-')) )){
+		if( bParseOptDisabled ||
+			! (pszToken[0] == '-' || (pszToken[0] == '"' && pszToken[1] == '-')) ){
 
 			if( pszToken[0] == L'\"' ){
 				CNativeW cmWork;
@@ -484,6 +485,8 @@ void CCommandLine::ParseCommandLine( LPCWSTR pszCmdLineSrc, bool bResponse )
 						m_gi.bGrepPaste = true;	break;
 					case 'O':
 						m_gi.bGrepBackup = true;	break;
+					case 'E':
+						m_gi.bGrepExcludeFileRegexp = true;	break;
 					default:
 						break;
 					}

sakura_core/_main/CControlTray.cpp

@@ -150,18 +150,19 @@ void CControlTray::DoGrepCreateWindow(HINSTANCE hinst, HWND msgParent, CDlgGrep&
 
 	//GOPTオプション
 	WCHAR pOpt[64] = L"";
-	if( cDlgGrep.m_bSubFolder					)wcscat( pOpt, L"S" );	// サブフォルダーからも検索する
-	if( cDlgGrep.m_sSearchOption.bLoHiCase		)wcscat( pOpt, L"L" );	// 英大文字と英小文字を区別する
-	if( cDlgGrep.m_sSearchOption.bRegularExp	)wcscat( pOpt, L"R" );	// 正規表現
-	if( cDlgGrep.m_nGrepOutputLineType == 1     )wcscat( pOpt, L"P" );	// 行を出力する
-	if( cDlgGrep.m_nGrepOutputLineType == 2     )wcscat( pOpt, L"N" );	// 否ヒット行を出力する 2014.09.23
-	if( cDlgGrep.m_sSearchOption.bWordOnly		)wcscat( pOpt, L"W" );	// 単語単位で探す
-	if( 1 == cDlgGrep.m_nGrepOutputStyle		)wcscat( pOpt, L"1" );	// Grep: 出力形式
-	if( 2 == cDlgGrep.m_nGrepOutputStyle		)wcscat( pOpt, L"2" );	// Grep: 出力形式
-	if( 3 == cDlgGrep.m_nGrepOutputStyle		)wcscat( pOpt, L"3" );
-	if( cDlgGrep.m_bGrepOutputFileOnly		)wcscat( pOpt, L"F" );
-	if( cDlgGrep.m_bGrepOutputBaseFolder		)wcscat( pOpt, L"B" );
-	if( cDlgGrep.m_bGrepSeparateFolder		)wcscat( pOpt, L"D" );
+	if( cDlgGrep.m_bSubFolder					)wcscat_s( pOpt, L"S" );	// サブフォルダーからも検索する
+	if( cDlgGrep.m_sSearchOption.bLoHiCase		)wcscat_s( pOpt, L"L" );	// 英大文字と英小文字を区別する
+	if( cDlgGrep.m_sSearchOption.bRegularExp	)wcscat_s( pOpt, L"R" );	// 正規表現
+	if( cDlgGrep.m_nGrepOutputLineType == 1     )wcscat_s( pOpt, L"P" );	// 行を出力する
+	if( cDlgGrep.m_nGrepOutputLineType == 2     )wcscat_s( pOpt, L"N" );	// 否ヒット行を出力する 2014.09.23
+	if( cDlgGrep.m_sSearchOption.bWordOnly		)wcscat_s( pOpt, L"W" );	// 単語単位で探す
+	if( 1 == cDlgGrep.m_nGrepOutputStyle		)wcscat_s( pOpt, L"1" );	// Grep: 出力形式
+	if( 2 == cDlgGrep.m_nGrepOutputStyle		)wcscat_s( pOpt, L"2" );	// Grep: 出力形式
+	if( 3 == cDlgGrep.m_nGrepOutputStyle		)wcscat_s( pOpt, L"3" );
+	if( cDlgGrep.m_bGrepOutputFileOnly		)wcscat_s( pOpt, L"F" );
+	if( cDlgGrep.m_bGrepOutputBaseFolder		)wcscat_s( pOpt, L"B" );
+	if( cDlgGrep.m_bGrepSeparateFolder		)wcscat_s( pOpt, L"D" );
+	if( cDlgGrep.m_bExcludeFileRegularExp	)wcscat_s( pOpt, L"E" );	// 除外ファイルを正規表現として扱う
 	if( pOpt[0] != L'\0' ){
 		cCmdLine.AppendString( L" -GOPT=" );
 		cCmdLine.AppendString( pOpt );

sakura_core/_main/CNormalProcess.cpp

@@ -14,7 +14,7 @@
 	Copyright (C) 2007, ryoji
 	Copyright (C) 2008, Uchi
 	Copyright (C) 2009, syat, ryoji
-	Copyright (C) 2018-2022, Sakura Editor Organization
+	Copyright (C) 2018-2026, Sakura Editor Organization
 
 	This source code is designed for sakura editor.
 	Please contact the copyright holder to use this code for other purpose.
@@ -225,27 +225,30 @@ bool CNormalProcess::InitializeProcess()
 			SetMainWindow( pEditWnd->GetHwnd() );
 			::ReleaseMutex( hMutex );
 			::CloseHandle( hMutex );
-			this->m_pcEditApp->m_pcGrepAgent->DoGrep(
-				&pEditWnd->GetActiveView(),
-				gi.bGrepReplace,
-				&gi.cmGrepKey,
-				&gi.cmGrepRep,
-				&gi.cmGrepFile,
-				&gi.cmGrepFolder,
-				gi.bGrepCurFolder,
-				gi.bGrepSubFolder,
-				gi.bGrepStdout,
-				gi.bGrepHeader,
-				gi.sGrepSearchOption,
-				gi.nGrepCharSet,	//	2002/09/21 Moca
-				gi.nGrepOutputLineType,
-				gi.nGrepOutputStyle,
-				gi.bGrepOutputFileOnly,
-				gi.bGrepOutputBaseFolder,
-				gi.bGrepSeparateFolder,
-				gi.bGrepPaste,
-				gi.bGrepBackup
-			);
+			{
+				const SGrepInput grepInput{ &gi.cmGrepKey, &gi.cmGrepRep, &gi.cmGrepFile, &gi.cmGrepFolder };
+				SGrepOption sGrepOption;
+				sGrepOption.bGrepReplace = gi.bGrepReplace;
+				sGrepOption.bGrepSubFolder = gi.bGrepSubFolder != FALSE;
+				sGrepOption.bGrepStdout = gi.bGrepStdout;
+				sGrepOption.bGrepHeader = gi.bGrepHeader;
+				sGrepOption.nGrepCharSet = gi.nGrepCharSet;
+				sGrepOption.nGrepOutputLineType = gi.nGrepOutputLineType;
+				sGrepOption.nGrepOutputStyle = gi.nGrepOutputStyle;
+				sGrepOption.bGrepOutputFileOnly = gi.bGrepOutputFileOnly;
+				sGrepOption.bGrepOutputBaseFolder = gi.bGrepOutputBaseFolder;
+				sGrepOption.bGrepSeparateFolder = gi.bGrepSeparateFolder;
+				sGrepOption.bGrepPaste = gi.bGrepPaste;
+				sGrepOption.bGrepBackup = gi.bGrepBackup;
+				this->m_pcEditApp->m_pcGrepAgent->DoGrep(
+					&pEditWnd->GetActiveView(),
+					grepInput,
+					gi.sGrepSearchOption,
+					sGrepOption,
+					gi.bGrepCurFolder,
+					gi.bGrepExcludeFileRegexp
+				);
+			}
 			pEditWnd->m_cDlgFuncList.Refresh();	// アウトラインを再解析する
 		}
 		else{