firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 16:43:03 +01:00
Code Issues

CORE-1667 - turn echo off

Browse Source
This commit is contained in:
alexpeshkoff 2008-12-01 15:40:27 +00:00
parent 3964af33dd
commit 2340d1f9d3
2 changed files with 51 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -489,8 +489,8 @@ AC_CHECK_HEADERS(stdarg.h)
AC_CHECK_HEADERS(stdlib.h)
AC_CHECK_HEADERS(string.h)
AC_CHECK_HEADERS(signal.h sys/signal.h sys/siginfo.h)
AC_CHECK_HEADERS(termio.h termios.h)
if test "$EDITLINE_FLG" = "Y"; then
AC_CHECK_HEADERS(termio.h termios.h)
AC_HEADER_DIRENT
AC_DEFINE(HAVE_EDITLINE_H, 1, [Define this if editline is in use])
fi

59
src/common/utils.cpp
View File

@ -51,6 +51,9 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef HAVE_TERMIOS_H
#include <termios.h>
#endif
namespace fb_utils
{
@ -686,33 +689,71 @@ void getCwd(Firebird::PathName& pn)
}
namespace {
class FileClose
class InputFile
{
public:
static void clear(FILE* f)
InputFile(const Firebird::PathName& name)
: flagEcho(false)
{
if (name == "stdin") {
f = stdin;
}
else {
f = fopen(name.c_str(), "rt");
}
if (isatty(fileno(f))) {
#ifdef HAVE_TERMIOS_H
flagEcho = tcgetattr(fileno(f), &oldState) == 0;
if (flagEcho)
{
flagEcho = oldState.c_lflag & ECHO;
}
if (flagEcho)
{
struct termios newState(oldState);
newState.c_lflag &= ~ECHO;
tcsetattr(fileno(f), TCSANOW, &newState);
}
fprintf(stderr, "Enter password: ");
fflush(stderr);
#endif
}
}
~InputFile()
{
#ifdef HAVE_TERMIOS_H
if (flagEcho) {
fprintf(stderr, "\n");
fflush(stderr);
tcsetattr(fileno(f), TCSANOW, &oldState);
}
#endif
if (f && f != stdin) {
fclose(f);
}
}
operator FILE*() { return f;}
bool operator!() { return !f; }
private:
FILE* f;
#ifdef HAVE_TERMIOS_H
struct termios oldState;
#endif
bool flagEcho;
};
} // namespace
// fetch password from file
FetchPassResult fetchPassword(const Firebird::PathName& name, const char*& password)
{
Firebird::AutoPtr<FILE, FileClose> file((name == "stdin") ? stdin : fopen(name.c_str(), "rt"));
InputFile file(name);
if (!file)
{
return FETCH_PASS_FILE_OPEN_ERROR;
}
if (isatty(fileno(file)))
{
fprintf(stderr, "Enter password: ");
fflush(stderr);
}
Firebird::string pwd;
if (! pwd.LoadFromFile(file))
{