package org.ibex.nestedvm;
import org.ibex.nestedvm.util.*;
+// FEATURE: This is ugly, this stuff needs to be in org.ibex.util or something
+import org.ibex.classgen.util.Sort;
import java.io.*;
import java.util.*;
+import java.net.*;
+
+// FEATURE: vfork
public abstract class UnixRuntime extends Runtime implements Cloneable {
/** The pid of this "process" */
// FEATURE: Do the proper mangling for non-unix hosts
String userdir = getSystemProperty("user.dir");
cwd =
- userdir != null && userdir.startsWith("/") && File.separatorChar == '/' && HostFS.hostRootDir().getParent() == null
+ userdir != null && userdir.startsWith("/") && File.separatorChar == '/' && getSystemProperty("nestedvm.root") == null
? userdir.substring(1) : "";
}
- // NOTE: getDisplayName() is a Java2 function
private static String posixTZ() {
StringBuffer sb = new StringBuffer();
TimeZone zone = TimeZone.getDefault();
int off = zone.getRawOffset() / 1000;
- sb.append(zone.getDisplayName(false,TimeZone.SHORT));
+ sb.append(Platform.timeZoneGetDisplayName(zone,false,false));
if(off > 0) sb.append("-");
else off = -off;
sb.append(off/3600); off = off%3600;
if(off > 0) sb.append(":").append(off/60); off=off%60;
if(off > 0) sb.append(":").append(off);
if(zone.useDaylightTime())
- sb.append(zone.getDisplayName(true,TimeZone.SHORT));
+ sb.append(Platform.timeZoneGetDisplayName(zone,true,false));
return sb.toString();
}
}
String[] createEnv(String[] extra) {
- String[] defaults = new String[5];
+ String[] defaults = new String[6];
int n=0;
if(extra == null) extra = new String[0];
if(!envHas("USER",extra) && getSystemProperty("user.name") != null)
if(!envHas("SHELL",extra)) defaults[n++] = "SHELL=/bin/sh";
if(!envHas("TERM",extra)) defaults[n++] = "TERM=vt100";
if(!envHas("TZ",extra)) defaults[n++] = "TZ=" + posixTZ();
+ if(!envHas("PATH",extra)) defaults[n++] = "PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin";
String[] env = new String[extra.length+n];
for(int i=0;i<n;i++) env[i] = defaults[i];
for(int i=0;i<extra.length;i++) env[n++] = extra[i];
UnixRuntime[] tasks = gs.tasks;
synchronized(gs) {
if(pid != 0) {
- if(tasks[pid] == null || tasks[pid].pid != pid) throw new Error("should never happen");
+ UnixRuntime prev = tasks[pid];
+ if(prev == null || prev == this || prev.pid != pid || prev.parent != parent)
+ throw new Error("should never happen");
+ synchronized(parent.children) {
+ int i = parent.activeChildren.indexOf(prev);
+ if(i == -1) throw new Error("should never happen");
+ parent.activeChildren.setElementAt(this,i);
+ }
} else {
int newpid = -1;
int nextPID = gs.nextPID;
- for(int i=nextPID;i<tasks.length;i++) if(tasks[i] == null) { newpid = i; break; }
- if(newpid == -1) for(int i=1;i<nextPID;i++) if(tasks[i] == null) { newpid = i; break; }
- if(newpid == -1) throw new ProcessTableFullExn();
- pid = newpid;
+ for(int i=nextPID;i<tasks.length;i++) if(tasks[i] == null) { newpid = i; break; }
+ if(newpid == -1) for(int i=1;i<nextPID;i++) if(tasks[i] == null) { newpid = i; break; }
+ if(newpid == -1) throw new ProcessTableFullExn();
+ pid = newpid;
gs.nextPID = newpid + 1;
}
tasks[pid] = this;
}
}
- int _syscall(int syscall, int a, int b, int c, int d) throws ErrnoException, FaultException {
+ int _syscall(int syscall, int a, int b, int c, int d, int e, int f) throws ErrnoException, FaultException {
switch(syscall) {
case SYS_kill: return sys_kill(a,b);
case SYS_fork: return sys_fork();
case SYS_chdir: return sys_chdir(a);
case SYS_exec: return sys_exec(a,b,c);
case SYS_getdents: return sys_getdents(a,b,c,d);
+ case SYS_unlink: return sys_unlink(a);
+ case SYS_getppid: return sys_getppid();
+ case SYS_socket: return sys_socket(a,b,c);
+ case SYS_connect: return sys_connect(a,b,c);
+ case SYS_resolve_hostname: return sys_resolve_hostname(a,b,c);
+ case SYS_setsockopt: return sys_setsockopt(a,b,c,d,e);
+ case SYS_getsockopt: return sys_getsockopt(a,b,c,d,e);
+ case SYS_bind: return sys_bind(a,b,c);
+ case SYS_listen: return sys_listen(a,b);
+ case SYS_accept: return sys_accept(a,b,c);
+ case SYS_shutdown: return sys_shutdown(a,b);
+ case SYS_sysctl: return sys_sysctl(a,b,c,d,e,f);
- default: return super._syscall(syscall,a,b,c,d);
+ default: return super._syscall(syscall,a,b,c,d,e,f);
}
}
FD _open(String path, int flags, int mode) throws ErrnoException {
return gs.open(this,normalizePath(path),flags,mode);
}
+
+ private int sys_getppid() {
+ return parent == null ? 1 : parent.pid;
+ }
/** The kill syscall.
SIGSTOP, SIGTSTO, SIGTTIN, and SIGTTOUT pause the process.
case 28: // SIGWINCH
break;
default:
- return syscall(SYS_exit,128+signal,0,0,0);
+ // FEATURE: This is ugly, make a clean interface to sys_exit
+ return syscall(SYS_exit,128+signal,0,0,0,0,0);
}
return 0;
}
synchronized(children) {
for(;;) {
if(pid == -1) {
- if(exitedChildren.size() > 0) done = (UnixRuntime)exitedChildren.remove(exitedChildren.size() - 1);
+ if(exitedChildren.size() > 0) {
+ done = (UnixRuntime)exitedChildren.elementAt(exitedChildren.size() - 1);
+ exitedChildren.removeElementAt(exitedChildren.size() - 1);
+ }
} else if(pid > 0) {
UnixRuntime t = gs.tasks[pid];
if(t.parent != this) return -ECHILD;
if(t.state == EXITED) {
- if(!exitedChildren.remove(t)) throw new Error("should never happen");
+ if(!exitedChildren.removeElement(t)) throw new Error("should never happen");
done = t;
}
} else {
UnixRuntime child = (UnixRuntime) e.nextElement();
gs.tasks[child.pid] = null;
}
- exitedChildren.clear();
+ exitedChildren.removeAllElements();
for(Enumeration e = activeChildren.elements(); e.hasMoreElements(); ) {
UnixRuntime child = (UnixRuntime) e.nextElement();
child.parent = null;
}
- activeChildren.clear();
+ activeChildren.removeAllElements();
}
UnixRuntime _parent = parent;
if(parent == null) {
gs.tasks[pid] = null;
} else {
- parent.activeChildren.remove(this);
- parent.exitedChildren.add(this);
+ if(!parent.activeChildren.removeElement(this)) throw new Error("should never happen _exited: pid: " + pid);
+ parent.exitedChildren.addElement(this);
parent.children.notify();
}
}
activeChildren = new Vector();
exitedChildren = new Vector();
}
- activeChildren.add(r);
+ activeChildren.addElement(r);
state.r[V0] = 0; // return 0 to child
state.pc += 4; // skip over syscall instruction
private int exec(String normalizedPath, String[] argv, String[] envp) throws ErrnoException {
if(argv.length == 0) argv = new String[]{""};
+ // NOTE: For this little hack to work nestedvm.root MUST be "."
+ /*try {
+ System.err.println("Execing normalized path: " + normalizedPath);
+ if(true) return exec(new Interpreter(normalizedPath),argv,envp);
+ } catch(IOException e) { throw new Error(e); }*/
+
Object o = gs.exec(this,normalizedPath);
if(o == null) return -ENOENT;
if(o instanceof Class) {
Class c = (Class) o;
try {
- return exec((UnixRuntime) c.newInstance(),argv,envp);
+ return exec((UnixRuntime) c.newInstance(),argv,envp);
} catch(Exception e) {
- e.printStackTrace();
+ e.printStackTrace();
return -ENOEXEC;
}
} else {
return 0;
}
+ private int sys_unlink(int cstring) throws FaultException, ErrnoException {
+ gs.unlink(this,normalizePath(cstring(cstring)));
+ return 0;
+ }
+
private int sys_getcwd(int addr, int size) throws FaultException, ErrnoException {
byte[] b = getBytes(cwd);
if(size == 0) return -EINVAL;
private int sys_chdir(int addr) throws ErrnoException, FaultException {
String path = normalizePath(cstring(addr));
- //System.err.println("Chdir: " + cstring(addr) + " -> " + path + " pwd: " + cwd);
- if(gs.stat(this,path).type() != FStat.S_IFDIR) return -ENOTDIR;
+ FStat st = gs.stat(this,path);
+ if(st == null) return -ENOENT;
+ if(st.type() != FStat.S_IFDIR) return -ENOTDIR;
cwd = path;
- //System.err.println("Now: [" + cwd + "]");
return 0;
}
return n;
}
+ // FEATURE: UDP is totally broken
+
+ static class SocketFD extends FD {
+ public static final int TYPE_STREAM = 0;
+ public static final int TYPE_DGRAM = 1;
+ public static final int LISTEN = 2;
+ public int type() { return flags & 1; }
+ public boolean listen() { return (flags & 2) != 0; }
+
+ int flags;
+ int options;
+ Object o;
+ InetAddress bindAddr;
+ int bindPort = -1;
+ DatagramPacket dp;
+ InputStream is;
+ OutputStream os;
+
+ public SocketFD(int type) { flags = type; }
+
+ public void setOptions() {
+ try {
+ if(o != null && type() == TYPE_STREAM && !listen()) {
+ Platform.socketSetKeepAlive((Socket)o,(options & SO_KEEPALIVE) != 0);
+ }
+ } catch(SocketException e) {
+ if(STDERR_DIAG) e.printStackTrace();
+ }
+ }
+
+ public void _close() {
+ if(o != null) {
+ try {
+ if(type() == TYPE_STREAM) {
+ if(listen()) ((ServerSocket)o).close();
+ else ((Socket)o).close();
+ } else {
+ ((DatagramSocket)o).close();
+ }
+ } catch(IOException e) {
+ /* ignore */
+ }
+ }
+ }
+
+ public int read(byte[] a, int off, int length) throws ErrnoException {
+ if(type() == TYPE_STREAM) {
+ if(is == null) throw new ErrnoException(EPIPE);
+ try {
+ int n = is.read(a,off,length);
+ return n < 0 ? 0 : n;
+ } catch(IOException e) {
+ throw new ErrnoException(EIO);
+ }
+ } else {
+ if(off != 0) throw new IllegalArgumentException("off must be 0");
+ DatagramSocket ds = (DatagramSocket) o;
+ dp.setData(a);
+ dp.setLength(length);
+ try {
+ ds.receive(dp);
+ } catch(IOException e) {
+ throw new ErrnoException(EIO);
+ }
+ return dp.getLength();
+ }
+ }
+
+ public int write(byte[] a, int off, int length) throws ErrnoException {
+ if(type() == TYPE_STREAM) {
+ if(os == null) throw new ErrnoException(EPIPE);
+ try {
+ os.write(a,off,length);
+ return length;
+ } catch(IOException e) {
+ throw new ErrnoException(EIO);
+ }
+ } else {
+ if(off != 0) throw new IllegalArgumentException("off must be 0");
+ DatagramSocket ds = (DatagramSocket) o;
+ dp.setData(a);
+ dp.setLength(length);
+ try {
+ ds.send(dp);
+ } catch(IOException e) {
+ throw new ErrnoException(EIO);
+ }
+ return dp.getLength();
+ }
+ }
+
+ // FEATURE: Check that these are correct
+ public int flags() {
+ if(is != null && os != null) return O_RDWR;
+ if(is != null) return O_RDONLY;
+ if(os != null) return O_WRONLY;
+ return 0;
+ }
+
+ // FEATURE: Populate this properly
+ public FStat _fstat() { return new FStat(); }
+ }
+
+ private int sys_socket(int domain, int type, int proto) {
+ if(domain != AF_INET || (type != SOCK_STREAM && type != SOCK_DGRAM)) return -EPROTONOSUPPORT;
+ return addFD(new SocketFD(type == SOCK_STREAM ? SocketFD.TYPE_STREAM : SocketFD.TYPE_DGRAM));
+ }
+
+ private SocketFD getSocketFD(int fdn) throws ErrnoException {
+ if(fdn < 0 || fdn >= OPEN_MAX) throw new ErrnoException(EBADFD);
+ if(fds[fdn] == null) throw new ErrnoException(EBADFD);
+ if(!(fds[fdn] instanceof SocketFD)) throw new ErrnoException(ENOTSOCK);
+
+ return (SocketFD) fds[fdn];
+ }
+
+ private int sys_connect(int fdn, int addr, int namelen) throws ErrnoException, FaultException {
+ SocketFD fd = getSocketFD(fdn);
+
+ if(fd.type() == SocketFD.TYPE_STREAM && fd.o != null) return -EISCONN;
+ int word1 = memRead(addr);
+ if( ((word1 >>> 16)&0xff) != AF_INET) return -EAFNOSUPPORT;
+ int port = word1 & 0xffff;
+ byte[] ip = new byte[4];
+ copyin(addr+4,ip,4);
+
+ InetAddress inetAddr;
+ try {
+ inetAddr = Platform.inetAddressFromBytes(ip);
+ } catch(UnknownHostException e) {
+ return -EADDRNOTAVAIL;
+ }
+
+ try {
+ switch(fd.type()) {
+ case SocketFD.TYPE_STREAM: {
+ Socket s = new Socket(inetAddr,port);
+ fd.o = s;
+ fd.setOptions();
+ fd.is = s.getInputStream();
+ fd.os = s.getOutputStream();
+ break;
+ }
+ case SocketFD.TYPE_DGRAM: {
+ if(fd.dp == null) fd.dp = new DatagramPacket(null,0);
+ fd.dp.setAddress(inetAddr);
+ fd.dp.setPort(port);
+ break;
+ }
+ default:
+ throw new Error("should never happen");
+ }
+ } catch(IOException e) {
+ return -ECONNREFUSED;
+ }
+
+ return 0;
+ }
+
+ private int sys_resolve_hostname(int chostname, int addr, int sizeAddr) throws FaultException {
+ String hostname = cstring(chostname);
+ int size = memRead(sizeAddr);
+ InetAddress[] inetAddrs;
+ try {
+ inetAddrs = InetAddress.getAllByName(hostname);
+ } catch(UnknownHostException e) {
+ return HOST_NOT_FOUND;
+ }
+ int count = min(size/4,inetAddrs.length);
+ for(int i=0;i<count;i++,addr+=4) {
+ byte[] b = inetAddrs[i].getAddress();
+ copyout(b,addr,4);
+ }
+ memWrite(sizeAddr,count*4);
+ return 0;
+ }
+
+ private int sys_setsockopt(int fdn, int level, int name, int valaddr, int len) throws ReadFaultException, ErrnoException {
+ SocketFD fd = getSocketFD(fdn);
+ switch(level) {
+ case SOL_SOCKET:
+ switch(name) {
+ case SO_REUSEADDR:
+ case SO_KEEPALIVE: {
+ if(len != 4) return -EINVAL;
+ int val = memRead(valaddr);
+ if(val != 0) fd.options |= name;
+ else fd.options &= ~name;
+ fd.setOptions();
+ return 0;
+ }
+ default:
+ if(STDERR_DIAG) System.err.println("Unknown setsockopt name passed: " + name);
+ return -ENOPROTOOPT;
+ }
+ default:
+ if(STDERR_DIAG) System.err.println("Unknown setsockopt leve passed: " + level);
+ return -ENOPROTOOPT;
+ }
+ }
+
+ private int sys_getsockopt(int fdn, int level, int name, int valaddr, int lenaddr) throws ErrnoException, FaultException {
+ SocketFD fd = getSocketFD(fdn);
+ switch(level) {
+ case SOL_SOCKET:
+ switch(name) {
+ case SO_REUSEADDR:
+ case SO_KEEPALIVE: {
+ int len = memRead(lenaddr);
+ if(len < 4) return -EINVAL;
+ int val = (fd.options & name) != 0 ? 1 : 0;
+ memWrite(valaddr,val);
+ memWrite(lenaddr,4);
+ return 0;
+ }
+ default:
+ if(STDERR_DIAG) System.err.println("Unknown setsockopt name passed: " + name);
+ return -ENOPROTOOPT;
+ }
+ default:
+ if(STDERR_DIAG) System.err.println("Unknown setsockopt leve passed: " + level);
+ return -ENOPROTOOPT;
+ }
+ }
+
+ private int sys_bind(int fdn, int addr, int namelen) throws FaultException, ErrnoException {
+ SocketFD fd = getSocketFD(fdn);
+
+ if(fd.type() == SocketFD.TYPE_STREAM && fd.o != null) return -EISCONN;
+ int word1 = memRead(addr);
+ if( ((word1 >>> 16)&0xff) != AF_INET) return -EAFNOSUPPORT;
+ int port = word1 & 0xffff;
+ InetAddress inetAddr = null;
+ if(memRead(addr+4) != 0) {
+ byte[] ip = new byte[4];
+ copyin(addr+4,ip,4);
+
+ try {
+ inetAddr = Platform.inetAddressFromBytes(ip);
+ } catch(UnknownHostException e) {
+ return -EADDRNOTAVAIL;
+ }
+ }
+
+ switch(fd.type()) {
+ case SocketFD.TYPE_STREAM: {
+ fd.bindAddr = inetAddr;
+ fd.bindPort = port;
+ return 0;
+ }
+ case SocketFD.TYPE_DGRAM: {
+ DatagramSocket s = (DatagramSocket) fd.o;
+ if(s != null) s.close();
+ try {
+ fd.o = inetAddr != null ? new DatagramSocket(port,inetAddr) : new DatagramSocket(port);
+ } catch(IOException e) {
+ return -EADDRINUSE;
+ }
+ return 0;
+ }
+ default:
+ throw new Error("should never happen");
+ }
+ }
+
+ private int sys_listen(int fdn, int backlog) throws ErrnoException {
+ SocketFD fd = getSocketFD(fdn);
+ if(fd.type() != SocketFD.TYPE_STREAM) return -EOPNOTSUPP;
+ if(fd.o != null) return -EISCONN;
+ if(fd.bindPort < 0) return -EOPNOTSUPP;
+
+ try {
+ fd.o = new ServerSocket(fd.bindPort,backlog,fd.bindAddr);
+ fd.flags |= SocketFD.LISTEN;
+ return 0;
+ } catch(IOException e) {
+ return -EADDRINUSE;
+ }
+
+ }
+
+ private int sys_accept(int fdn, int addr, int lenaddr) throws ErrnoException, FaultException {
+ SocketFD fd = getSocketFD(fdn);
+ if(fd.type() != SocketFD.TYPE_STREAM) return -EOPNOTSUPP;
+ if(!fd.listen()) return -EOPNOTSUPP;
+
+ int size = memRead(lenaddr);
+
+ ServerSocket s = (ServerSocket) fd.o;
+ Socket client;
+ try {
+ client = s.accept();
+ } catch(IOException e) {
+ return -EIO;
+ }
+
+ if(size >= 8) {
+ memWrite(addr,(6 << 24) | (AF_INET << 16) | client.getPort());
+ byte[] b = client.getInetAddress().getAddress();
+ copyout(b,addr+4,4);
+ memWrite(lenaddr,8);
+ }
+
+ SocketFD clientFD = new SocketFD(SocketFD.TYPE_STREAM);
+ clientFD.o = client;
+ try {
+ clientFD.is = client.getInputStream();
+ clientFD.os = client.getOutputStream();
+ } catch(IOException e) {
+ return -EIO;
+ }
+ int n = addFD(clientFD);
+ if(n == -1) { clientFD.close(); return -ENFILE; }
+ return n;
+ }
+
+ private int sys_shutdown(int fdn, int how) throws ErrnoException {
+ SocketFD fd = getSocketFD(fdn);
+ if(fd.type() != SocketFD.TYPE_STREAM || fd.listen()) return -EOPNOTSUPP;
+ if(fd.o == null) return -ENOTCONN;
+
+ Socket s = (Socket) fd.o;
+
+ try {
+ if(how == SHUT_RD || how == SHUT_RDWR) Platform.socketHalfClose(s,false);
+ if(how == SHUT_WR || how == SHUT_RDWR) Platform.socketHalfClose(s,true);
+ } catch(IOException e) {
+ return -EIO;
+ }
+
+ return 0;
+ }
+
+ private static String hostName() {
+ try {
+ return InetAddress.getLocalHost().getHostName();
+ } catch(UnknownHostException e) {
+ return "darkstar";
+ }
+ }
+
+ private int sys_sysctl(int nameaddr, int namelen, int oldp, int oldlenaddr, int newp, int newlen) throws FaultException {
+ if(newp != 0) return -EPERM;
+ if(namelen == 0) return -ENOENT;
+ if(oldp == 0) return 0;
+
+ Object o = null;
+ switch(memRead(nameaddr)) {
+ case CTL_KERN:
+ if(namelen != 2) break;
+ switch(memRead(nameaddr+4)) {
+ case KERN_OSTYPE: o = "NestedVM"; break;
+ case KERN_HOSTNAME: o = hostName(); break;
+ case KERN_OSRELEASE: o = VERSION; break;
+ case KERN_VERSION: o = "NestedVM Kernel Version " + VERSION; break;
+ }
+ break;
+ case CTL_HW:
+ if(namelen != 2) break;
+ switch(memRead(nameaddr+4)) {
+ case HW_MACHINE: o = "NestedVM Virtual Machine"; break;
+ }
+ break;
+ }
+ if(o == null) return -ENOENT;
+ int len = memRead(oldlenaddr);
+ if(o instanceof String) {
+ byte[] b = getNullTerminatedBytes((String)o);
+ if(len < b.length) return -ENOMEM;
+ len = b.length;
+ copyout(b,oldp,len);
+ memWrite(oldlenaddr,len);
+ } else if(o instanceof Integer) {
+ if(len < 4) return -ENOMEM;
+ memWrite(oldp,((Integer)o).intValue());
+ } else {
+ throw new Error("should never happen");
+ }
+ return 0;
+ }
+
// FEATURE: Run through the fork/wait stuff one more time
public static class GlobalState {
protected static final int OPEN = 1;
protected static final int STAT = 2;
protected static final int LSTAT = 3;
protected static final int MKDIR = 4;
+ protected static final int UNLINK = 5;
final UnixRuntime[] tasks;
int nextPID = 1;
}
}
- private static class MP {
+ private static class MP implements Sort.Comparable {
public MP(String path, FS fs) { this.path = path; this.fs = fs; }
public String path;
public FS fs;
MP[] newMPS = new MP[oldLength + 1];
if(oldLength != 0) System.arraycopy(mps,0,newMPS,0,oldLength);
newMPS[oldLength] = new MP(path,fs);
- Arrays.sort(newMPS);
+ Sort.sort(newMPS);
mps = newMPS;
int highdevno = 0;
for(int i=0;i<mps.length;i++) highdevno = max(highdevno,mps[i].fs.devno);
mps = newMPS;
}
+ // FEATURE: We shouldn't need to special case the root dir, it should work in the MP array
private Object fsop(int op, UnixRuntime r, String normalizedPath, int arg1, int arg2) throws ErrnoException {
int pl = normalizedPath.length();
if(pl != 0) {
for(int i=0;i<list.length;i++) {
MP mp = list[i];
int mpl = mp.path.length();
- if(normalizedPath.startsWith(mp.path) && (pl == mpl || (pl < mpl && normalizedPath.charAt(mpl) == '/')))
+ if(normalizedPath.startsWith(mp.path) && (pl == mpl || normalizedPath.charAt(mpl) == '/'))
return dispatch(mp.fs,op,r,pl == mpl ? "" : normalizedPath.substring(mpl+1),arg1,arg2);
}
}
return dispatch(root,op,r,normalizedPath,arg1,arg2);
}
+ // FEATURE: move this into FS so some filesystem can override it directly (devfs)
private static Object dispatch(FS fs, int op, UnixRuntime r, String path, int arg1, int arg2) throws ErrnoException {
switch(op) {
case OPEN: return fs.open(r,path,arg1,arg2);
case STAT: return fs.stat(r,path);
case LSTAT: return fs.lstat(r,path);
case MKDIR: fs.mkdir(r,path,arg1); return null;
+ case UNLINK: fs.unlink(r,path); return null;
default: throw new Error("should never happen");
}
}
public final FStat stat(UnixRuntime r, String path) throws ErrnoException { return (FStat) fsop(STAT,r,path,0,0); }
public final FStat lstat(UnixRuntime r, String path) throws ErrnoException { return (FStat) fsop(LSTAT,r,path,0,0); }
public final void mkdir(UnixRuntime r, String path, int mode) throws ErrnoException { fsop(MKDIR,r,path,mode,0); }
+ public final void unlink(UnixRuntime r, String path) throws ErrnoException { fsop(UNLINK,r,path,0,0); }
private Hashtable execCache = new Hashtable();
private static class CacheEnt {
}
public synchronized Object exec(UnixRuntime r, String path) throws ErrnoException {
+ // HACK: Hideous hack to make a standalone busybox possible
+ if(path.equals("bin/busybox") && Boolean.valueOf(getSystemProperty("nestedvm.busyboxhack")).booleanValue())
+ return r.getClass();
FStat fstat = stat(r,path);
if(fstat == null) return null;
long mtime = fstat.mtime();
// its an elf binary
try {
s.seek(0);
- Class c = RuntimeCompiler.compile(s);
+ Class c = RuntimeCompiler.compile(s,"unixruntime");
//System.err.println("Compile succeeded: " + c);
ent = new CacheEnt(mtime,size,c);
} catch(Compiler.Exn e) {
// If this returns null it'll be turned into an ENOENT
public abstract FStat stat(UnixRuntime r, String path) throws ErrnoException;
public abstract void mkdir(UnixRuntime r, String path, int mode) throws ErrnoException;
+ public abstract void unlink(UnixRuntime r, String path) throws ErrnoException;
}
// FEATURE: chroot support in here
path.getChars(0,path.length(),in,0);
while(in[inp] != 0) {
- if(inp != 0) {
+ if(inp != 0 || cwdl==0) {
if(in[inp] != '/') { out[outp++] = in[inp++]; continue; }
while(in[inp] == '/') inp++;
}
return r.hostFSOpen(f,flags,mode,this);
}
+ public void unlink(UnixRuntime r, String path) throws ErrnoException {
+ File f = hostFile(path);
+ if(r.sm != null && !r.sm.allowUnlink(f)) throw new ErrnoException(EPERM);
+ if(!f.exists()) throw new ErrnoException(ENOENT);
+ if(!f.delete()) throw new ErrnoException(EPERM);
+ }
+
public FStat stat(UnixRuntime r, String path) throws ErrnoException {
File f = hostFile(path);
if(r.sm != null && !r.sm.allowStat(f)) throw new ErrnoException(EACCES);
if(r.sm != null && !r.sm.allowWrite(f)) throw new ErrnoException(EACCES);
if(f.exists() && f.isDirectory()) throw new ErrnoException(EEXIST);
if(f.exists()) throw new ErrnoException(ENOTDIR);
- File parent = f.getParentFile();
+ File parent = getParentFile(f);
if(parent!=null && (!parent.exists() || !parent.isDirectory())) throw new ErrnoException(ENOTDIR);
if(!f.mkdir()) throw new ErrnoException(EIO);
}
+ private static File getParentFile(File f) {
+ String p = f.getParent();
+ return p == null ? null : new File(f,p);
+ }
+
public class HostDirFD extends DirFD {
private final File f;
private final File[] children;
- public HostDirFD(File f) { this.f = f; children = f.listFiles(); }
+ public HostDirFD(File f) {
+ this.f = f;
+ String[] l = f.list();
+ children = new File[l.length];
+ for(int i=0;i<l.length;i++) children[i] = new File(f,l[i]);
+ }
public int size() { return children.length; }
public String name(int n) { return children[n].getName(); }
public int inode(int n) { return inodes.get(children[n].getAbsolutePath()); }
public int parentInode() {
- File parent = f.getParentFile();
+ File parent = getParentFile(f);
return parent == null ? -1 : inodes.get(parent.getAbsolutePath());
}
public int myInode() { return inodes.get(f.getAbsolutePath()); }
}
private FD devZeroFD = new FD() {
- public boolean readable() { return true; }
- public boolean writable() { return true; }
- public int read(byte[] a, int off, int length) { Arrays.fill(a,off,off+length,(byte)0); return length; }
+ public int read(byte[] a, int off, int length) {
+ /*Arrays.fill(a,off,off+length,(byte)0);*/
+ for(int i=off;i<off+length;i++) a[i] = 0;
+ return length;
+ }
public int write(byte[] a, int off, int length) { return length; }
public int seek(int n, int whence) { return 0; }
public FStat _fstat() { return new DevFStat(){ public int inode() { return ZERO_INODE; } }; }
};
private FD devNullFD = new FD() {
- public boolean readable() { return true; }
- public boolean writable() { return true; }
public int read(byte[] a, int off, int length) { return 0; }
public int write(byte[] a, int off, int length) { return length; }
public int seek(int n, int whence) { return 0; }
if(path.startsWith("fd/")) {
int n;
try {
- n = Integer.parseInt(path.substring(4));
+ n = Integer.parseInt(path.substring(3));
} catch(NumberFormatException e) {
return null;
}
return null;
}
- public void mkdir(UnixRuntime r, String path, int mode) throws ErrnoException { throw new ErrnoException(EACCES); }
- }
+ public void mkdir(UnixRuntime r, String path, int mode) throws ErrnoException { throw new ErrnoException(EROFS); }
+ public void unlink(UnixRuntime r, String path) throws ErrnoException { throw new ErrnoException(EROFS); }
+ }
}