ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-18 21:27:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Return ECHO flag from TIOCGETA ioctl

Browse Source 
This patch sets the ECHO flag for the TIOCGETA ioctrl operation. This
flag is examined by libreadline to control the policy of echoing user
input. This patch in needed to run bash in interactive mode in Noux.
This commit is contained in:
Norman Feske 2011-12-26 20:12:48 +01:00
parent d09c7e699e
commit b5d7a75a22
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ports/src/lib/libc_noux/plugin.cc
View File

@ -34,6 +34,7 @@
#include <sys/dirent.h>
#include <sys/ioctl.h>
#include <unistd.h>
#include <termios.h>
@ -365,6 +366,10 @@ namespace {
sysio()->open_in.mode = flags;
if (!noux()->syscall(Noux::Session::SYSCALL_OPEN)) {
/*
* XXX we should return meaningful errno values
*/
errno = ENOENT;
return 0;
}
@ -474,7 +479,24 @@ namespace {
sysio()->ioctl_in.request = Noux::Sysio::Ioctl_in::OP_TIOCGWINSZ;
break;
case TIOCGETA:
{
PDBG("TIOCGETA - argp=0x%p", argp);
::termios *termios = (::termios *)argp;
/*
* Set 'ECHO' flag, needed by libreadline. Otherwise, echoing
* user input doesn't work in bash.
*/
termios->c_lflag = ECHO;
return 0;
}
break;
default:
PWRN("unsupported ioctl (request=0x%x", request);
break;
}
@ -535,6 +557,7 @@ namespace {
break;
case F_GETFL:
PINF("fcntl: F_GETFL for libc_fd=%d", fd->libc_fd);
sysio()->fcntl_in.cmd = Noux::Sysio::FCNTL_CMD_GET_FILE_STATUS_FLAGS;
break;
@ -546,7 +569,7 @@ namespace {
/* invoke system call */
if (!noux()->syscall(Noux::Session::SYSCALL_FCNTL)) {
PWRN("fcntl failed");
PWRN("fcntl failed (libc_fd= %d, cmd=%x)", fd->libc_fd, cmd);
/* XXX read error code from sysio */
errno = EINVAL;
return -1;

2
ports/src/noux-pkg/bash/target.mk
View File

@ -1,4 +1,4 @@
NOUX_CONFIGURE_ARGS = --disable-readline --without-bash-malloc
NOUX_CONFIGURE_ARGS = --without-bash-malloc
NOUX_CFLAGS += -Dsh_xfree=free
#