mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2025-01-11 05:23:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

natPosixProcess.cc (cleanup): Added `path' argument.

Browse Source 
2002-08-14  Jesse Rosenstock  <jmr@ugcs.caltech.edu>

	* java/lang/natPosixProcess.cc (cleanup): Added `path' argument.
	(startProcess): Allocate path for chdir in async-signal-safe way.

From-SVN: r56330
This commit is contained in:
Jesse Rosenstock 2002-08-14 19:53:54 +00:00 committed by Tom Tromey
parent 77893a23f9
commit 093f02000f
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -1,3 +1,8 @@
2002-08-14 Jesse Rosenstock <jmr@ugcs.caltech.edu>
* java/lang/natPosixProcess.cc (cleanup): Added `path' argument.
(startProcess): Allocate path for chdir in async-signal-safe way.
2002-08-13 Jesse Rosenstock <jmr@ugcs.caltech.edu>
Fix for PR libgcj/7570 and PR libgcj/7578:

18
libjava/java/lang/natPosixProcess.cc
View File

@ -88,7 +88,7 @@ new_string (jstring string)
}
static void
cleanup (char **args, char **env)
cleanup (char **args, char **env, char *path)
{
if (args != NULL)
{
@ -102,6 +102,8 @@ cleanup (char **args, char **env)
_Jv_Free (env[i]);
_Jv_Free (env);
}
if (path != NULL)
_Jv_Free (path);
}
// This makes our error handling a bit simpler and it lets us avoid
@ -127,6 +129,7 @@ java::lang::ConcreteProcess::startProcess (jstringArray progarray,
// Initialize all locals here to make cleanup simpler.
char **args = NULL;
char **env = NULL;
char *path = NULL;
int inp[2], outp[2], errp[2], msgp[2];
inp[0] = -1;
inp[1] = -1;
@ -170,6 +173,11 @@ java::lang::ConcreteProcess::startProcess (jstringArray progarray,
env[envp->length] = NULL;
}
// We allocate this here because we can't call malloc() after
// the fork.
if (dir != NULL)
path = new_string (dir->getPath ());
// Create pipes for I/O. MSGP is for communicating exec()
// status.
if (pipe (inp) || pipe (outp) || pipe (errp) || pipe (msgp)
@ -233,11 +241,9 @@ java::lang::ConcreteProcess::startProcess (jstringArray progarray,
close (msgp[0]);
// Change directory.
if (dir != NULL)
if (path != NULL)
{
// We don't care about leaking memory here; this process
// is about to terminate one way or another.
if (chdir (new_string (dir->getPath ())) != 0)
if (chdir (path) != 0)
{
char c = errno;
write (msgp[1], &c, 1);
@ -319,7 +325,7 @@ java::lang::ConcreteProcess::startProcess (jstringArray progarray,
}
myclose (msgp[0]);
cleanup (args, env);
cleanup (args, env, path);
if (exc != NULL)
throw exc;