morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

[client,cmdline] add options for /list:

Browse Source 
* /list:smartcard now allows /list:smartcard:<optional> to use different
  pkcs11 modules and settings
* /list:kbd-lang now allows /list:kbd-lang:LANG_* to filter languages
This commit is contained in:
Armin Novak
2023-06-08 09:39:01 +02:00
committed by akallabeth
parent 06fd58264e
commit 49eaf78515
2 changed files with 52 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
client/common/cmdline.c
View File

@@ -1540,19 +1540,64 @@ int freerdp_client_settings_command_line_status_print_ex(rdpSettings* settings,
freerdp_client_print_tune_list(settings);
else if (option_equals("kbd", arg->Value))
freerdp_client_print_keyboard_list();
else if (option_equals("kbd-lang", arg->Value))
else if (option_starts_with("kbd-lang", arg->Value))
{
const char* val = NULL;
if (option_starts_with("kbd-lang:", arg->Value))
val = &arg->Value[9];
else if (!option_equals("kbd-lang", arg->Value))
return COMMAND_LINE_ERROR_UNEXPECTED_VALUE;
else if (strchr(val, ','))
return COMMAND_LINE_ERROR_UNEXPECTED_VALUE;
freerdp_client_print_codepages(val);
}
else if (option_equals("kbd-scancode", arg->Value))
freerdp_client_print_scancodes();
else if (option_equals("monitor", arg->Value))
settings->ListMonitors = TRUE;
else if (option_equals("smartcard", arg->Value))
else if (option_starts_with("smartcard", arg->Value))
{
BOOL opts = FALSE;
if (option_starts_with("smartcard:", arg->Value))
opts = TRUE;
else if (!option_equals("smartcard", arg->Value))
return COMMAND_LINE_ERROR_UNEXPECTED_VALUE;
if (opts)
{
const char* sub = strchr(arg->Value, ':') + 1;
const CmdLineSubOptions options[] = {
{ "pkinit-anchors:", FreeRDP_PkinitAnchors, CMDLINE_SUBOPTION_STRING,
NULL },
{ "pkcs11-module:", FreeRDP_Pkcs11Module, CMDLINE_SUBOPTION_STRING, NULL }
};
size_t count = 0;
char** ptr = CommandLineParseCommaSeparatedValuesEx("smartcard", sub, &count);
if (!ptr)
return COMMAND_LINE_ERROR_UNEXPECTED_VALUE;
if (count < 2)
{
free(ptr);
return COMMAND_LINE_ERROR_UNEXPECTED_VALUE;
}
for (size_t x = 1; x < count; x++)
{
const char* cur = ptr[x];
if (!parseSubOptions(settings, options, ARRAYSIZE(options), cur))
{
free(ptr);
return COMMAND_LINE_ERROR_UNEXPECTED_VALUE;
}
}
free(ptr);
}
freerdp_smartcard_list(settings);
}
else
{
freerdp_client_print_command_line_help_ex(argc, argv, custom);