1) bug fix on nativeavailable(): forgot to get back the file pointer to the current...

2) small optimization on the FileInputStream.

diff --git a/Robust/src/ClassLibrary/SSJava/FileInputStream.java b/Robust/src/ClassLibrary/SSJava/FileInputStream.java
index be3c76f4c479d4d1cbaf20a64746be8d7587738c..8dfd3fe8b2d27ce72442b853da774a7041c96715 100644 (file)
--- a/Robust/src/ClassLibrary/SSJava/FileInputStream.java
+++ b/Robust/src/ClassLibrary/SSJava/FileInputStream.java
@@ -48,9 +48,7 @@ public class FileInputStream extends InputStream {
     }
     byte readbuf[] = new byte[len];
     int rtr = nativeRead(fd, readbuf, len);
     }
     byte readbuf[] = new byte[len];
     int rtr = nativeRead(fd, readbuf, len);

-    for (int i = offset; i < len + offset; i++) {
-      b[i] = readbuf[i - offset];
-    }
+    System.arraycopy(readbuf, 0, b, offset, len);

     return rtr;
   }
 
     return rtr;
   }
 

diff --git a/Robust/src/Runtime/file.c b/Robust/src/Runtime/file.c
index c8997a10601eff191ac8571c45fde704a8ad2b3b..0eb7d901d1628489da087b24d6147c72aca19916 100644 (file)
--- a/Robust/src/Runtime/file.c
+++ b/Robust/src/Runtime/file.c
@@ -153,6 +153,7 @@ int CALL11(___FileInputStream______nativeAvailable____I, int fd, int fd) {
   int avail;
   int cur=lseek(fd, 0, SEEK_CUR);
   int fsize = lseek(fd, 0, SEEK_END);
   int avail;
   int cur=lseek(fd, 0, SEEK_CUR);
   int fsize = lseek(fd, 0, SEEK_END);

+  lseek(fd,cur,SEEK_SET); // seek back to the current position

   avail=fsize-cur;
   return avail;
 #endif
   avail=fsize-cur;
   return avail;
 #endif