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

Noux: handle 'not a directory' error in fchdir() 

Fixes #298.
This commit is contained in:
Christian Prochaska 2012-07-24 18:47:16 +02:00 committed by Norman Feske
parent 55815e4a3a
commit 5f1a66b90c
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/include/noux_session/sysio.h
View File

@ -273,6 +273,7 @@ namespace Noux {
enum General_error { ERR_FD_INVALID, NUM_GENERAL_ERRORS };
enum Stat_error { STAT_ERR_NO_ENTRY = NUM_GENERAL_ERRORS };
enum Fchdir_error { FCHDIR_ERR_NOT_DIR = NUM_GENERAL_ERRORS };
enum Fcntl_error { FCNTL_ERR_CMD_INVALID = NUM_GENERAL_ERRORS };
enum Open_error { OPEN_ERR_UNACCESSIBLE, OPEN_ERR_NO_PERM };
enum Execve_error { EXECVE_NONEXISTENT = NUM_GENERAL_ERRORS };
@ -286,6 +287,7 @@ namespace Noux {
union {
General_error general;
Stat_error stat;
Fchdir_error fchdir;
Fcntl_error fcntl;
Open_error open;
Execve_error execve;

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

@ -983,8 +983,10 @@ namespace {
{
sysio()->fchdir_in.fd = noux_fd(fd->context);
if (!noux()->syscall(Noux::Session::SYSCALL_FCHDIR)) {
PERR("fchdir error");
/* XXX set errno */
switch (sysio()->error.fchdir) {
case Noux::Sysio::FCHDIR_ERR_NOT_DIR: errno = ENOTDIR; break;
default: errno = EPERM; break;
}
return -1;
}

18
ports/src/noux/vfs_io_channel.h
View File

@ -56,7 +56,13 @@ namespace Noux {
bool fstat(Sysio *sysio)
{
return _fh->ds()->stat(sysio, _leaf_path.base());
/*
* 'sysio.stat_in' is not used in '_fh->ds()->stat()',
* so no 'sysio' member translation is needed here
*/
bool result = _fh->ds()->stat(sysio, _leaf_path.base());
sysio->fstat_out.st = sysio->stat_out.st;
return result;
}
bool fcntl(Sysio *sysio)
@ -78,6 +84,16 @@ namespace Noux {
bool fchdir(Sysio *sysio, Pwd *pwd)
{
sysio->fstat_in.fd = sysio->fchdir_in.fd;
fstat(sysio);
if ((sysio->fstat_out.st.mode & Sysio::STAT_MODE_DIRECTORY) !=
Sysio::STAT_MODE_DIRECTORY) {
sysio->error.fchdir = Sysio::FCHDIR_ERR_NOT_DIR;
return false;
}
pwd->pwd(_path.base());
return true;
}