Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-26 20:03:27 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'peetcamron-fix/fflush-for-musl'

Browse Source
This commit is contained in:
jfreegman 2017-01-28 00:45:28 -05:00
commit e65e3af274
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/toxic.c
View File

@ -382,6 +382,7 @@ static void first_time_encrypt(const char *msg)
do { do {
system("clear"); system("clear");
printf("%s ", msg); printf("%s ", msg);
fflush(stdout);
if (!strcasecmp(ch, "y\n") || !strcasecmp(ch, "n\n") || !strcasecmp(ch, "yes\n") if (!strcasecmp(ch, "y\n") || !strcasecmp(ch, "n\n") || !strcasecmp(ch, "yes\n")
|| !strcasecmp(ch, "no\n") || !strcasecmp(ch, "q\n")) || !strcasecmp(ch, "no\n") || !strcasecmp(ch, "q\n"))
@ -402,6 +403,7 @@ static void first_time_encrypt(const char *msg)
printf("Enter a new password (must be at least %d characters) ", MIN_PASSWORD_LEN); printf("Enter a new password (must be at least %d characters) ", MIN_PASSWORD_LEN);
while (valid_password == false) { while (valid_password == false) {
fflush(stdout); // Flush all before user input
len = password_prompt(user_password.pass, sizeof(user_password.pass)); len = password_prompt(user_password.pass, sizeof(user_password.pass));
user_password.len = len; user_password.len = len;
@ -627,6 +629,7 @@ static Tox *load_tox(char *data_path, struct Tox_Options *tox_opts, TOX_ERR_NEW
char plain[plain_len]; char plain[plain_len];
while (true) { while (true) {
fflush(stdout); // Flush before prompts so the user sees the question/message
if (pweval) { if (pweval) {
pwlen = password_eval(user_password.pass, sizeof(user_password.pass)); pwlen = password_eval(user_password.pass, sizeof(user_password.pass));
} else { } else {