CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #5857 from lhmouse/master

Browse Source 
When calling grepWin, pass target directory on command line instead o…
This commit is contained in:
Rainer Kottenhoff 2026-05-14 17:33:49 +02:00 committed by GitHub
commit e6aadd8bd0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/Dialogs.c
View File

@ -5344,18 +5344,6 @@ void DialogGrepWin(HWND hwnd, LPCWSTR searchPattern)
Path_Release(hpath_np3);
Path_Release(hLngFilePath);
// search directory
HPATHL pthSearchDir = NULL;
if (Path_IsNotEmpty(Paths.CurrentFile)) {
pthSearchDir = Path_Copy(Paths.CurrentFile);
Path_RemoveFileSpec(pthSearchDir);
}
else {
pthSearchDir = Path_Copy(Paths.WorkingDirectory);
}
IniSectionSetString(globalSection, L"searchpath", Path_Get(pthSearchDir));
Path_Release(pthSearchDir);
// =================================================================
// [np3cmds]
@ -5401,24 +5389,45 @@ void DialogGrepWin(HWND hwnd, LPCWSTR searchPattern)
ResetIniFileCache();
}
// search directory
HPATHL pthSearchDir = NULL;
if (Path_IsNotEmpty(Paths.CurrentFile)) {
pthSearchDir = Path_Copy(Paths.CurrentFile);
Path_RemoveFileSpec(pthSearchDir);
}
else {
pthSearchDir = Path_Copy(Paths.WorkingDirectory);
}
// grepWin arguments (omit /portable for PortableApps — the launcher sets it)
HSTRINGW hstrParams = StrgCreate(L"");
HSTRINGW hstrEscPattern = EscapeStringForCmdLine(searchPattern);
if (Path_IsExistingFile(hGrepWinIniPath)) {
if (bIsPortableApps) {
StrgFormat(hstrParams, L"/content %s /searchfor:\"%s\"", StrgGet(hstrOptions), StrgGet(hstrEscPattern));
StrgFormat(hstrParams,
L"/content %s /searchfor:\"%s\" /searchpath:\"%s\"",
StrgGet(hstrOptions), StrgGet(hstrEscPattern), Path_Get(pthSearchDir));
}
else {
StrgFormat(hstrParams, L"/portable /content %s /searchini:\"%s\" /name:\"%s\"",
StrgGet(hstrOptions), Path_Get(hGrepWinIniPath), np3cmdSection);
StrgFormat(hstrParams,
L"/portable /content %s /searchini:\"%s\" /name:\"%s\" /searchpath:\"%s\"",
StrgGet(hstrOptions), Path_Get(hGrepWinIniPath), np3cmdSection, Path_Get(pthSearchDir));
}
}
else {
StrgFormat(hstrParams, bIsPortableApps ?
L"/content %s /searchfor:\"%s\"" : L"/portable /content %s /searchfor:\"%s\"",
StrgGet(hstrOptions), StrgGet(hstrEscPattern));
if (bIsPortableApps) {
StrgFormat(hstrParams,
L"/content %s /searchfor:\"%s\" /searchpath:\"%s\"",
StrgGet(hstrOptions), StrgGet(hstrEscPattern), Path_Get(pthSearchDir));
}
else {
StrgFormat(hstrParams,
L"/portable /content %s /searchfor:\"%s\" /searchpath:\"%s\"",
StrgGet(hstrOptions), StrgGet(hstrEscPattern), Path_Get(pthSearchDir));
}
}
StrgDestroy(hstrEscPattern);
Path_Release(pthSearchDir);
SHELLEXECUTEINFO sei = { sizeof(SHELLEXECUTEINFO) };
sei.fMask = SEE_MASK_FLAG_NO_UI | SEE_MASK_NOZONECHECKS;