natPosixProcess.cc (startProcess): Handle case where PATH or LD_LIBRARY_PATH is not...

	* java/lang/natPosixProcess.cc (startProcess): Handle case where
	PATH or LD_LIBRARY_PATH is not set in parent environment.

From-SVN: r77203

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 69ea3321ec6ec6ef66727b1940cb9101222cc3a6..901aea4608415e2ca5f832465c5dd8b2d30e588c 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-03  Tom Tromey  <tromey@redhat.com>
+
+       * java/lang/natPosixProcess.cc (startProcess): Handle case where
+       PATH or LD_LIBRARY_PATH is not set in parent environment.
+
 2004-02-03  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
        * gnu/java/awt/peer/gtk/GtkListPeer.java,

diff --git a/libjava/java/lang/natPosixProcess.cc b/libjava/java/lang/natPosixProcess.cc
index ef469242fd62166493c06344d6f9a3159b0ba772..a6dfc1ada2883872cdd6c1859517126129a83005 100644 (file)
--- a/libjava/java/lang/natPosixProcess.cc
+++ b/libjava/java/lang/natPosixProcess.cc
@@ -1,6 +1,6 @@
 // natPosixProcess.cc - Native side of POSIX process code.
 
-/* Copyright (C) 1998, 1999, 2000, 2002, 2003  Free Software Foundation
+/* Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -207,7 +207,7 @@ java::lang::ConcreteProcess::startProcess (jstringArray progarray,
              char *path_val = getenv ("PATH");
              char *ld_path_val = getenv ("LD_LIBRARY_PATH");
              environ = env;
-             if (getenv ("PATH") == NULL)
+             if (path_val && getenv ("PATH") == NULL)
                {
                  char *path_env = (char *) _Jv_Malloc (strlen (path_val)
                                                        + 5 + 1);
@@ -215,7 +215,7 @@ java::lang::ConcreteProcess::startProcess (jstringArray progarray,
                  strcat (path_env, path_val);
                  putenv (path_env);
                }
-             if (getenv ("LD_LIBRARY_PATH") == NULL)
+             if (ld_path_val && getenv ("LD_LIBRARY_PATH") == NULL)
                {
                  char *ld_path_env
                    = (char *) _Jv_Malloc (strlen (ld_path_val) + 16 + 1);