mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2473 from akallabeth/force_cmdline_flags

Browse Source 
Force cmdline to ignore unknown keywords
This commit is contained in:
Marc-André Moreau 2015-03-16 08:02:23 -04:00
commit d7bdb509c8
12 changed files with 39 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/DirectFB/dfreerdp.c
View File

@ -468,7 +468,7 @@ int main(int argc, char* argv[])
instance->context->argc = argc; instance->context->argc = argc;
instance->context->argv = argv; instance->context->argv = argv;
status = freerdp_client_settings_parse_command_line(instance->settings, argc, argv); status = freerdp_client_settings_parse_command_line(instance->settings, argc, argv, FALSE);
if (status < 0) if (status < 0)
exit(0); exit(0);

2
client/Mac/cli/AppDelegate.m
View File

@ -105,7 +105,7 @@ void mac_set_view_size(rdpContext* context, MRDPView* view);
context->argc = i; context->argc = i;
status = freerdp_client_settings_parse_command_line(context->settings, context->argc, context->argv); status = freerdp_client_settings_parse_command_line(context->settings, context->argc, context->argv, FALSE);
status = freerdp_client_settings_command_line_status_print(context->settings, status, context->argc, context->argv); status = freerdp_client_settings_command_line_status_print(context->settings, status, context->argc, context->argv);

2
client/Sample/freerdp.c
View File

@ -334,7 +334,7 @@ int main(int argc, char* argv[])
channels = instance->context->channels; channels = instance->context->channels;
status = freerdp_client_settings_parse_command_line(instance->settings, argc, argv); status = freerdp_client_settings_parse_command_line(instance->settings, argc, argv, FALSE);
if (status < 0) if (status < 0)
{ {

2
client/Wayland/wlfreerdp.c
View File

@ -269,7 +269,7 @@ int main(int argc, char* argv[])
instance->ContextFree = wl_context_free; instance->ContextFree = wl_context_free;
freerdp_context_new(instance); freerdp_context_new(instance);
status = freerdp_client_settings_parse_command_line_arguments(instance->settings, argc, argv); status = freerdp_client_settings_parse_command_line_arguments(instance->settings, argc, argv, FALSE);
status = freerdp_client_settings_command_line_status_print(instance->settings, status, argc, argv); status = freerdp_client_settings_command_line_status_print(instance->settings, status, argc, argv);

2
client/Windows/cli/wfreerdp.c
View File

@ -70,7 +70,7 @@ INT WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
for (index = 0; index < context->argc; index++) for (index = 0; index < context->argc; index++)
context->argv[index] = _strdup(__argv[index]); context->argv[index] = _strdup(__argv[index]);
status = freerdp_client_settings_parse_command_line(settings, context->argc, context->argv); status = freerdp_client_settings_parse_command_line(settings, context->argc, context->argv, FALSE);
status = freerdp_client_settings_command_line_status_print(settings, status, context->argc, context->argv); status = freerdp_client_settings_command_line_status_print(settings, status, context->argc, context->argv);

2
client/X11/cli/xfreerdp.c
View File

@ -53,7 +53,7 @@ int main(int argc, char* argv[])
settings = context->settings; settings = context->settings;
xfc = (xfContext*) context; xfc = (xfContext*) context;
status = freerdp_client_settings_parse_command_line(context->settings, argc, argv); status = freerdp_client_settings_parse_command_line(context->settings, argc, argv, FALSE);
status = freerdp_client_settings_command_line_status_print(settings, status, argc, argv); status = freerdp_client_settings_command_line_status_print(settings, status, argc, argv);

5
client/common/client.c
View File

@ -159,7 +159,8 @@ out_error:
} }
int freerdp_client_settings_parse_command_line(rdpSettings* settings, int argc, char** argv) int freerdp_client_settings_parse_command_line(rdpSettings* settings, int argc,
char** argv, BOOL allowUnknown)
{ {
int status; int status;
@ -169,7 +170,7 @@ int freerdp_client_settings_parse_command_line(rdpSettings* settings, int argc,
if (!argv) if (!argv)
return -1; return -1;
status = freerdp_client_settings_parse_command_line_arguments(settings, argc, argv); status = freerdp_client_settings_parse_command_line_arguments(settings, argc, argv, allowUnknown);
if (settings->ConnectionFile) if (settings->ConnectionFile)
{ {

30
client/common/cmdline.c
View File

@ -988,7 +988,8 @@ int freerdp_detect_command_line_pre_filter(void* context, int index, int argc, L
return 0; return 0;
} }
int freerdp_detect_windows_style_command_line_syntax(int argc, char** argv, int* count) int freerdp_detect_windows_style_command_line_syntax(int argc, char** argv,
int* count, BOOL ignoreUnknown)
{ {
int status; int status;
DWORD flags; DWORD flags;
@ -997,6 +998,10 @@ int freerdp_detect_windows_style_command_line_syntax(int argc, char** argv, int*
flags = COMMAND_LINE_SEPARATOR_COLON; flags = COMMAND_LINE_SEPARATOR_COLON;
flags |= COMMAND_LINE_SIGIL_SLASH | COMMAND_LINE_SIGIL_PLUS_MINUS; flags |= COMMAND_LINE_SIGIL_SLASH | COMMAND_LINE_SIGIL_PLUS_MINUS;
if (ignoreUnknown)
{
flags |= COMMAND_LINE_IGN_UNKNOWN_KEYWORD;
}
*count = 0; *count = 0;
detect_status = 0; detect_status = 0;
@ -1025,7 +1030,8 @@ int freerdp_detect_windows_style_command_line_syntax(int argc, char** argv, int*
return detect_status; return detect_status;
} }
int freerdp_detect_posix_style_command_line_syntax(int argc, char** argv, int* count) int freerdp_detect_posix_style_command_line_syntax(int argc, char** argv,
int* count, BOOL ignoreUnknown)
{ {
int status; int status;
DWORD flags; DWORD flags;
@ -1035,6 +1041,10 @@ int freerdp_detect_posix_style_command_line_syntax(int argc, char** argv, int* c
flags = COMMAND_LINE_SEPARATOR_SPACE; flags = COMMAND_LINE_SEPARATOR_SPACE;
flags |= COMMAND_LINE_SIGIL_DASH | COMMAND_LINE_SIGIL_DOUBLE_DASH; flags |= COMMAND_LINE_SIGIL_DASH | COMMAND_LINE_SIGIL_DOUBLE_DASH;
flags |= COMMAND_LINE_SIGIL_ENABLE_DISABLE; flags |= COMMAND_LINE_SIGIL_ENABLE_DISABLE;
if (ignoreUnknown)
{
flags |= COMMAND_LINE_IGN_UNKNOWN_KEYWORD;
}
*count = 0; *count = 0;
detect_status = 0; detect_status = 0;
@ -1063,7 +1073,8 @@ int freerdp_detect_posix_style_command_line_syntax(int argc, char** argv, int* c
return detect_status; return detect_status;
} }
BOOL freerdp_client_detect_command_line(int argc, char** argv, DWORD* flags) static BOOL freerdp_client_detect_command_line(int argc, char** argv,
DWORD* flags, BOOL ignoreUnknown)
{ {
int old_cli_status; int old_cli_status;
int old_cli_count; int old_cli_count;
@ -1073,8 +1084,8 @@ BOOL freerdp_client_detect_command_line(int argc, char** argv, DWORD* flags)
int windows_cli_count; int windows_cli_count;
BOOL compatibility = FALSE; BOOL compatibility = FALSE;
windows_cli_status = freerdp_detect_windows_style_command_line_syntax(argc, argv, &windows_cli_count); windows_cli_status = freerdp_detect_windows_style_command_line_syntax(argc, argv, &windows_cli_count, ignoreUnknown);
posix_cli_status = freerdp_detect_posix_style_command_line_syntax(argc, argv, &posix_cli_count); posix_cli_status = freerdp_detect_posix_style_command_line_syntax(argc, argv, &posix_cli_count, ignoreUnknown);
old_cli_status = freerdp_detect_old_command_line_syntax(argc, argv, &old_cli_count); old_cli_status = freerdp_detect_old_command_line_syntax(argc, argv, &old_cli_count);
/* Default is POSIX syntax */ /* Default is POSIX syntax */
@ -1168,7 +1179,8 @@ int freerdp_client_settings_command_line_status_print(rdpSettings* settings, int
return 0; return 0;
} }
int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings, int argc, char** argv) int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
int argc, char** argv, BOOL allowUnknown)
{ {
char* p; char* p;
char* str; char* str;
@ -1178,7 +1190,7 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
BOOL compatibility; BOOL compatibility;
COMMAND_LINE_ARGUMENT_A* arg; COMMAND_LINE_ARGUMENT_A* arg;
compatibility = freerdp_client_detect_command_line(argc, argv, &flags); compatibility = freerdp_client_detect_command_line(argc, argv, &flags, allowUnknown);
if (compatibility) if (compatibility)
{ {
@ -1189,6 +1201,10 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
{ {
CommandLineClearArgumentsA(args); CommandLineClearArgumentsA(args);
if (allowUnknown)
{
flags |= COMMAND_LINE_IGN_UNKNOWN_KEYWORD;
}
status = CommandLineParseArgumentsA(argc, (const char**) argv, args, flags, settings, status = CommandLineParseArgumentsA(argc, (const char**) argv, args, flags, settings,
freerdp_client_command_line_pre_filter, freerdp_client_command_line_post_filter); freerdp_client_command_line_pre_filter, freerdp_client_command_line_post_filter);

2
client/common/file.c
View File

@ -1040,7 +1040,7 @@ BOOL freerdp_client_populate_settings_from_rdp_file(rdpFile* file, rdpSettings*
char* ConnectionFile = settings->ConnectionFile; char* ConnectionFile = settings->ConnectionFile;
settings->ConnectionFile = NULL; settings->ConnectionFile = NULL;
freerdp_client_settings_parse_command_line(settings, file->argc, file->argv); freerdp_client_settings_parse_command_line(settings, file->argc, file->argv, FALSE);
settings->ConnectionFile = ConnectionFile; settings->ConnectionFile = ConnectionFile;
} }

4
client/common/test/TestClientCmdLine.c
View File

@ -4,13 +4,13 @@
#include <winpr/cmdline.h> #include <winpr/cmdline.h>
#include <winpr/spec.h> #include <winpr/spec.h>
#define TESTCASE(cmd, expected_return) status = freerdp_client_settings_parse_command_line(settings, ARRAYSIZE(cmd), cmd); \ #define TESTCASE(cmd, expected_return) status = freerdp_client_settings_parse_command_line(settings, ARRAYSIZE(cmd), cmd, FALSE); \
if (status != expected_return) { \ if (status != expected_return) { \
printf("Test argument %s failed\n", #cmd); \ printf("Test argument %s failed\n", #cmd); \
return -1; \ return -1; \
} }
#define TESTCASE_SUCCESS(cmd) status = freerdp_client_settings_parse_command_line(settings, ARRAYSIZE(cmd), cmd); \ #define TESTCASE_SUCCESS(cmd) status = freerdp_client_settings_parse_command_line(settings, ARRAYSIZE(cmd), cmd, FALSE); \
if (status < 0) { \ if (status < 0) { \
printf("Test argument %s failed\n", #cmd); \ printf("Test argument %s failed\n", #cmd); \
return -1; \ return -1; \

3
include/freerdp/client.h
View File

@ -85,7 +85,8 @@ FREERDP_API int freerdp_client_stop(rdpContext* context);
FREERDP_API freerdp* freerdp_client_get_instance(rdpContext* context); FREERDP_API freerdp* freerdp_client_get_instance(rdpContext* context);
FREERDP_API HANDLE freerdp_client_get_thread(rdpContext* context); FREERDP_API HANDLE freerdp_client_get_thread(rdpContext* context);
FREERDP_API int freerdp_client_settings_parse_command_line(rdpSettings* settings, int argc, char** argv); FREERDP_API int freerdp_client_settings_parse_command_line(rdpSettings* settings,
int argc, char** argv, BOOL allowUnknown);
FREERDP_API int freerdp_client_settings_parse_connection_file(rdpSettings* settings, const char* filename); FREERDP_API int freerdp_client_settings_parse_connection_file(rdpSettings* settings, const char* filename);
FREERDP_API int freerdp_client_settings_parse_connection_file_buffer(rdpSettings* settings, const BYTE* buffer, size_t size); FREERDP_API int freerdp_client_settings_parse_connection_file_buffer(rdpSettings* settings, const BYTE* buffer, size_t size);

3
include/freerdp/client/cmdline.h
View File

@ -27,7 +27,8 @@
extern "C" { extern "C" {
#endif #endif
FREERDP_API int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings, int argc, char** argv); FREERDP_API int freerdp_client_settings_parse_command_line_arguments(
rdpSettings* settings, int argc, char** argv, BOOL allowUnknown);
FREERDP_API int freerdp_client_settings_command_line_status_print(rdpSettings* settings, int status, int argc, char** argv); FREERDP_API int freerdp_client_settings_command_line_status_print(rdpSettings* settings, int status, int argc, char** argv);
FREERDP_API int freerdp_client_load_addins(rdpChannels* channels, rdpSettings* settings); FREERDP_API int freerdp_client_load_addins(rdpChannels* channels, rdpSettings* settings);