Merge branch 'wip' of oss.readytalk.com:/var/local/git/avian into wip

classpath/java-io.cpp

@@ -452,12 +452,18 @@ Java_java_io_File_readDir(JNIEnv* e, jclass, jlong handle)
 {
   Directory* d = reinterpret_cast<Directory*>(handle);
   
+  while (true) {
     const char* s = d->next();
     if (s) {
+      if (strcmp(s, ".") == 0 || strcmp(s, "..") == 0) {
+        // skip . or .. and try again
+      } else {
         return e->NewStringUTF(s);
+      }
     } else {
       return 0;
     }
+  }
 }
 
 extern "C" JNIEXPORT void JNICALL
@@ -487,12 +493,19 @@ Java_java_io_File_readDir(JNIEnv* e, jclass, jlong handle)
   struct dirent * directoryEntry;
 
   if (handle!=0) {
+    while (true) {
       directoryEntry = readdir(reinterpret_cast<DIR*>(handle));
       if (directoryEntry == NULL) {
         return NULL;
-    }
+      } else if (strcmp(directoryEntry->d_name, ".") == 0
+                 || strcmp(directoryEntry->d_name, "..") == 0)
+      {
+        // skip . or .. and try again
+      } else {
         return e->NewStringUTF(directoryEntry->d_name);
       }
+    }
+  }
   return NULL;
 }
 

classpath/java/io/BufferedInputStream.java

@@ -22,7 +22,7 @@ public class BufferedInputStream extends InputStream {
   }
   
   public BufferedInputStream(InputStream in) {
-    this(in, 32);
+    this(in, 4096);
   }
 
   private void fill() throws IOException {

classpath/java/io/FileInputStream.java

@@ -55,7 +55,9 @@ public class FileInputStream extends InputStream {
   }
 
   public void close() throws IOException {
+    if (fd != -1) {
       close(fd);
       fd = -1;
     }
+  }
 }

classpath/java/io/FileOutputStream.java

@@ -55,7 +55,9 @@ public class FileOutputStream extends OutputStream {
   }
 
   public void close() throws IOException {
+    if (fd != -1) {
       close(fd);
       fd = -1;
     }
+  }
 }