github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[server,shadow] sort command line arguments

Browse Source 
when printing the help output first sort the COMMAND_LINE_ARGUMENT_A by
argument name.
This commit is contained in:
akallabeth 2025-04-10 09:04:11 +02:00
parent 4b2d65e977
commit 7f5a3bc352
No known key found for this signature in database
GPG Key ID: A49454A3FC909FD5
2 changed files with 69 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/freerdp/server/shadow.h
View File

@ -339,7 +339,7 @@ extern "C"
COMMAND_LINE_ARGUMENT_A* cargs); COMMAND_LINE_ARGUMENT_A* cargs);
FREERDP_API int shadow_server_command_line_status_print(rdpShadowServer* server, int argc, FREERDP_API int shadow_server_command_line_status_print(rdpShadowServer* server, int argc,
char** argv, int status, char** argv, int status,
COMMAND_LINE_ARGUMENT_A* cargs); const COMMAND_LINE_ARGUMENT_A* cargs);
FREERDP_API int shadow_server_start(rdpShadowServer* server); FREERDP_API int shadow_server_start(rdpShadowServer* server);
FREERDP_API int shadow_server_stop(rdpShadowServer* server); FREERDP_API int shadow_server_stop(rdpShadowServer* server);

70
server/shadow/shadow_server.c
View File

@ -59,15 +59,28 @@ static int fail_at_(const COMMAND_LINE_ARGUMENT_A* arg, int rc, const char* file
return rc; return rc;
} }
static int shadow_server_print_command_line_help(int argc, char** argv, static int command_line_compare(const void* pa, const void* pb)
COMMAND_LINE_ARGUMENT_A* largs) {
const COMMAND_LINE_ARGUMENT_A* a = pa;
const COMMAND_LINE_ARGUMENT_A* b = pb;
if (!a && !b)
return 0;
if (!a)
return -1;
if (!b)
return 1;
return strcmp(a->Name, b->Name);
}
static int shadow_server_print_command_line_help(int argc, char** argv,
const COMMAND_LINE_ARGUMENT_A* largs)
{ {
char* str = NULL;
size_t length = 0;
const COMMAND_LINE_ARGUMENT_A* arg = NULL;
if ((argc < 1) || !largs || !argv) if ((argc < 1) || !largs || !argv)
return -1; return -1;
{
char* path = winpr_GetConfigFilePath(TRUE, "SAM"); char* path = winpr_GetConfigFilePath(TRUE, "SAM");
printf("Usage: %s [options]\n", argv[0]); printf("Usage: %s [options]\n", argv[0]);
printf("\n"); printf("\n");
@ -76,8 +89,8 @@ static int shadow_server_print_command_line_help(int argc, char** argv,
printf("\tProvide one with /sam-file:<file with path>\n"); printf("\tProvide one with /sam-file:<file with path>\n");
printf("\telse the default path %s is used.\n", path); printf("\telse the default path %s is used.\n", path);
printf("\tIf there is no existing SAM file authentication for all users will fail.\n"); printf("\tIf there is no existing SAM file authentication for all users will fail.\n");
printf( printf("\n\tIf authentication against PAM is desired, start with -sec-nla (requires "
"\n\tIf authentication against PAM is desired, start with -sec-nla (requires compiled in " "compiled in "
"support for PAM)\n\n"); "support for PAM)\n\n");
printf("Syntax:\n"); printf("Syntax:\n");
printf(" /flag (enables flag)\n"); printf(" /flag (enables flag)\n");
@ -85,9 +98,28 @@ static int shadow_server_print_command_line_help(int argc, char** argv,
printf(" +toggle -toggle (enables or disables toggle, where '/' is a synonym of '+')\n"); printf(" +toggle -toggle (enables or disables toggle, where '/' is a synonym of '+')\n");
printf("\n"); printf("\n");
free(path); free(path);
}
arg = largs; // TODO: Sort arguments
size_t nrArgs = 0;
{
const COMMAND_LINE_ARGUMENT_A* arg = largs;
while (arg->Name != NULL)
{
nrArgs++;
arg++;
}
nrArgs++;
}
COMMAND_LINE_ARGUMENT_A* args_copy = calloc(nrArgs, sizeof(COMMAND_LINE_ARGUMENT_A));
if (!args_copy)
return -1;
memcpy(args_copy, largs, nrArgs * sizeof(COMMAND_LINE_ARGUMENT_A));
qsort(args_copy, nrArgs - 1, sizeof(COMMAND_LINE_ARGUMENT_A), command_line_compare);
const COMMAND_LINE_ARGUMENT_A* arg = args_copy;
int rc = -1;
do do
{ {
if (arg->Flags & COMMAND_LINE_VALUE_FLAG) if (arg->Flags & COMMAND_LINE_VALUE_FLAG)
@ -103,11 +135,11 @@ static int shadow_server_print_command_line_help(int argc, char** argv,
if (arg->Format) if (arg->Format)
{ {
length = (strlen(arg->Name) + strlen(arg->Format) + 2); const size_t length = (strlen(arg->Name) + strlen(arg->Format) + 2);
str = (char*)malloc(length + 1); char* str = (char*)calloc(length + 1, sizeof(char));
if (!str) if (!str)
return -1; goto fail;
(void)sprintf_s(str, length + 1, "%s:%s", arg->Name, arg->Format); (void)sprintf_s(str, length + 1, "%s:%s", arg->Name, arg->Format);
(void)printf("%-20s\n", str); (void)printf("%-20s\n", str);
@ -122,26 +154,30 @@ static int shadow_server_print_command_line_help(int argc, char** argv,
} }
else if (arg->Flags & COMMAND_LINE_VALUE_BOOL) else if (arg->Flags & COMMAND_LINE_VALUE_BOOL)
{ {
length = strlen(arg->Name) + 32; const size_t length = strlen(arg->Name) + 32;
str = (char*)malloc(length + 1); char* str = calloc(length + 1, sizeof(char));
if (!str) if (!str)
return -1; goto fail;
(void)sprintf_s(str, length + 1, "%s (default:%s)", arg->Name, (void)sprintf_s(str, length + 1, "%s (default:%s)", arg->Name,
arg->Default ? "on" : "off"); arg->Default ? "on" : "off");
(void)printf(" %s", arg->Default ? "-" : "+"); (void)printf(" %s", arg->Default ? "-" : "+");
(void)printf("%-20s\n", str); (void)printf("%-20s\n", str);
free(str);
(void)printf("\t%s\n", arg->Text); (void)printf("\t%s\n", arg->Text);
free(str);
} }
} while ((arg = CommandLineFindNextArgumentA(arg)) != NULL); } while ((arg = CommandLineFindNextArgumentA(arg)) != NULL);
return 1; rc = 1;
fail:
free(args_copy);
return rc;
} }
int shadow_server_command_line_status_print(rdpShadowServer* server, int argc, char** argv, int shadow_server_command_line_status_print(rdpShadowServer* server, int argc, char** argv,
int status, COMMAND_LINE_ARGUMENT_A* cargs) int status, const COMMAND_LINE_ARGUMENT_A* cargs)
{ {
WINPR_UNUSED(server); WINPR_UNUSED(server);