diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2020-01-17 20:45:01 +0000 | 
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2020-01-17 20:45:01 +0000 | 
| commit | 706b4fc47bbc608932d3b491ae19a3b9cde9497b (patch) | |
| tree | 4adf86a776049cbf7f69a1929c4babcbbef925eb /lldb/source/Host/common/Terminal.cpp | |
| parent | 7cc9cf2bf09f069cb2dd947ead05d0b54301fb71 (diff) | |
Notes
Diffstat (limited to 'lldb/source/Host/common/Terminal.cpp')
| -rw-r--r-- | lldb/source/Host/common/Terminal.cpp | 32 | 
1 files changed, 16 insertions, 16 deletions
diff --git a/lldb/source/Host/common/Terminal.cpp b/lldb/source/Host/common/Terminal.cpp index 4b536b03d852..e1aea26eeb90 100644 --- a/lldb/source/Host/common/Terminal.cpp +++ b/lldb/source/Host/common/Terminal.cpp @@ -15,7 +15,7 @@  #include <fcntl.h>  #include <signal.h> -#ifdef LLDB_CONFIG_TERMIOS_SUPPORTED +#if LLDB_ENABLE_TERMIOS  #include <termios.h>  #endif @@ -25,7 +25,7 @@ bool Terminal::IsATerminal() const { return m_fd >= 0 && ::isatty(m_fd); }  bool Terminal::SetEcho(bool enabled) {    if (FileDescriptorIsValid()) { -#ifdef LLDB_CONFIG_TERMIOS_SUPPORTED +#if LLDB_ENABLE_TERMIOS      if (IsATerminal()) {        struct termios fd_termios;        if (::tcgetattr(m_fd, &fd_termios) == 0) { @@ -47,14 +47,14 @@ bool Terminal::SetEcho(bool enabled) {          return ::tcsetattr(m_fd, TCSANOW, &fd_termios) == 0;        }      } -#endif // #ifdef LLDB_CONFIG_TERMIOS_SUPPORTED +#endif // #if LLDB_ENABLE_TERMIOS    }    return false;  }  bool Terminal::SetCanonical(bool enabled) {    if (FileDescriptorIsValid()) { -#ifdef LLDB_CONFIG_TERMIOS_SUPPORTED +#if LLDB_ENABLE_TERMIOS      if (IsATerminal()) {        struct termios fd_termios;        if (::tcgetattr(m_fd, &fd_termios) == 0) { @@ -76,7 +76,7 @@ bool Terminal::SetCanonical(bool enabled) {          return ::tcsetattr(m_fd, TCSANOW, &fd_termios) == 0;        }      } -#endif // #ifdef LLDB_CONFIG_TERMIOS_SUPPORTED +#endif // #if LLDB_ENABLE_TERMIOS    }    return false;  } @@ -84,7 +84,7 @@ bool Terminal::SetCanonical(bool enabled) {  // Default constructor  TerminalState::TerminalState()      : m_tty(), m_tflags(-1), -#ifdef LLDB_CONFIG_TERMIOS_SUPPORTED +#if LLDB_ENABLE_TERMIOS        m_termios_up(),  #endif        m_process_group(-1) { @@ -96,7 +96,7 @@ TerminalState::~TerminalState() {}  void TerminalState::Clear() {    m_tty.Clear();    m_tflags = -1; -#ifdef LLDB_CONFIG_TERMIOS_SUPPORTED +#if LLDB_ENABLE_TERMIOS    m_termios_up.reset();  #endif    m_process_group = -1; @@ -108,17 +108,17 @@ void TerminalState::Clear() {  bool TerminalState::Save(int fd, bool save_process_group) {    m_tty.SetFileDescriptor(fd);    if (m_tty.IsATerminal()) { -#ifndef LLDB_DISABLE_POSIX +#if LLDB_ENABLE_POSIX      m_tflags = ::fcntl(fd, F_GETFL, 0);  #endif -#ifdef LLDB_CONFIG_TERMIOS_SUPPORTED +#if LLDB_ENABLE_TERMIOS      if (m_termios_up == nullptr)        m_termios_up.reset(new struct termios);      int err = ::tcgetattr(fd, m_termios_up.get());      if (err != 0)        m_termios_up.reset(); -#endif // #ifdef LLDB_CONFIG_TERMIOS_SUPPORTED -#ifndef LLDB_DISABLE_POSIX +#endif // #if LLDB_ENABLE_TERMIOS +#if LLDB_ENABLE_POSIX      if (save_process_group)        m_process_group = ::tcgetpgrp(0);      else @@ -127,7 +127,7 @@ bool TerminalState::Save(int fd, bool save_process_group) {    } else {      m_tty.Clear();      m_tflags = -1; -#ifdef LLDB_CONFIG_TERMIOS_SUPPORTED +#if LLDB_ENABLE_TERMIOS      m_termios_up.reset();  #endif      m_process_group = -1; @@ -138,16 +138,16 @@ bool TerminalState::Save(int fd, bool save_process_group) {  // Restore the state of the TTY using the cached values from a previous call to  // Save().  bool TerminalState::Restore() const { -#ifndef LLDB_DISABLE_POSIX +#if LLDB_ENABLE_POSIX    if (IsValid()) {      const int fd = m_tty.GetFileDescriptor();      if (TFlagsIsValid())        fcntl(fd, F_SETFL, m_tflags); -#ifdef LLDB_CONFIG_TERMIOS_SUPPORTED +#if LLDB_ENABLE_TERMIOS      if (TTYStateIsValid())        tcsetattr(fd, TCSANOW, m_termios_up.get()); -#endif // #ifdef LLDB_CONFIG_TERMIOS_SUPPORTED +#endif // #if LLDB_ENABLE_TERMIOS      if (ProcessGroupIsValid()) {        // Save the original signal handler. @@ -176,7 +176,7 @@ bool TerminalState::TFlagsIsValid() const { return m_tflags != -1; }  // Returns true if m_ttystate is valid  bool TerminalState::TTYStateIsValid() const { -#ifdef LLDB_CONFIG_TERMIOS_SUPPORTED +#if LLDB_ENABLE_TERMIOS    return m_termios_up != nullptr;  #else    return false;  | 
