ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Noux: connect standard streams to VFS nodes 

Fixes #1693
This commit is contained in:
Emery Hemingway 2015-09-17 15:03:52 +02:00 committed by Christian Helmuth
parent 20f961cbd8
commit d5dc25adef
3 changed files with 56 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
repos/ports/src/lib/libc_noux/plugin.cc
View File

@ -1450,8 +1450,9 @@ namespace {
if (!noux_syscall(Noux::Session::SYSCALL_FTRUNCATE)) {
switch (sysio()->error.ftruncate) {
case Vfs::File_io_service::FTRUNCATE_OK: /* never reached */
case Vfs::File_io_service::FTRUNCATE_ERR_NO_PERM: errno = EPERM; break;
case Vfs::File_io_service::FTRUNCATE_ERR_INTERRUPT: errno = EINTR; break;
case Vfs::File_io_service::FTRUNCATE_ERR_NO_PERM: errno = EPERM; break;
case Vfs::File_io_service::FTRUNCATE_ERR_INTERRUPT: errno = EINTR; break;
case Vfs::File_io_service::FTRUNCATE_ERR_NO_SPACE: errno = ENOSPC; break;
}
return -1;
}

2
repos/ports/src/noux/local_rm_service.h
View File

@ -126,7 +126,7 @@ namespace Noux {
void close(Genode::Session_capability session)
{
Dataspace_info *info;
Dataspace_info *info = nullptr;;
auto lambda = [&] (Rm_session_component *rm_session) {
if (!rm_session) {

55
repos/ports/src/noux/main.cc
View File

@ -1002,6 +1002,55 @@ Terminal::Connection *Noux::terminal()
}
static Noux::Io_channel *connect_stdio(Vfs::Dir_file_system &root,
Noux::Terminal_io_channel::Type type,
Genode::Signal_receiver &sig_rec)
{
using namespace Vfs;
using namespace Noux;
typedef Terminal_io_channel Tio; /* just a local abbreviation */
char path[MAX_PATH_LEN];
Vfs_handle *vfs_handle = nullptr;
char const *stdio_name = "";
unsigned mode = 0;
switch (type) {
case Tio::STDIN:
stdio_name = "stdin";
mode = Directory_service::OPEN_MODE_RDONLY;
break;
case Tio::STDOUT:
stdio_name = "stdout";
mode = Directory_service::OPEN_MODE_WRONLY;
break;
case Tio::STDERR:
stdio_name = "stderr";
mode = Directory_service::OPEN_MODE_WRONLY;
break;
};
try {
config()->xml_node().attribute(stdio_name).value(
path, sizeof(path));
if (root.open(path, mode, &vfs_handle) != Directory_service::OPEN_OK) {
PERR("failed to connect %s to '%s'", stdio_name, path);
Genode::env()->parent()->exit(1);
}
return new (Genode::env()->heap())
Vfs_io_channel("", path, &root, vfs_handle, sig_rec);
} catch (Genode::Xml_node::Nonexistent_attribute) {
PWRN("%s VFS path not defined, connecting to Terminal session", stdio_name);
}
return new (Genode::env()->heap())
Tio(*Noux::terminal(), type, sig_rec);
}
Genode::Dataspace_capability Noux::ldso_ds_cap()
{
try {
@ -1135,9 +1184,9 @@ int main(int argc, char **argv)
*/
typedef Terminal_io_channel Tio; /* just a local abbreviation */
Shared_pointer<Io_channel>
channel_0(new Tio(*Noux::terminal(), Tio::STDIN, sig_rec), Genode::env()->heap()),
channel_1(new Tio(*Noux::terminal(), Tio::STDOUT, sig_rec), Genode::env()->heap()),
channel_2(new Tio(*Noux::terminal(), Tio::STDERR, sig_rec), Genode::env()->heap());
channel_0(connect_stdio(root_dir, Tio::STDIN, sig_rec), Genode::env()->heap()),
channel_1(connect_stdio(root_dir, Tio::STDOUT, sig_rec), Genode::env()->heap()),
channel_2(connect_stdio(root_dir, Tio::STDERR, sig_rec), Genode::env()->heap());
init_child->add_io_channel(channel_0, 0);
init_child->add_io_channel(channel_1, 1);