morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11965 from akallabeth/fromstdin-fix

Browse Source 
[utils] fix from-stdin
This commit is contained in:
akallabeth
2025-10-29 13:04:45 +01:00
committed by GitHub
parent 9fb747805d 27c5246454
commit 499c3bda90
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libfreerdp/utils/passphrase.c
View File

@@ -351,8 +351,8 @@ int freerdp_interruptible_getc(rdpContext* context, FILE* stream)
int rc = EOF;
const int fd = fileno(stream);
if (!set_termianl_nonblock(fd, TRUE))
return EOF;
(void)set_termianl_nonblock(fd, TRUE);
do
{
const int res = wait_for_fd(fd, 10);
@@ -374,8 +374,7 @@ int freerdp_interruptible_getc(rdpContext* context, FILE* stream)
}
} while (!freerdp_shall_disconnect_context(context));
if (!set_termianl_nonblock(fd, FALSE))
return EOF;
(void)set_termianl_nonblock(fd, FALSE);
return rc;
}
@@ -416,9 +415,11 @@ SSIZE_T freerdp_interruptible_get_line(rdpContext* context, char** plineptr, siz
const int fd = fileno(stream);
struct termios termios = { 0 };
if (tcgetattr(fd, &termios) != 0)
return -1;
echo = (termios.c_lflag & ECHO) != 0;
/* This might fail if /from-stdin is used. */
if (tcgetattr(fd, &termios) == 0)
echo = (termios.c_lflag & ECHO) != 0;
else
echo = false;
}
#endif