* doc/tools.texinfo: Add file from trunk.NATIVE-LAYER

        * native/jni/Makefile.am (DIST_SUBDIRS): Add native-lib.
        * native/jni/java-io/java_io_VMFile.c: Include lstat and readlink
        headers.
        * native/jni/java-lang/java_lang_VMProcess.c
        (Java_java_lang_VMProcess_nativeSpawn): Remove redirect argument.
        * native/jni/java-net/java_net_VMInetAddress.c
        (Java_java_net_VMInetAddress_getHostByName): Remove unused variable.
        * native/jni/native-lib/Makefile.am: Remove empty and nonexisting
        files.
        * native/jni/native-lib/cpio.c (cpio_setFileReadonly): Use correct
        mask.
        * native/jni/native-lib/cpnet.c (cpnet_connect): Removed unused
        theaddr.
        * native/jni/native-lib/cpnet.h (cpnet_freeAddresses): Moved from
        cpnet.h.
        * native/jni/native-lib/cpnet.h (cpnet_freeAddresses): Declare,
        don't implement.
        * vm/reference/java/lang/VMProcess.java: Removed unused redirect
        argument.
        * include/java_lang_VMProcess.h: Regenerated.

8 files changed, 20 insertions, 17 deletions

diff --git a/native/jni/Makefile.am b/native/jni/Makefile.am
index dfe81b172..110540799 100644
--- a/native/jni/Makefile.am
+++ b/native/jni/Makefile.am
@@ -32,7 +32,8 @@ SUBDIRS = classpath $(JNIDIRS) \
   $(ALSADIR) $(DSSIDIR) $(GTKDIR) $(CLASSPATH_QT_PEER_DIR) $(XMLJDIR) \
   $(CLASSPATH_GCONF_PEER_DIR)
 DIST_SUBDIRS = classpath java-io java-lang java-net java-nio java-util \
-               gtk-peer gconf-peer qt-peer xmlj midi-alsa midi-dssi
+               gtk-peer gconf-peer qt-peer xmlj midi-alsa midi-dssi \
+               native-lib
 
 all-local:
 	cd $(top_srcdir) && $(SHELL) ./scripts/check_jni_methods.sh
diff --git a/native/jni/java-io/java_io_VMFile.c b/native/jni/java-io/java_io_VMFile.c
index ce890e603..3f9282049 100644
--- a/native/jni/java-io/java_io_VMFile.c
+++ b/native/jni/java-io/java_io_VMFile.c
@@ -42,6 +42,12 @@ exception statement from your version. */
 #include <stdio.h>
 #include <stdlib.h>
 
+#if defined (HAVE_LSTAT) && defined (HAVE_READLINK)
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#endif
+
 #include <jni.h>
 #include <jcl.h>
 #include "cpio.h"
diff --git a/native/jni/java-lang/java_lang_VMProcess.c b/native/jni/java-lang/java_lang_VMProcess.c
index 16793287a..915af96f1 100644
--- a/native/jni/java-lang/java_lang_VMProcess.c
+++ b/native/jni/java-lang/java_lang_VMProcess.c
@@ -123,8 +123,7 @@ copy_elem (JNIEnv * env, jobject stringArray, jint i)
 JNIEXPORT void JNICALL
 Java_java_lang_VMProcess_nativeSpawn (JNIEnv * env, jobject this,
 				      jobjectArray cmdArray,
-				      jobjectArray envArray, jobject dirFile,
-				      jboolean redirect)
+				      jobjectArray envArray, jobject dirFile)
 {
   int fds[CPIO_EXEC_NUM_PIPES];
   jobject streams[CPIO_EXEC_NUM_PIPES] = { NULL, NULL, NULL };
diff --git a/native/jni/java-net/java_net_VMInetAddress.c b/native/jni/java-net/java_net_VMInetAddress.c
index 3273f02fe..2ca0545fe 100644
--- a/native/jni/java-net/java_net_VMInetAddress.c
+++ b/native/jni/java-net/java_net_VMInetAddress.c
@@ -208,7 +208,7 @@ Java_java_net_VMInetAddress_getHostByName (JNIEnv * env,
   int result;
   jclass arr_class;
   jobjectArray addrs;
-  jint i, j;
+  jint i;
   jbyte *octets;
   jarray ret_octets;
 
diff --git a/native/jni/native-lib/Makefile.am b/native/jni/native-lib/Makefile.am
index c8eb0367d..beab77e57 100644
--- a/native/jni/native-lib/Makefile.am
+++ b/native/jni/native-lib/Makefile.am
@@ -3,9 +3,7 @@ libclasspathnative_la_SOURCES = cpnet.c \
 				cpnet.h \
 				cpio.c \
 				cpio.h \
-				cpnative.c \
 				cpnative.h \
-				cpmath.h \
 				cpproc.h \
 				cpproc.c
 
diff --git a/native/jni/native-lib/cpio.c b/native/jni/native-lib/cpio.c
index 2e41afd67..955fdccc8 100644
--- a/native/jni/native-lib/cpio.c
+++ b/native/jni/native-lib/cpio.c
@@ -334,7 +334,7 @@ int cpio_setFileReadonly (const char *filename)
   if (stat(filename, &statbuf) < 0)
     return errno;
  
-  if (chmod(filename, statbuf.st_mode & ~(S_IRUSR | S_IRGRP | S_IROTH)) < 0)
+  if (chmod(filename, statbuf.st_mode & ~(S_IWRITE | S_IWGRP | S_IWOTH)) < 0)
     return errno;
 
   return 0;
diff --git a/native/jni/native-lib/cpnet.c b/native/jni/native-lib/cpnet.c
index 53472e21b..32bd1265e 100644
--- a/native/jni/native-lib/cpnet.c
+++ b/native/jni/native-lib/cpnet.c
@@ -180,8 +180,6 @@ jint cpnet_connect(JNIEnv *env UNUSED, jint fd, cpnet_address *addr)
   int ret;
 
   /* TODO: implement socket time out */
-  struct sockaddr_in *theaddr = (struct sockaddr_in *)addr->data;
-
   ret = connect(fd, (struct sockaddr *)addr->data, addr->len);
   if (ret != 0)
     return errno;
@@ -697,3 +695,11 @@ jint cpnet_getHostByAddr (JNIEnv *env UNUSED, cpnet_address *addr, char *hostnam
 
   return 0;
 }
+
+void cpnet_freeAddresses(JNIEnv * env, cpnet_address **addr, jint addresses_count)
+{
+  jint i;
+
+  for (i = 0; i < addresses_count; i++)
+    cpnet_freeAddress(env, addr[i]);
+}
diff --git a/native/jni/native-lib/cpnet.h b/native/jni/native-lib/cpnet.h
index 1b7583a5a..0c7c215f8 100644
--- a/native/jni/native-lib/cpnet.h
+++ b/native/jni/native-lib/cpnet.h
@@ -94,6 +94,7 @@ JNIEXPORT jint cpnet_getAvailableBytes (JNIEnv *env, jint fd, jint *availableByt
 JNIEXPORT jint cpnet_getHostname (JNIEnv *env, char *hostname, jint hostname_len);
 JNIEXPORT jint cpnet_getHostByName (JNIEnv *env, const char *hostname, cpnet_address ***adresses, jint *addresses_count);
 JNIEXPORT jint cpnet_getHostByAddr (JNIEnv *env, cpnet_address *addr, char *hostname, jint hostname_len);
+JNIEXPORT void cpnet_freeAddresses(JNIEnv * env, cpnet_address **addr, jint addresses_count);
 
 static inline cpnet_address *cpnet_newIPV4Address(JNIEnv * env)
 {
@@ -130,14 +131,6 @@ static inline void cpnet_freeAddress(JNIEnv * env, cpnet_address *addr)
   JCL_free(env, addr);
 }
 
-static void cpnet_freeAddresses(JNIEnv * env, cpnet_address **addr, jint addresses_count)
-{
-  jint i;
-
-  for (i = 0; i < addresses_count; i++)
-    cpnet_freeAddress(env, addr[i]);
-}
-
 static inline void cpnet_addressSetPort(cpnet_address *addr, jint port)
 {
   struct sockaddr_in *ipaddr = (struct sockaddr_in *)&(addr->data[0]);