Skip to content

Commit 0a8056d

Browse files
committed
TerminalShell (Windows): adjustments
1. Don't pretty print CMD 2. Print conhost as Windows Console
1 parent 9681e17 commit 0a8056d

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
Changes:
44
* Use MS-DOS device name as mountFrom result, instead of useless GUID volume name (Windows, Disk)
5+
* Some adjustments to Terminal detection (Terminal, Windows)
6+
* Don't pretty print CMD
7+
* Print conhost as Windows Console
8+
* Don't detect `wininit` as Terminal
59

610
Bugfixes:
711
* Don't display 0.00 GHz (CPU, FreeBSD)

src/detection/terminalshell/terminalshell_windows.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ static void setShellInfoDetails(FFShellResult* result)
143143
ffStrbufSetS(&result->prettyName, "Windows PowerShell ISE");
144144
else if(ffStrbufIgnCaseEqualS(&result->prettyName, "cmd"))
145145
{
146-
ffStrbufClear(&result->prettyName);
146+
ffStrbufSetS(&result->prettyName, "CMD");
147147

148148
FF_AUTO_CLOSE_FD HANDLE snapshot = NULL;
149149
while(!(snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, result->pid)) && GetLastError() == ERROR_BAD_LENGTH) {}
@@ -156,15 +156,13 @@ static void setShellInfoDetails(FFShellResult* result)
156156
{
157157
if(wcsncmp(module.szModule, L"clink_dll_", strlen("clink_dll_")) == 0)
158158
{
159-
ffStrbufAppendS(&result->prettyName, "CMD (with Clink ");
159+
ffStrbufAppendS(&result->prettyName, " (with Clink ");
160160
getProductVersion(module.szExePath, &result->prettyName);
161161
ffStrbufAppendC(&result->prettyName, ')');
162162
break;
163163
}
164164
}
165165
}
166-
if(result->prettyName.length == 0)
167-
ffStrbufAppendS(&result->prettyName, "Command Prompt");
168166
}
169167
else if(ffStrbufIgnCaseEqualS(&result->prettyName, "nu"))
170168
ffStrbufSetS(&result->prettyName, "nushell");
@@ -345,7 +343,7 @@ static void setTerminalInfoDetails(FFTerminalResult* result)
345343
: "Windows Terminal"
346344
);
347345
else if(ffStrbufIgnCaseEqualS(&result->prettyName, "conhost"))
348-
ffStrbufSetStatic(&result->prettyName, "Console Window Host");
346+
ffStrbufSetStatic(&result->prettyName, "Windows Console");
349347
else if(ffStrbufIgnCaseEqualS(&result->prettyName, "Code"))
350348
ffStrbufSetStatic(&result->prettyName, "Visual Studio Code");
351349
else if(ffStrbufIgnCaseEqualS(&result->prettyName, "explorer"))

0 commit comments

Comments
 (0)