X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fnestedvm%2FUnixRuntime.java;h=0bed8ed27ef330538112c773149dacc134fec68d;hp=a6847ee7d918a88f02c183bd9cc074a2c072b054;hb=2db6b04d7557a26e3b9e7440e7968aaec262216f;hpb=47e2513b584db639600b57c79be03093f99b0073

diff --git a/src/org/ibex/nestedvm/UnixRuntime.java b/src/org/ibex/nestedvm/UnixRuntime.java
index a6847ee..0bed8ed 100644
--- a/src/org/ibex/nestedvm/UnixRuntime.java
+++ b/src/org/ibex/nestedvm/UnixRuntime.java
@@ -4,6 +4,8 @@ import org.ibex.nestedvm.util.*;
 import java.io.*;
 import java.util.*;
 
+// FEATURE: vfork
+
 public abstract class UnixRuntime extends Runtime implements Cloneable {
     /** The pid of this "process" */
     private int pid;
@@ -33,7 +35,9 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
                 
         // FEATURE: Do the proper mangling for non-unix hosts
         String userdir = getSystemProperty("user.dir");
-        cwd = userdir != null && userdir.startsWith("/") && File.separatorChar == '/'  ? userdir.substring(1) : "";
+        cwd = 
+            userdir != null && userdir.startsWith("/") && File.separatorChar == '/' && getSystemProperty("nestedvm.root") == null
+            ? userdir.substring(1) : "";
     }
     
     // NOTE: getDisplayName() is a Java2 function
@@ -59,7 +63,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
     }
     
     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)
@@ -69,6 +73,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
         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];
@@ -81,14 +86,21 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
         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.set(i,this);
+                }
             } 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;
@@ -110,6 +122,8 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
             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();
 
             default: return super._syscall(syscall,a,b,c,d);
         }
@@ -118,6 +132,10 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
     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.
@@ -213,7 +231,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
                 if(parent == null) {
                     gs.tasks[pid] = null;
                 } else {
-                    parent.activeChildren.remove(this);
+                    if(!parent.activeChildren.remove(this)) throw new Error("should never happen _exited: pid: " + pid);
                     parent.exitedChildren.add(this);
                     parent.children.notify();
                 }
@@ -304,15 +322,21 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
     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 {
@@ -461,6 +485,11 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
         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;
@@ -496,6 +525,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
         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;
@@ -599,6 +629,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
                 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");
             }
         }
@@ -607,6 +638,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
         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 {
@@ -617,6 +649,9 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
         }
 
         public synchronized Object exec(UnixRuntime r, String path) throws ErrnoException {
+            // FIXME: Hideous hack to make a standalone busybox possible
+            if(path.equals("bin/busybox") && r.getClass().getName().endsWith("BusyBox"))
+                return r.getClass();
             FStat fstat = stat(r,path);
             if(fstat == null) return null;
             long mtime = fstat.mtime();
@@ -718,6 +753,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
         // 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
@@ -741,7 +777,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
             
         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++;
             }
@@ -794,8 +830,14 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
         public File getRoot() { return root; }
         
         private static File hostRootDir() {
+            if(getSystemProperty("nestedvm.root") != null) {
+                File f = new File(getSystemProperty("nestedvm.root"));
+                if(f.isDirectory()) return f;
+                // fall through to case below
+            }
             String cwd = getSystemProperty("user.dir");
             File f = new File(cwd != null ? cwd : ".");
+            if(!f.exists()) throw new Error("Couldn't get File for cwd");
             f = new File(f.getAbsolutePath());
             while(f.getParent() != null) f = new File(f.getParent());
             return f;
@@ -825,6 +867,13 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
             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);
@@ -1029,6 +1078,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
             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); }
+    }    
 }