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

Changed return values of freerdp_parse_args

Browse Source 
Return -1 if a argument is missing/wrong.
This way caller can check for a problem.
This commit is contained in:
Bernhard Miklautz 2011-08-24 09:12:07 +02:00
parent e5fb626d75
commit f7336cea5e
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/X11/xfreerdp.c
View File

@ -643,7 +643,9 @@ int main(int argc, char* argv[])
chanman = freerdp_chanman_new(); chanman = freerdp_chanman_new();
SET_CHANMAN(instance, chanman); SET_CHANMAN(instance, chanman);
freerdp_parse_args(instance->settings, argc, argv, xf_process_plugin_args, chanman, NULL, NULL); if (freerdp_parse_args(instance->settings, argc, argv, xf_process_plugin_args, chanman, NULL,
NULL) < 0)
return 1;
data = (struct thread_data*) xzalloc(sizeof(struct thread_data)); data = (struct thread_data*) xzalloc(sizeof(struct thread_data));
data->instance = instance; data->instance = instance;

38
libfreerdp-utils/args.c
View File

@ -57,7 +57,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
if (index == argc) if (index == argc)
{ {
printf("missing color depth\n"); printf("missing color depth\n");
return 0; return -1;
} }
settings->color_depth = atoi(argv[index]); settings->color_depth = atoi(argv[index]);
} }
@ -67,7 +67,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
if (index == argc) if (index == argc)
{ {
printf("missing username\n"); printf("missing username\n");
return 0; return -1;
} }
settings->username = xstrdup(argv[index]); settings->username = xstrdup(argv[index]);
} }
@ -77,7 +77,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
if (index == argc) if (index == argc)
{ {
printf("missing password\n"); printf("missing password\n");
return 0; return -1;
} }
settings->password = xstrdup(argv[index]); settings->password = xstrdup(argv[index]);
settings->autologon = 1; settings->autologon = 1;
@ -95,7 +95,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
if (index == argc) if (index == argc)
{ {
printf("missing domain\n"); printf("missing domain\n");
return 0; return -1;
} }
settings->domain = xstrdup(argv[index]); settings->domain = xstrdup(argv[index]);
} }
@ -105,7 +105,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
if (index == argc) if (index == argc)
{ {
printf("missing shell\n"); printf("missing shell\n");
return 0; return -1;
} }
settings->shell = xstrdup(argv[index]); settings->shell = xstrdup(argv[index]);
} }
@ -115,7 +115,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
if (index == argc) if (index == argc)
{ {
printf("missing directory\n"); printf("missing directory\n");
return 0; return -1;
} }
settings->directory = xstrdup(argv[index]); settings->directory = xstrdup(argv[index]);
} }
@ -125,7 +125,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
if (index == argc) if (index == argc)
{ {
printf("missing dimensions\n"); printf("missing dimensions\n");
return 0; return -1;
} }
if (strncmp("workarea", argv[index], 1) == 0) if (strncmp("workarea", argv[index], 1) == 0)
@ -161,7 +161,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
if (index == argc) if (index == argc)
{ {
printf("missing port number\n"); printf("missing port number\n");
return 0; return -1;
} }
settings->port = atoi(argv[index]); settings->port = atoi(argv[index]);
} }
@ -171,7 +171,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
if (index == argc) if (index == argc)
{ {
printf("missing client hostname\n"); printf("missing client hostname\n");
return 0; return -1;
} }
strncpy(settings->client_hostname, argv[index], sizeof(settings->client_hostname) - 1); strncpy(settings->client_hostname, argv[index], sizeof(settings->client_hostname) - 1);
settings->client_hostname[sizeof(settings->client_hostname) - 1] = 0; settings->client_hostname[sizeof(settings->client_hostname) - 1] = 0;
@ -227,7 +227,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
if (index == argc) if (index == argc)
{ {
printf("missing performance flag\n"); printf("missing performance flag\n");
return 0; return -1;
} }
if (argv[index][0] == 'm') /* modem */ if (argv[index][0] == 'm') /* modem */
{ {
@ -266,7 +266,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
if (index == argc) if (index == argc)
{ {
printf("missing protocol security\n"); printf("missing protocol security\n");
return 0; return -1;
} }
if (strncmp("rdp", argv[index], 1) == 0) /* Standard RDP */ if (strncmp("rdp", argv[index], 1) == 0) /* Standard RDP */
{ {
@ -289,7 +289,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
else else
{ {
printf("unknown protocol security\n"); printf("unknown protocol security\n");
return 0; return -1;
} }
} }
else if (strcmp("--plugin", argv[index]) == 0) else if (strcmp("--plugin", argv[index]) == 0)
@ -299,7 +299,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
if (index == argc) if (index == argc)
{ {
printf("missing plugin name\n"); printf("missing plugin name\n");
return 0; return -1;
} }
plugin_data = NULL; plugin_data = NULL;
if (index < argc - 1 && strcmp("--data", argv[index + 1]) == 0) if (index < argc - 1 && strcmp("--data", argv[index + 1]) == 0)
@ -339,7 +339,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
if (plugin_callback != NULL) if (plugin_callback != NULL)
{ {
if (!plugin_callback(settings, argv[t], plugin_data, plugin_user_data)) if (!plugin_callback(settings, argv[t], plugin_data, plugin_user_data))
return 0; return -1;
} }
} }
else if (strcmp("--ext", argv[index]) == 0) else if (strcmp("--ext", argv[index]) == 0)
@ -348,12 +348,12 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
if (index == argc) if (index == argc)
{ {
printf("missing extension name\n"); printf("missing extension name\n");
return 0; return -1;
} }
if (num_extensions >= sizeof(settings->extensions) / sizeof(struct rdp_ext_set)) if (num_extensions >= sizeof(settings->extensions) / sizeof(struct rdp_ext_set))
{ {
printf("maximum extensions reached\n"); printf("maximum extensions reached\n");
return 0; return -1;
} }
snprintf(settings->extensions[num_extensions].name, snprintf(settings->extensions[num_extensions].name,
sizeof(settings->extensions[num_extensions].name), sizeof(settings->extensions[num_extensions].name),
@ -375,7 +375,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
else if (strcmp("--version", argv[index]) == 0) else if (strcmp("--version", argv[index]) == 0)
{ {
printf("This is FreeRDP version %s\n", FREERDP_VERSION_FULL); printf("This is FreeRDP version %s\n", FREERDP_VERSION_FULL);
return 0; return -1;
} }
else if (argv[index][0] != '-') else if (argv[index][0] != '-')
{ {
@ -416,7 +416,7 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
if (t == 0) if (t == 0)
{ {
printf("invalid option: %s\n", argv[index]); printf("invalid option: %s\n", argv[index]);
return 0; return -1;
} }
index += t - 1; index += t - 1;
} }
@ -424,5 +424,5 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
index++; index++;
} }
printf("missing server name\n"); printf("missing server name\n");
return 0; return -1;
} }