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

libc: Make File_descriptor::fd_path char const *

This commit is contained in:
Norman Feske 2014-04-12 00:03:40 +02:00 committed by Christian Helmuth
parent dd9b606182
commit a011c76d85
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libports/include/libc-plugin/fd_alloc.h
View File

@ -40,7 +40,7 @@ namespace Libc {
struct File_descriptor
{
int libc_fd = -1;
char *fd_path = 0; /* for 'fchdir', 'fstat' */
char const *fd_path = 0; /* for 'fchdir', 'fstat' */
Plugin *plugin = 0;
Plugin_context *context = 0;
unsigned flags = 0; /* for 'fcntl' */
@ -50,14 +50,15 @@ namespace Libc {
void path(char const *newpath)
{
if (newpath) {
size_t path_size = ::strlen(newpath) + 1;
fd_path = (char*)malloc(path_size);
if (!fd_path) {
size_t const path_size = ::strlen(newpath) + 1;
char *buf = (char*)malloc(path_size);
if (!buf) {
PERR("could not allocate path buffer for libc_fd %d%s",
libc_fd, libc_fd == ANY_FD ? " (any)" : "");
return;
}
::memcpy(fd_path, newpath, path_size);
::memcpy(buf, newpath, path_size);
fd_path = buf;
} else
fd_path = 0;
}

2
libports/src/lib/libc/fd_alloc.cc
View File

@ -72,7 +72,7 @@ File_descriptor *File_descriptor_allocator::alloc(Plugin *plugin,
void File_descriptor_allocator::free(File_descriptor *fdo)
{
::free(fdo->fd_path);
::free((void *)fdo->fd_path);
Allocator_avl_base::free(reinterpret_cast<void*>(fdo->libc_fd));
}