ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-01-31 16:35:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libc_terminal: remove use of deprecated APIs

Browse Source 
Issue #1987
This commit is contained in:
Norman Feske 2019-01-21 09:38:20 +01:00
parent fdbf30fc4c
commit 8cc11d6cc6
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
repos/libports/src/lib/libc_terminal/plugin.cc
View File

@ -14,6 +14,7 @@
/* libc plugin interface */ /* libc plugin interface */
#include <libc-plugin/plugin.h> #include <libc-plugin/plugin.h>
#include <libc-plugin/fd_alloc.h> #include <libc-plugin/fd_alloc.h>
#include <libc/allocator.h>
/* libc includes */ /* libc includes */
#include <errno.h> #include <errno.h>
@ -108,8 +109,10 @@ namespace {
public: public:
Plugin_context() Plugin_context(Genode::Env &env)
: _status_flags(0) :
Terminal::Connection(env),
_status_flags(0)
{ {
read_avail_sigh(read_sigh()); read_avail_sigh(read_sigh());
} }
@ -132,6 +135,10 @@ namespace {
{ {
private: private:
Genode::Env *_env_ptr = nullptr;
Libc::Allocator _alloc { };
/** /**
* File name this plugin feels responsible for * File name this plugin feels responsible for
*/ */
@ -149,6 +156,8 @@ namespace {
*/ */
Plugin() : Libc::Plugin(PLUGIN_PRIORITY) { } Plugin() : Libc::Plugin(PLUGIN_PRIORITY) { }
void init(Genode::Env &env) override { _env_ptr = &env; }
bool supports_stat(const char *path) bool supports_stat(const char *path)
{ {
return (Genode::strcmp(path, "/dev") == 0) || return (Genode::strcmp(path, "/dev") == 0) ||
@ -162,14 +171,18 @@ namespace {
Libc::File_descriptor *open(const char *pathname, int flags) Libc::File_descriptor *open(const char *pathname, int flags)
{ {
Plugin_context *context = new (Genode::env()->heap()) Plugin_context; if (!_env_ptr)
Genode::error("libc_terminal: missing call of Plugin::init");
Plugin_context *context = new (_alloc) Plugin_context(*_env_ptr);
context->status_flags(flags); context->status_flags(flags);
return Libc::file_descriptor_allocator()->alloc(this, context); return Libc::file_descriptor_allocator()->alloc(this, context);
} }
int close(Libc::File_descriptor *fd) int close(Libc::File_descriptor *fd)
{ {
Genode::destroy(Genode::env()->heap(), context(fd)); Genode::destroy(_alloc, context(fd));
Libc::file_descriptor_allocator()->free(fd); Libc::file_descriptor_allocator()->free(fd);
return 0; return 0;
} }