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

Merge pull request #717 from ted-gould/master

Browse Source 
STDIN Parsing Robustness
This commit is contained in:
Marc-André Moreau 2012-09-17 08:06:20 -07:00
commit 5b89c3a95a
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libfreerdp/utils/args.c
View File

@ -871,34 +871,46 @@ int freerdp_parse_args(rdpSettings* settings, int argc, char** argv,
/* username */
if (NULL == settings->username) {
char input[512];
input[0] = '\0';
printf("username: ");
scanf("%511s", input);
settings->username = xstrdup(input);
if (scanf("%511s", input) > 0) {
settings->username = xstrdup(input);
}
}
/* password */
if (NULL == settings->password) {
settings->password = xmalloc(512 * sizeof(char));
if (isatty(STDIN_FILENO))
freerdp_passphrase_read("password: ", settings->password, 512, settings->from_stdin);
else
{
else {
printf("password: ");
scanf("%511s", settings->password);
if (scanf("%511s", settings->password) <= 0) {
free(settings->password);
settings->password = NULL;
}
}
}
/* domain */
if (NULL == settings->domain) {
char input[512];
input[0] = '\0';
printf("domain (control-D to skip): ");
scanf("%511s", input);
settings->domain = xstrdup(input);
if (scanf("%511s", input) > 0) {
/* Try to catch the cases where the string is NULL-ish right
at the get go */
if (input[0] != '\0' && !(input[0] == '.' && input[1] == '\0')) {
settings->domain = xstrdup(input);
}
}
}
/* hostname */
if (NULL == settings->hostname) {
char input[512];
input[0] = '\0';
printf("hostname: ");
scanf("%511s", input);
freerdp_parse_hostname(settings, input);
if (scanf("%511s", input) > 0) {
freerdp_parse_hostname(settings, input);
}
}
}