git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-03-16 19:41:56 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

terminal: make the code of disable_echo() reusable

Browse Source 
We are about to introduce the function `enable_non_canonical()`, which
shares almost the complete code with `disable_echo()`.

Let's prepare for that, by refactoring out that shared code.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2019-04-04 22:17:07 +02:00
parent 50abb6bec9
commit 4af7da4aa1
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
compat/terminal.c
View File

@@ -32,7 +32,7 @@ static void restore_term(void)
term_fd = -1;
}
static int disable_echo(void)
static int disable_bits(tcflag_t bits)
{
struct termios t;
@@ -43,7 +43,7 @@ static int disable_echo(void)
old_term = t;
sigchain_push_common(restore_term_on_signal);
t.c_lflag &= ~ECHO;
t.c_lflag &= ~bits;
if (!tcsetattr(term_fd, TCSAFLUSH, &t))
return 0;
@@ -53,6 +53,11 @@ error:
return -1;
}
static int disable_echo(void)
{
return disable_bits(ECHO);
}
#elif defined(GIT_WINDOWS_NATIVE)
#define INPUT_PATH "CONIN$"
@@ -72,7 +77,7 @@ static void restore_term(void)
hconin = INVALID_HANDLE_VALUE;
}
static int disable_echo(void)
static int disable_bits(DWORD bits)
{
hconin = CreateFile("CONIN$", GENERIC_READ | GENERIC_WRITE,
FILE_SHARE_READ, NULL, OPEN_EXISTING,
@@ -82,7 +87,7 @@ static int disable_echo(void)
GetConsoleMode(hconin, &cmode);
sigchain_push_common(restore_term_on_signal);
if (!SetConsoleMode(hconin, cmode & (~ENABLE_ECHO_INPUT))) {
if (!SetConsoleMode(hconin, cmode & ~bits)) {
CloseHandle(hconin);
hconin = INVALID_HANDLE_VALUE;
return -1;
@@ -91,6 +96,12 @@ static int disable_echo(void)
return 0;
}
static int disable_echo(void)
{
return disable_bits(ENABLE_ECHO_INPUT);
}
#endif
#ifndef FORCE_TEXT