From d291d8b244efc66333a228e5013a5afd80c87f6d Mon Sep 17 00:00:00 2001 From: membar Date: Fri, 29 Aug 2003 04:21:01 +0000 Subject: * win32.cc: fixed tab, indentation and whitespace inconsistencies removed jvm.h include added includes java/lang/UnsupportedOperationException.h, java/io/IOException.h, java/net/SocketException.h (WSAEventWrapper): class implementation (_Jv_WinStrError): implemented both overloads (_Jv_ThrowIOException): implemented both overloads (_Jv_ThrowSocketException): implemented both overloads (_Jv_select): implemented * include/win32.h: fixed tab, indentation and whitespace inconsistencies wrapped include with #define WIN32_LEAN_AND_MEAN added jvm.h include (WSAEventWrapper): added class declaration (_Jv_WinStrError): added both overload declarations (_Jv_ThrowIOException): added both overload declarations (_Jv_ThrowSocketException): added both overload declarations removed ENOTCONN, ECONNRESET and ENOPROTOOPT defines (_Jv_select): added declaration (_Jv_socket): removed (_Jv_connect): removed (_Jv_close): removed (_Jv_bind): removed (_Jv_accept): removed (_Jv_listen): removed (_Jv_write): removed (_Jv_read): removed * java/io/natFileDescriptorWin32.cc: fixed tab, indentation and whitespace inconsistencies replaced #include with removed jvm.h include (testCanUseGetHandleInfo): new function which tests whether Win32 GetHandleInformation() call can be used with console buffer handles (only supported on >=WinNT 5.0) (winerr): removed (superseded by _Jv_WinStrError in include/win32.h) (valid): rewrote implementation using GetHandleInformation() (sync): changed exception throwing to use error string and exception helper methods declared in include/win32.h (open): likewise (write): likewise (setLength): likewise (close): likewise (seek): likewise (getFilePointer): likewise (read): likewise * java/io/natFileWin32.cc: fixed tab, indentation and whitespace inconsistencies replaced #include with removed jvm.h include (_access): use JV_TEMP_UTF_STRING (_stat): likewise (performMkDir): use JV_TEMP_UTF_STRING (performRenameTo): likewise (performDelete): likewise (performCreate): likewise (performSetReadOnly): likewise (performSetLastModified): likewise * java/lang/natWin32Process.cc: fixed tab, indentation and whitespace inconsistencies replaced #include with removed includes gcj/cni.h, jvm.h (new_string): removed (startProcess): use JV_TEMP_UTF_STRING, changed exception throwing to use error string and exception helper methods declared in include/win32.h * java/net/natInetAddressWin32.cc: fixed tab, indentation and whitespace inconsistencies replaced #include with removed jvm.h include removed DISABLE_JAVA_NET conditional code removed POSIX conditional code not relevant to Win32 (aton): use JV_TEMP_UTF_STRING removed POSIX conditional code not relevant to Win32 (lookup): likewise (getLocalHostName): likewise * java/net/natNetworkInterfaceWin32.cc: fixed tab, indentation and whitespace inconsistencies removed unnecessary windows.h, winsock.h and gcj/cni.h includes removed DISABLE_JAVA_NET conditional code removed POSIX conditional code not relevant to Win32 (winsock2GetRealNetworkInterfaces): new function to compute network interfaces via Winsock2 API (determineGetRealNetworkInterfacesFN): new function for returning a function pointer to the function used to compute network interfaces. (getRealNetworkInterfaces): implemented * java/net/natPlainDatagramSocketImplWin32.cc: fixed tab, indentation and whitespace inconsistencies removed gcj/cni.h include removed DISABLE_JAVA_NET conditional code removed POSIX conditional code not relevant to Win32 changed net POSIXisms to Win32isms replaced _Jv socket-related calls with their real Win32 equivalents changed exception throwing to use error string and exception helper methods declared in include/win32.h (peekData): implemented timeout support (receive): likewise * java/net/natPlainSocketImplWin32.cc: fixed tab, indentation and whitespace inconsistencies removed gcj/cni.h and gcj/javaprims.h includes removed DISABLE_JAVA_NET conditional code removed POSIX conditional code not relevant to Win32 changed net POSIXisms to Win32isms replaced _Jv socket-related calls with their real Win32 equivalents changed exception throwing to use error string and exception helper methods declared in include/win32.h (throwConnectException): helper function for connect() (connect): implemented timeout support (accept): likewise (doRead): new helper function common to both read() method overloads, includes timeout support (read): implemented both overloads in terms of doRead() (available): implemented using ioctlsocket() git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@70904 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/lang/natWin32Process.cc | 54 ++++++++++-------------------------- 1 file changed, 14 insertions(+), 40 deletions(-) (limited to 'libjava/java/lang') diff --git a/libjava/java/lang/natWin32Process.cc b/libjava/java/lang/natWin32Process.cc index 710753ec215..86fd5b3d253 100644 --- a/libjava/java/lang/natWin32Process.cc +++ b/libjava/java/lang/natWin32Process.cc @@ -9,18 +9,11 @@ Libgcj License. Please consult the file "LIBGCJ_LICENSE" for details. */ #include - -#include - -#define WIN32_LEAN_AND_MEAN -#include +#include // Conflicts with the definition in "java/lang/reflect/Modifier.h" #undef STRICT -#include -#include - #include #include #include @@ -111,16 +104,6 @@ java::lang::ConcreteProcess::waitFor (void) return exitCode; } -static char * -new_string (jstring string) -{ - jsize s = _Jv_GetStringUTFLength (string); - char *buf = (char *) _Jv_Malloc (s + 1); - _Jv_GetStringUTFRegion (string, 0, s, buf); - buf[s] = '\0'; - return buf; -} - void java::lang::ConcreteProcess::startProcess (jstringArray progarray, jstringArray envp, @@ -177,9 +160,7 @@ java::lang::ConcreteProcess::startProcess (jstringArray progarray, } // Get the working directory path, if specified. - char *wdir = NULL; - if (dir != NULL) - wdir = new_string (dir->getPath ()); + JV_TEMP_UTF_STRING (wdir, dir ? dir->getPath () : 0); errorStream = NULL; inputStream = NULL; @@ -204,29 +185,25 @@ java::lang::ConcreteProcess::startProcess (jstringArray progarray, sAttrs.lpSecurityDescriptor = NULL; - char tmpBuff[64]; if (CreatePipe (&cldStdInRd, &cldStdInWr, &sAttrs, 0) == 0) { - sprintf (tmpBuff, - "Error creating stdin pipe (Win32 Error Code: %lu)", - GetLastError ()); - throw new IOException (JvNewStringLatin1 (tmpBuff)); + DWORD dwErrorCode = GetLastError (); + throw new IOException (_Jv_WinStrError ("Error creating stdin pipe", + dwErrorCode)); } if (CreatePipe (&cldStdOutRd, &cldStdOutWr, &sAttrs, 0) == 0) { - sprintf (tmpBuff, - "Error creating stdout pipe (Win32 Error Code: %lu)", - GetLastError ()); - throw new IOException (JvNewStringLatin1 (tmpBuff)); + DWORD dwErrorCode = GetLastError (); + throw new IOException (_Jv_WinStrError ("Error creating stdout pipe", + dwErrorCode)); } if (CreatePipe (&cldStdErrRd, &cldStdErrWr, &sAttrs, 0) == 0) { - sprintf (tmpBuff, - "Error creating stderr pipe (Win32 Error Code: %lu)", - GetLastError ()); - throw new IOException (JvNewStringLatin1 (tmpBuff)); + DWORD dwErrorCode = GetLastError (); + throw new IOException (_Jv_WinStrError ("Error creating stderr pipe", + dwErrorCode)); } outputStream = new FileOutputStream @@ -263,10 +240,9 @@ java::lang::ConcreteProcess::startProcess (jstringArray progarray, &si, &pi) == 0) { - sprintf (tmpBuff, - "Error creating child process (Win32 Error Code: %lu)", - GetLastError ()); - throw new IOException (JvNewStringLatin1 (tmpBuff)); + DWORD dwErrorCode = GetLastError (); + throw new IOException ( + _Jv_WinStrError ("Error creating child process", dwErrorCode)); } procHandle = (jint ) pi.hProcess; @@ -279,8 +255,6 @@ java::lang::ConcreteProcess::startProcess (jstringArray progarray, _Jv_Free (cmdLine); if (env != NULL) _Jv_Free (env); - if (wdir != NULL) - _Jv_Free (wdir); } catch (java::lang::Throwable *thrown) { -- cgit v1.2.3