From: Brent Baccala <baccala@freesoft.org>
Date: Wed, 13 Jun 2012 21:53:32 +0000 (-0800)
Subject: Fix two bugs in UnixRuntime and change Pipe class to be public
X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=commitdiff_plain;h=b8372da83bb6fe6064c1f6387411a5b2af9f4e7b

Fix two bugs in UnixRuntime and change Pipe class to be public

- sys_access needs to normalize paths just like everyone else
- DevFS wasn't parsing file descriptors right in open()
- Pipe is useful for moving data between Java and C
---

diff --git a/src/org/ibex/nestedvm/UnixRuntime.java b/src/org/ibex/nestedvm/UnixRuntime.java
index 306b70e..adddc51 100644
--- a/src/org/ibex/nestedvm/UnixRuntime.java
+++ b/src/org/ibex/nestedvm/UnixRuntime.java
@@ -195,7 +195,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
     
     private int sys_access(int cstring, int mode) throws ErrnoException, ReadFaultException {
         // FEATURE: sys_access
-        return gs.stat(this,cstring(cstring)) == null ? -ENOENT : 0;
+        return gs.stat(this,normalizePath(cstring(cstring))) == null ? -ENOENT : 0;
     }
     
     private int sys_realpath(int inAddr, int outAddr) throws FaultException {
@@ -563,7 +563,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
         return 0;   
     }
     
-    static class Pipe {
+    public static class Pipe {
         private final byte[] pipebuf = new byte[PIPE_BUF*4];
         private int readPos;
         private int writePos;
@@ -1811,7 +1811,7 @@ public abstract class UnixRuntime extends Runtime implements Cloneable {
             if(path.startsWith("fd/")) {
                 int n;
                 try {
-                    n = Integer.parseInt(path.substring(4));
+                    n = Integer.parseInt(path.substring(3));
                 } catch(NumberFormatException e) {
                     return null;
                 }