Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kpty: assume tcgetattr() and tcsetattr() are available

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-06-16 19:19:32 +03:00
parent e529267d21
commit d6d58917bc
3 changed files with 4 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ConfigureChecks.cmake
View file

@ -151,8 +151,6 @@ if (UNIX)
endif (openpty_in_libc OR openpty_in_libutil)
check_function_exists(ptsname_r HAVE_PTSNAME_R)
check_function_exists(tcgetattr HAVE_TCGETATTR)
check_function_exists(tcsetattr HAVE_TCSETATTR)
endif (UNIX)
check_function_exists(getmntinfo HAVE_GETMNTINFO) # kdecore, kio

2
config-pty.h.cmake
View file

@ -8,8 +8,6 @@
#cmakedefine HAVE_PTSNAME_R 1
#cmakedefine HAVE_REVOKE 1
#cmakedefine HAVE_UNLOCKPT 1
#cmakedefine HAVE_TCGETATTR
#cmakedefine HAVE_TCSETATTR
#cmakedefine HAVE_PTY_H 1
#cmakedefine HAVE_TERMIO_H 1

24
kpty/kpty.cpp
View file

@ -84,22 +84,6 @@ extern "C" {
# define _NEW_TTY_CTRL
#endif
#if defined HAVE_TCGETATTR
# define _tcgetattr(fd, ttmode) tcgetattr(fd, ttmode)
#elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) || defined(Q_OS_OPENBSD) || defined(Q_OS_DRAGONFLY)
# define _tcgetattr(fd, ttmode) ioctl(fd, TIOCGETA, (char *)ttmode)
#else
# define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode)
#endif
#if defined HAVE_TCSETATTR
# define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode)
#elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) || defined(Q_OS_OPENBSD) || defined(Q_OS_DRAGONFLY)
# define _tcsetattr(fd, ttmode) ioctl(fd, TIOCSETA, (char *)ttmode)
#else
# define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode)
#endif
#include <kdebug.h>
#include <kstandarddirs.h> // findExe
#include <kde_file.h>
@ -608,9 +592,9 @@ bool KPty::tcGetAttr(struct ::termios *ttmode) const
Q_D(const KPty);
#ifdef Q_OS_SOLARIS
if (_tcgetattr(d->slaveFd, ttmode) == 0) return true;
if (::tcgetattr(d->slaveFd, ttmode) == 0) return true;
#endif
return _tcgetattr(d->masterFd, ttmode) == 0;
return ::tcgetattr(d->masterFd, ttmode) == 0;
}
bool KPty::tcSetAttr(struct ::termios *ttmode)
@ -618,9 +602,9 @@ bool KPty::tcSetAttr(struct ::termios *ttmode)
Q_D(KPty);
#ifdef Q_OS_SOLARIS
if (_tcsetattr(d->slaveFd, ttmode) == 0) return true;
if (::tcsetattr(d->slaveFd, TCSANOW, ttmode) == 0) return true;
#endif
return _tcsetattr(d->masterFd, ttmode) == 0;
return ::tcsetattr(d->masterFd, TCSANOW, ttmode) == 0;
}
bool KPty::setWinSize(int lines, int columns)