diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-02-04 00:07:19 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-02-04 00:07:19 +0000 |
| commit | b1a3cc68ba47575ac6d025b1af0f273c713ea99e (patch) | |
| tree | 7bef3202341339d36afb49d43768e474d3e55179 | |
| parent | a2e238f7fd3ace8ef3029c5fa0ab7e0df0232127 (diff) | |
| download | ppe42-gcc-b1a3cc68ba47575ac6d025b1af0f273c713ea99e.tar.gz ppe42-gcc-b1a3cc68ba47575ac6d025b1af0f273c713ea99e.zip | |
* java/lang/natPosixProcess.cc (startProcess): Handle case where
PATH or LD_LIBRARY_PATH is not set in parent environment.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@77203 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/lang/natPosixProcess.cc | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 69ea3321ec6..901aea46084 100644 --- 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 ef469242fd6..a6dfc1ada28 100644 --- 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); |
