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

Author: jnooree

src/detection/terminalshell/terminalshell.c

@@ -64,15 +64,12 @@ 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* exePath, 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(exePath->chars, extractBashVersion, version, (uint32_t) strlen("@(#)Bash version 0.0.0(0) release GNU"));
     if (version->length > 0) return true;
 
-    if(!getExeVersionRaw(exe, version))
+    if(!getExeVersionRaw(exePath, version))
         return false;
 
     // GNU bash, version 5.1.16(1)-release (x86_64-pc-msys)\nCopyright...
@@ -230,16 +227,12 @@ 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* exePath, 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(exePath->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)
+    return getExeVersionGeneral(exePath, version); //zsh 5.9 (arm-apple-darwin21.3.0)
 }
 
 #ifdef _WIN32
@@ -270,38 +263,41 @@ bool fftsGetShellVersion(FFstrbuf* exe, const char* exeName, FFstrbuf* exePath,
     if(ffStrEqualsIgnCase(exeName, "sh")) // #849
         return false;
 
+    if (exePath->length == 0)
+      exePath = exe;
+
     if(ffStrEqualsIgnCase(exeName, "bash"))
-        return getShellVersionBash(exe, exePath, version);
+        return getShellVersionBash(exePath, version);
     if(ffStrEqualsIgnCase(exeName, "zsh"))
-        return getShellVersionZsh(exe, exePath, version);
+        return getShellVersionZsh(exePath, version);
     if(ffStrEqualsIgnCase(exeName, "fish"))
-        return getShellVersionFish(exe, version);
+        return getShellVersionFish(exePath, version);
     if(ffStrEqualsIgnCase(exeName, "pwsh"))
-        return getShellVersionPwsh(exe, version);
+        return getShellVersionPwsh(exePath, version);
     if(ffStrEqualsIgnCase(exeName, "csh") || ffStrEqualsIgnCase(exeName, "tcsh"))
-        return getExeVersionGeneral(exe, version); //tcsh 6.24.07 (Astron) 2022-12-21 (aarch64-apple-darwin) options wide,nls,dl,al,kan,sm,rh,color,filec
+        return getExeVersionGeneral(exePath, version); //tcsh 6.24.07 (Astron) 2022-12-21 (aarch64-apple-darwin) options wide,nls,dl,al,kan,sm,rh,color,filec
     if(ffStrEqualsIgnCase(exeName, "nu"))
-        return getShellVersionNushell(exe, version);
+        return getShellVersionNushell(exePath, version);
     if(ffStrEqualsIgnCase(exeName, "ksh"))
-        return getShellVersionKsh(exe, version);
+        return getShellVersionKsh(exePath, version);
     if(ffStrEqualsIgnCase(exeName, "oksh"))
-        return getShellVersionOksh(exe, version);
+        return getShellVersionOksh(exePath, version);
     if(ffStrEqualsIgnCase(exeName, "oil.ovm"))
-        return getShellVersionOils(exe, version);
+        return getShellVersionOils(exePath, version);
     if(ffStrEqualsIgnCase(exeName, "elvish"))
-        return getExeVersionRaw(exe, version);
+        return getExeVersionRaw(exePath, version);
     if(ffStrEqualsIgnCase(exeName, "ash"))
-        return getShellVersionAsh(exe, version);
+        return getShellVersionAsh(exePath, version);
     if(ffStrEqualsIgnCase(exeName, "xonsh"))
-        return getShellVersionXonsh(exe, version);
+        return getShellVersionXonsh(exePath, version);
     if(ffStrEqualsIgnCase(exeName, "brush"))
-        return getExeVersionGeneral(exe, version); // brush 0.2.23 (git:2835487)
+        return getExeVersionGeneral(exePath, version); // brush 0.2.23 (git:2835487)
 
     #ifdef _WIN32
     if(ffStrEqualsIgnCase(exeName, "powershell") || ffStrEqualsIgnCase(exeName, "powershell_ise"))
-        return getShellVersionWinPowerShell(exe, version);
+        return getShellVersionWinPowerShell(exePath, version);
 
-    return getFileVersion(exe, NULL, version);
+    return getFileVersion(exePath, NULL, version);
     #endif
 
     return false;