ip7z/7zip
1
0
Fork 0
mirror of https://github.com/ip7z/7zip.git synced 2025-12-06 07:12:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge f6d6b458b1 into 395149956d

Browse source
This commit is contained in:
srijondeb 2025-07-05 18:01:24 +02:00 committed by GitHub
parent 395149956d f6d6b458b1
commit c1f2ab8ece
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 34 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
CPP/7zip/UI/Console/UserInputUtils.cpp
View file

@ -7,6 +7,14 @@
#include "UserInputUtils.h" #include "UserInputUtils.h"
#include <iostream>
#ifdef _WIN32
#include <windows.h>
#elif defined(__linux__)
#include <termios.h>
#include <unistd.h>
#endif
static const char kYes = 'y'; static const char kYes = 'y';
static const char kNo = 'n'; static const char kNo = 'n';
static const char kYesAll = 'a'; static const char kYesAll = 'a';
@ -64,42 +72,47 @@ static bool GetPassword(CStdOutStream *outStream, UString &psw)
{ {
if (outStream) if (outStream)
{ {
*outStream << "\nEnter password" *outStream << "\nEnter password (will not be echoed):";
#ifdef MY_DISABLE_ECHO
" (will not be echoed)"
#endif
":";
outStream->Flush(); outStream->Flush();
} }
#ifdef MY_DISABLE_ECHO #ifdef _WIN32
// Windows: disable echo
const HANDLE console = GetStdHandle(STD_INPUT_HANDLE); const HANDLE console = GetStdHandle(STD_INPUT_HANDLE);
/*
GetStdHandle() returns
INVALID_HANDLE_VALUE: If the function fails.
NULL : If an application does not have associated standard handles,
such as a service running on an interactive desktop,
and has not redirected them. */
bool wasChanged = false;
DWORD mode = 0; DWORD mode = 0;
bool wasChanged = false;
if (console != INVALID_HANDLE_VALUE && console != NULL) if (console != INVALID_HANDLE_VALUE && console != NULL)
if (GetConsoleMode(console, &mode)) if (GetConsoleMode(console, &mode))
wasChanged = (SetConsoleMode(console, mode & ~(DWORD)ENABLE_ECHO_INPUT) != 0); wasChanged = (SetConsoleMode(console, mode & ~(DWORD)ENABLE_ECHO_INPUT) != 0);
const bool res = g_StdIn.ScanUStringUntilNewLine(psw); const bool res = g_StdIn.ScanUStringUntilNewLine(psw);
if (wasChanged) if (wasChanged)
SetConsoleMode(console, mode); SetConsoleMode(console, mode);
#else #elif defined(__linux__)
// Linux: disable echo using termios
termios oldt;
if (tcgetattr(STDIN_FILENO, &oldt) != 0)
return false;
termios newt = oldt;
newt.c_lflag &= ~ECHO;
if (tcsetattr(STDIN_FILENO, TCSANOW, &newt) != 0)
return false;
const bool res = g_StdIn.ScanUStringUntilNewLine(psw); const bool res = g_StdIn.ScanUStringUntilNewLine(psw);
#endif tcsetattr(STDIN_FILENO, TCSANOW, &oldt);
#else
// Fallback: no echo masking
const bool res = g_StdIn.ScanUStringUntilNewLine(psw);
#endif
if (outStream) if (outStream)
{ {
*outStream << endl; *outStream << '\n';
outStream->Flush(); outStream->Flush();
} }