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

[server,proxy] stricter argument parsing

Browse Source 
* Check number of arguments is valid (don't allow additional ones)
* Replace exit() with normal return for helper functions
This commit is contained in:
akallabeth 2024-10-26 19:53:11 +02:00
parent d19b7fa5d0
commit 940d067f52
No known key found for this signature in database
GPG Key ID: A49454A3FC909FD5
1 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
server/proxy/cli/freerdp_proxy.c
View File

@ -69,7 +69,7 @@ static void pf_server_register_signal_handlers(void)
#endif #endif
} }
static WINPR_NORETURN(void usage(const char* app)) static int usage(const char* app)
{ {
printf("Usage:\n"); printf("Usage:\n");
printf("%s -h Display this help text.\n", app); printf("%s -h Display this help text.\n", app);
@ -79,20 +79,20 @@ static WINPR_NORETURN(void usage(const char* app))
printf("%s --dump-config <config ini file> Create a template <config.ini>\n", app); printf("%s --dump-config <config ini file> Create a template <config.ini>\n", app);
printf("%s -v Print out binary version.\n", app); printf("%s -v Print out binary version.\n", app);
printf("%s --version Print out binary version.\n", app); printf("%s --version Print out binary version.\n", app);
exit(0); return 0;
} }
static WINPR_NORETURN(void version(const char* app)) static int version(const char* app)
{ {
printf("%s version %s", app, freerdp_get_version_string()); printf("%s version %s", app, freerdp_get_version_string());
exit(0); return 0;
} }
static WINPR_NORETURN(void buildconfig(const char* app)) static int buildconfig(const char* app)
{ {
printf("This is FreeRDP version %s (%s)\n", FREERDP_VERSION_FULL, FREERDP_GIT_REVISION); printf("This is FreeRDP version %s (%s)\n", FREERDP_VERSION_FULL, FREERDP_GIT_REVISION);
printf("%s", freerdp_get_build_config()); printf("%s", freerdp_get_build_config());
exit(0); return 0;
} }
int main(int argc, char* argv[]) int main(int argc, char* argv[])
@ -107,29 +107,55 @@ int main(int argc, char* argv[])
WLog_DBG(TAG, "\tBuild config: %s", freerdp_get_build_config()); WLog_DBG(TAG, "\tBuild config: %s", freerdp_get_build_config());
if (argc < 2) if (argc < 2)
usage(argv[0]); {
status = usage(argv[0]);
goto fail;
}
const char* arg = argv[1]; const char* arg = argv[1];
if (_stricmp(arg, "-h") == 0) if (_stricmp(arg, "-h") == 0)
usage(argv[0]); {
status = usage(argv[0]);
goto fail;
}
else if (_stricmp(arg, "--help") == 0) else if (_stricmp(arg, "--help") == 0)
usage(argv[0]); {
status = usage(argv[0]);
goto fail;
}
else if (_stricmp(arg, "--buildconfig") == 0) else if (_stricmp(arg, "--buildconfig") == 0)
buildconfig(argv[0]); {
status = buildconfig(argv[0]);
goto fail;
}
else if (_stricmp(arg, "--dump-config") == 0) else if (_stricmp(arg, "--dump-config") == 0)
{ {
if (argc <= 2) if (argc != 3)
usage(argv[0]); {
pf_server_config_dump(argv[2]); status = usage(argv[0]);
status = 0; goto fail;
}
status = pf_server_config_dump(argv[2]) ? 0 : -1;
goto fail; goto fail;
} }
else if (_stricmp(arg, "-v") == 0) else if (_stricmp(arg, "-v") == 0)
version(argv[0]); {
status = version(argv[0]);
goto fail;
}
else if (_stricmp(arg, "--version") == 0) else if (_stricmp(arg, "--version") == 0)
version(argv[0]); {
status = version(argv[0]);
goto fail;
}
const char* config_path = argv[1]; const char* config_path = argv[1];
if (argc != 2)
{
status = usage(argv[0]);
goto fail;
}
proxyConfig* config = pf_server_config_load_file(config_path); proxyConfig* config = pf_server_config_load_file(config_path);
if (!config) if (!config)