Merge pull request #229 from Evo112358/master

Issue 223 pull request
This commit is contained in:
Linus Dierheimer
2022-09-12 00:42:16 -07:00
committed by GitHub
2 changed files with 18 additions and 4 deletions
+9 -2
View File
@@ -230,10 +230,17 @@ static inline void printCommandHelp(const char* command)
}
else if(strcasecmp(command, "terminal-format") == 0)
{
constructAndPrintCommandHelpFormat("terminal", "{3}", 3,
constructAndPrintCommandHelpFormat("terminal", "{3}", 10,
"Terminal process name",
"Terminal path with exe name",
"Terminal exe name"
"Terminal exe name",
"Shell process name",
"Shell path with exe name",
"Shell exe name",
"Shell version",
"User shell path with exe name",
"User shell exe name",
"User shell version"
);
}
else if(strcasecmp(command, "terminal-font-format") == 0)
+9 -2
View File
@@ -5,7 +5,7 @@
#include <string.h>
#define FF_TERMINAL_MODULE_NAME "Terminal"
#define FF_TERMINAL_NUM_FORMAT_ARGS 3
#define FF_TERMINAL_NUM_FORMAT_ARGS 10
void ffPrintTerminal(FFinstance* instance)
{
@@ -31,7 +31,14 @@ void ffPrintTerminal(FFinstance* instance)
ffPrintFormat(instance, FF_TERMINAL_MODULE_NAME, 0, &instance->config.terminal, FF_TERMINAL_NUM_FORMAT_ARGS, (FFformatarg[]){
{FF_FORMAT_ARG_TYPE_STRBUF, &result->terminalProcessName},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->terminalExe},
{FF_FORMAT_ARG_TYPE_STRING, result->terminalExeName}
{FF_FORMAT_ARG_TYPE_STRING, result->terminalExeName},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->shellProcessName},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->shellExe},
{FF_FORMAT_ARG_TYPE_STRING, result->shellExeName},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->shellVersion},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->userShellExe},
{FF_FORMAT_ARG_TYPE_STRING, result->userShellExeName},
{FF_FORMAT_ARG_TYPE_STRBUF, &result->userShellVersion}
});
}
}