From: yeom <yeom>
Date: Mon, 15 Aug 2011 01:13:10 +0000 (+0000)
Subject: adds 'nativeavailable()' and 'read(buf,offset,len)' methods into FileInputStream... 
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e497b0d05da3e13b5365cc477a6b7d792208b7f7;p=IRC.git

adds 'nativeavailable()' and 'read(buf,offset,len)' methods into FileInputStream. 'nativeavailable' returns the number of bytes that can be read from the current file. 'read(buf,offset,len)' reads up to 'len' bytes from the current file  with the start offset to the destination array buf.
---

diff --git a/Robust/src/ClassLibrary/SSJava/FileInputStream.java b/Robust/src/ClassLibrary/SSJava/FileInputStream.java
index 44d88892..c5b608dc 100644
--- a/Robust/src/ClassLibrary/SSJava/FileInputStream.java
+++ b/Robust/src/ClassLibrary/SSJava/FileInputStream.java
@@ -16,6 +16,7 @@ public class FileInputStream extends InputStream {
   private static native int nativeRead(int fd, byte[] array, int numBytes);
   private static native int nativePeek(int fd);
   private static native void nativeClose(int fd);
+  private static native int nativeAvailable(int fd);
 
   public int read() {
     byte b[]=new byte[1];
@@ -35,6 +36,18 @@ public class FileInputStream extends InputStream {
   public int peek() {
     return nativePeek(fd);
   }
+  
+  public int read(byte[] b, int offset,  int len) {
+    if (offset < 0 || len < 0 || offset + len > b.length){
+      return -1;
+    }      
+    byte readbuf[]=new byte[len];
+    int rtr=nativeRead(fd, readbuf, len);
+    for(int i=offset;i<len+offset;i++){
+      b[i]=readbuf[i-offset];
+    }
+    return rtr;
+  }
 
   public int read(byte[] b) {
     return nativeRead(fd, b, b.length);
@@ -72,4 +85,8 @@ public class FileInputStream extends InputStream {
   public void close() {
     nativeClose(fd);
   }
+  
+  public int available(){
+    return nativeAvailable(fd);
+  }
 }
diff --git a/Robust/src/Runtime/file.c b/Robust/src/Runtime/file.c
index 46740b5c..c8997a10 100644
--- a/Robust/src/Runtime/file.c
+++ b/Robust/src/Runtime/file.c
@@ -144,3 +144,17 @@ long long CALL01(___File______nativeLength_____AR_B, struct ArrayObject * ___pat
 #endif
 }
 #endif
+
+#ifdef D___FileInputStream______nativeAvailable____I
+int CALL11(___FileInputStream______nativeAvailable____I, int fd, int fd) {
+#ifdef MULTICORE
+  return 0;
+#else
+  int avail;
+  int cur=lseek(fd, 0, SEEK_CUR);
+  int fsize = lseek(fd, 0, SEEK_END);
+  avail=fsize-cur;
+  return avail;
+#endif
+}
+#endif