Skip to content

fix(detection/terminalshell): use absolute path to shell if available #2067

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

fix(detection/terminalshell): use absolute path to shell if available #2067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eacb22a
fix(detection/terminalshell): use absolute path to shell if available
jnooree Nov 24, 2025
e914504
fix(detection/terminalshell): use absolute path to termianl if available
jnooree Nov 24, 2025
54095ca
fix(detection/terminalshell): apply suggestion from @Copilot
jnooree Nov 25, 2025
dc82ed2
style(detection/terminalshell): fix indentation
jnooree Nov 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions src/detection/terminalshell/terminalshell.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,9 @@ static bool extractBashVersion(const char* line, FF_MAYBE_UNUSED uint32_t len, v
return false;
}

static bool getShellVersionBash(FFstrbuf* exe, FFstrbuf* exePath, FFstrbuf* version)
static bool getShellVersionBash(FFstrbuf* exe, FFstrbuf* version)
{
const char* path = exePath->chars;
if (*path == '\0')
path = exe->chars;
ffBinaryExtractStrings(path, extractBashVersion, version, (uint32_t) strlen("@(#)Bash version 0.0.0(0) release GNU"));
ffBinaryExtractStrings(exe->chars, extractBashVersion, version, (uint32_t) strlen("@(#)Bash version 0.0.0(0) release GNU"));
if (version->length > 0) return true;

if(!getExeVersionRaw(exe, version))
Expand Down Expand Up @@ -230,13 +227,9 @@ static bool extractZshVersion(const char* line, FF_MAYBE_UNUSED uint32_t len, vo
return false;
}

static bool getShellVersionZsh(FFstrbuf* exe, FFstrbuf* exePath, FFstrbuf* version)
static bool getShellVersionZsh(FFstrbuf* exe, FFstrbuf* version)
{
const char* path = exePath->chars;
if (*path == '\0')
path = exe->chars;

ffBinaryExtractStrings(path, extractZshVersion, version, (uint32_t) strlen("zsh-0.0-0"));
ffBinaryExtractStrings(exe->chars, extractZshVersion, version, (uint32_t) strlen("zsh-0.0-0"));
if (version->length) return true;

return getExeVersionGeneral(exe, version); //zsh 5.9 (arm-apple-darwin21.3.0)
Expand Down Expand Up @@ -270,10 +263,13 @@ bool fftsGetShellVersion(FFstrbuf* exe, const char* exeName, FFstrbuf* exePath,
if(ffStrEqualsIgnCase(exeName, "sh")) // #849
return false;

if (exePath->length > 0)
exe = exePath;

if(ffStrEqualsIgnCase(exeName, "bash"))
return getShellVersionBash(exe, exePath, version);
return getShellVersionBash(exe, version);
if(ffStrEqualsIgnCase(exeName, "zsh"))
return getShellVersionZsh(exe, exePath, version);
return getShellVersionZsh(exe, version);
if(ffStrEqualsIgnCase(exeName, "fish"))
return getShellVersionFish(exe, version);
if(ffStrEqualsIgnCase(exeName, "pwsh"))
Expand Down
5 changes: 4 additions & 1 deletion src/detection/terminalshell/terminalshell_linux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,10 @@ static void setTerminalInfoDetails(FFTerminalResult* result)
else
ffStrbufInitCopy(&result->prettyName, &result->processName);

fftsGetTerminalVersion(&result->processName, &result->exe, &result->version);
FFstrbuf *exe = &result->exe;
if(result->exePath.length != 0)
exe = &result->exePath;
fftsGetTerminalVersion(&result->processName, exe, &result->version);
}

#if defined(MAXPATH)
Expand Down
6 changes: 5 additions & 1 deletion src/detection/terminalshell/terminalshell_windows.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,11 @@ const FFTerminalResult* ffDetectTerminal(void)
if(result.processName.length > 0)
{
setTerminalInfoDetails(&result);
fftsGetTerminalVersion(&result.processName, &result.exe, &result.version);

FFstrbuf *exe = &result.exe;
if (result.exePath.length != 0)
exe = &result.exePath;
fftsGetTerminalVersion(&result.processName, exe, &result.version);
}

return &result;
Expand Down