Index: kaffe/kaffevm/findInJar.c =================================================================== RCS file: /home/cvspublic/kaffe/kaffe/kaffevm/findInJar.c,v retrieving revision 1.17 diff -u -r1.17 findInJar.c --- findInJar.c 1998/12/22 07:43:07 1.17 +++ findInJar.c 1998/12/28 09:22:32 @@ -229,7 +229,7 @@ } hand.size = sbuf.st_size; - hand.base = KMALLOC(hand.size); + hand.base = hand.size == 0 ? NULL : KMALLOC(hand.size); hand.buf = hand.base; i = 0; Index: kaffe/kaffevm/hashtab.c =================================================================== RCS file: /home/cvspublic/kaffe/kaffe/kaffevm/hashtab.c,v retrieving revision 1.4 diff -u -r1.4 hashtab.c --- hashtab.c 1998/12/22 19:24:51 1.4 +++ hashtab.c 1998/12/28 09:22:32 @@ -45,7 +45,7 @@ static void hashResize(hashtab_t tab); /* Indicates a deleted pointer */ -static const void *DELETED = (const void *)hashInit; +static const void * const DELETED = (const void *)&DELETED; /* * Create a new hashtable Index: libraries/javalib/java/io/FilterInputStream.java =================================================================== RCS file: /home/cvspublic/kaffe/libraries/javalib/java/io/FilterInputStream.java,v retrieving revision 1.4 diff -u -r1.4 FilterInputStream.java --- FilterInputStream.java 1998/12/08 02:05:06 1.4 +++ FilterInputStream.java 1998/12/28 09:22:41 @@ -70,12 +70,7 @@ public int read(byte b[]) throws IOException { - try { - return (in.read(b, 0, b.length)); - } - catch (NullPointerException _) { - throw new EOFException("null stream"); - } + return read(b, 0, b.length); } public int read(byte b[], int off, int len) throws IOException Index: libraries/javalib/kaffe/applet/AppletViewer.java =================================================================== RCS file: /home/cvspublic/kaffe/libraries/javalib/kaffe/applet/AppletViewer.java,v retrieving revision 1.7 diff -u -r1.7 AppletViewer.java --- AppletViewer.java 1998/12/09 23:20:33 1.7 +++ AppletViewer.java 1998/12/28 09:23:02 @@ -137,7 +137,8 @@ showStatus( "applet stopped"); } else if ( "Start".equals( cmd)) { - app.start(); + if (app != null) + app.start(); showStatus( "applet started"); } } Index: kaffe/kaffevm/utf8const.c =================================================================== RCS file: /home/cvspublic/kaffe/kaffe/kaffevm/utf8const.c,v retrieving revision 1.3 diff -u -r1.3 utf8const.c --- utf8const.c 1998/12/27 00:10:09 1.3 +++ utf8const.c 1998/12/28 11:16:26 @@ -91,7 +91,7 @@ } #ifdef DEBUG - assert(utf8ConstIsValidUtf8(s, len); + assert(utf8ConstIsValidUtf8(s, len)); #endif /* Precompute hash value using String.hashCode() algorithm */ Index: libraries/clib/native/Array.c =================================================================== RCS file: /home/cvspublic/kaffe/libraries/clib/native/Array.c,v retrieving revision 1.7 diff -u -r1.7 Array.c --- Array.c 1998/12/12 08:14:05 1.7 +++ Array.c 1998/12/28 11:40:57 @@ -772,7 +772,7 @@ for( i = 0; i < s; i++ ) { dims[i] = unhand(sizes)->body[i]; } - dims[i] = 0; + dims[i] = -1; /* Create multi-dimension array */ array = newMultiArray(clazz, dims); Index: libraries/clib/io/FileInputStream.c =================================================================== RCS file: /home/cvspublic/kaffe/libraries/clib/io/FileInputStream.c,v retrieving revision 1.4 diff -u -r1.4 FileInputStream.c --- FileInputStream.c 1998/12/22 07:43:12 1.4 +++ FileInputStream.c 1998/12/28 12:46:41 @@ -131,7 +131,8 @@ cur = KLSEEK(fd, cur, SEEK_CUR); if (cur != (off_t)-1) { struct stat statbuf; - if (KFSTAT(fd, &statbuf) != -1) { + if ((KFSTAT(fd, &statbuf) != -1) && + S_ISREG(statbuf.st_mode)) { return (statbuf.st_size - cur); } }