e1bea0c068
2007-05-31 Matthias Klose <doko@ubuntu.com> * javax/management/NotificationBroadcasterSupport.java (getNotificationInfo): Add cast. * native/jni/qt-peer/Makefile.am (AM_CXXFLAGS): Add libstdc++ include directories. * native/jni/qt-peer/Makefile.in: Regenerate. libjava/ChangeLog: 2007-06-03 Matthias Klose <doko@ubuntu.com> * java/io/natFileWin32.cc (setFilePermissions): New (stub only). _access: Handle EXEC query, stub only. 2007-06-03 Matthias Klose <doko@ubuntu.com> Merged from classpath: * gnu/java/nio/SelectorProviderImpl.java: Whitespace merge. * java/lang/System.java(inheritedChannel): New. * java/lang/Character.java: Remove stray`;'. * java/net/MulticastSocket.java: Merged. * java/text/DateFormatSymbols.java(getInstance): New, comment updates. * java/text/Collator.java(getInstance): Merged. * java/util/Calendar.java: New attributes ALL_STYLES, SHORT, LONG. getDisplayName, getDisplayNames: New. * java/util/logging/Logger.java: Merged. * Regenerate .class and .h files. 2007-06-03 Matthias Klose <doko@ubuntu.com> * java/io/File.java: Merge with classpath-0.95, new method setFilePermissions, new attribute EXEC. * java/io/natFilePosix.cc (setFilePermissions): New. _access: Handle EXEC query. * classpath/lib/java/io/File.class, java/io/File.h: Regenerate. 2007-06-03 Matthias Klose <doko@ubuntu.com> Imported GNU Classpath 0.95. * classpath/Makefile.in, classpath/native/jni/midi-dssi/Makefile.in, classpath/native/jni/classpath/Makefile.in, classpath/native/jni/Makefile.in, classpath/native/jni/gconf-peer/Makefile.in, classpath/native/jni/java-io/Makefile.in, classpath/native/jni/native-lib/Makefile.in, classpath/native/jni/java-util/Makefile.in, classpath/native/jni/midi-alsa/Makefile.in, classpath/native/jni/java-lang/Makefile.in, classpath/native/jni/java-nio/Makefile.in, classpath/native/jni/java-net/Makefile.in, classpath/native/jni/xmlj/Makefile.in, classpath/native/jni/qt-peer/Makefile.in, classpath/native/jni/gtk-peer/Makefile.in, classpath/native/Makefile.in, classpath/native/jawt/Makefile.in, classpath/native/fdlibm/Makefile.in, classpath/native/plugin/Makefile.in, classpath/resource/Makefile.in, classpath/scripts/Makefile.in, classpath/tools/Makefile.in, classpath/doc/Makefile.in, classpath/doc/api/Makefile.in, classpath/lib/Makefile.in, classpath/external/Makefile.in, classpath/external/jsr166/Makefile.in, classpath/external/sax/Makefile.in, classpath/external/w3c_dom/Makefile.in, classpath/external/relaxngDatatype/Makefile.in, classpath/include/Makefile.in, classpath/examples/Makefile.in: Regenerate. * classpath/config.guess, classpath/config.sub, classpath/ltmain.sh : Update. * classpath/configure, classpath/depcomp, classpath/missing, classpath/aclocal.m4, classpath/install-sh: Regenerate. * gnu/classpath/Configuration.java (CLASSPATH_VERSION): Now 0.95. * sources.am: Regenerate. * Makefile.in: Regenerate. * Update the .class files and generated CNI header files, add new .class and generated CNI header files. * Remove generated files for removed java source files: classpath/gnu/java/net/BASE64.java, classpath/gnu/java/security/util/Base64.java, classpath/gnu/java/awt/peer/gtk/GThreadMutex.java, classpath/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java, classpath/gnu/java/awt/font/autofit/Scaler.java, classpath/gnu/classpath/jdwp/util/Value.java, classpath/gnu/javax/net/ssl/Base64.java. * Remove empty directories. * Makefile.am(nat_source_files): Add natVMOperatingSystemMXBeanImpl.cc. * java/lang/Class.java(setAccessible): Merge from classpath. * java/util/Locale.java: Remove. * gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java, gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc: New. * gcj/javaprims.h: Update class declarations. * scripts/classes.pl: Update usage. * HACKING: Mention to build all peers. From-SVN: r125302
141 lines
3.4 KiB
C
141 lines
3.4 KiB
C
/* cpproc.c -
|
|
Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
02110-1301 USA.
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
#include "config.h"
|
|
#include <jni.h>
|
|
#include "cpproc.h"
|
|
#include <signal.h>
|
|
#include <sys/types.h>
|
|
#include <sys/wait.h>
|
|
#include <unistd.h>
|
|
#include <errno.h>
|
|
#include <stdlib.h>
|
|
|
|
static void close_all_fds(int *fds, int numFds)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < numFds; i++)
|
|
close(fds[i]);
|
|
}
|
|
|
|
int cpproc_forkAndExec (char * const *commandLine, char * const * newEnviron,
|
|
int *fds, int pipe_count, pid_t *out_pid, const char *wd)
|
|
{
|
|
int local_fds[6];
|
|
int i;
|
|
pid_t pid;
|
|
|
|
for (i = 0; i < (pipe_count * 2); i += 2)
|
|
{
|
|
if (pipe(&local_fds[i]) < 0)
|
|
{
|
|
int err = errno;
|
|
|
|
close_all_fds(local_fds, i);
|
|
|
|
return err;
|
|
}
|
|
}
|
|
|
|
pid = fork();
|
|
|
|
switch (pid)
|
|
{
|
|
case 0:
|
|
dup2(local_fds[0], 0);
|
|
dup2(local_fds[3], 1);
|
|
if (pipe_count == 3)
|
|
dup2(local_fds[5], 2);
|
|
else
|
|
dup2(1, 2);
|
|
|
|
close_all_fds(local_fds, pipe_count * 2);
|
|
|
|
chdir(wd);
|
|
if (newEnviron == NULL)
|
|
execvp(commandLine[0], commandLine);
|
|
else
|
|
execve(commandLine[0], commandLine, newEnviron);
|
|
|
|
abort();
|
|
|
|
break;
|
|
case -1:
|
|
{
|
|
int err = errno;
|
|
|
|
close_all_fds(local_fds, pipe_count * 2);
|
|
return err;
|
|
}
|
|
default:
|
|
close(local_fds[0]);
|
|
close(local_fds[3]);
|
|
if (pipe_count == 3)
|
|
close(local_fds[5]);
|
|
|
|
fds[0] = local_fds[1];
|
|
fds[1] = local_fds[2];
|
|
fds[2] = local_fds[4];
|
|
*out_pid = pid;
|
|
return 0;
|
|
}
|
|
|
|
/* keep compiler happy */
|
|
|
|
return 0;
|
|
}
|
|
|
|
int cpproc_waitpid (pid_t pid, int *status, pid_t *outpid, int options)
|
|
{
|
|
pid_t wp = waitpid(pid, status, options);
|
|
|
|
if (wp < 0)
|
|
return errno;
|
|
|
|
*outpid = wp;
|
|
return 0;
|
|
}
|
|
|
|
int cpproc_kill (pid_t pid, int signal)
|
|
{
|
|
if (kill(pid, signal) < 0)
|
|
return errno;
|
|
|
|
return 0;
|
|
}
|