Java Service Wrapper

Revision: 1204
          http://svn.sourceforge.net/wrapper/?rev=1204&view=rev
Author:   mortenson
Date:     2006-10-09 21:16:41 -0700 (Mon, 09 Oct 2006)

Log Message:
-----------
Fix a problem where the exit code of a JVM was not always being picked up because the exit of the child process was not being trapped correctly in some cases.

Modified Paths:
--------------
    trunk/wrapper/src/c/wrapper.c
    trunk/wrapper/src/c/wrapper.h
    trunk/wrapper/src/c/wrapper_unix.c
    trunk/wrapper/src/c/wrapper_win.c
    trunk/wrapper/src/c/wrappereventloop.c

Modified: trunk/wrapper/src/c/wrapper.c
===================================================================
--- trunk/wrapper/src/c/wrapper.c	2006-10-10 04:16:15 UTC (rev 1203)
+++ trunk/wrapper/src/c/wrapper.c	2006-10-10 04:16:41 UTC (rev 1204)
@@ -2098,7 +2098,7 @@
  * Called when the Wrapper detects that the JVM process has exited.
  *  Contains code common to all platforms.
  */
-void wrapperJVMProcessExited(int useLoggerQueue, int exitCode) {
+void wrapperJVMProcessExited(int useLoggerQueue, DWORD nowTicks, int exitCode) {
     if (exitCode == 0) {
         /* The JVM exit code was 0, so leave any current exit code as is. */
         log_printf_queue(useLoggerQueue, WRAPPER_SOURCE_WRAPPER, LEVEL_DEBUG,
@@ -2118,6 +2118,74 @@
             "JVM process exited with a code of %d, however the wrapper exit code was already %d.",
             exitCode, wrapperData->exitCode);
     }
+
+    switch(wrapperData->jState)
+    {
+    case WRAPPER_JSTATE_DOWN:
+        /* Shouldn't be called in this state.  But just in case. */
+        if (wrapperData->isDebugging) {
+            log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_DEBUG, "JVM already down.");
+        }
+        break;
+
+    case WRAPPER_JSTATE_LAUNCH:
+        log_printf_queue(useLoggerQueue, WRAPPER_SOURCE_WRAPPER, LEVEL_ERROR,
+            "Unable to start a JVM");
+        break;
+
+    case WRAPPER_JSTATE_LAUNCHING:
+        wrapperData->restartRequested = TRUE;
+        log_printf_queue(useLoggerQueue, WRAPPER_SOURCE_WRAPPER, LEVEL_ERROR,
+            "JVM exited while loading the application.");
+        break;
+
+    case WRAPPER_JSTATE_LAUNCHED:
+        /* Shouldn't be called in this state, but just in case. */
+        wrapperData->restartRequested = TRUE;
+        log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_ERROR,
+            "JVM exited before starting the application.");
+        break;
+
+    case WRAPPER_JSTATE_STARTING:
+        wrapperData->restartRequested = TRUE;
+        log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_ERROR,
+            "JVM exited while starting the application.");
+        break;
+
+    case WRAPPER_JSTATE_STARTED:
+        wrapperData->restartRequested = TRUE;
+        log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_ERROR,
+            "JVM exited unexpectedly.");
+        break;
+
+    case WRAPPER_JSTATE_STOPPING:
+        log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_WARN,
+            "JVM exited unexpectedly while stopping the application.");
+        break;
+
+    case WRAPPER_JSTATE_STOPPED:
+        if (wrapperData->isDebugging) {
+            log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_DEBUG, "JVM exited normally.");
+        }
+        break;
+
+    case WRAPPER_JSTATE_KILLING:
+        log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_INFO,
+            "JVM exited on its own while waiting to kill the application.");
+        break;
+
+    default:
+        log_printf_queue(useLoggerQueue, WRAPPER_SOURCE_WRAPPER, LEVEL_WARN,
+            "Unexpected jState=%d in wrapperJVMProcessExited.", wrapperData->jState);
+        break;
+    }
+    wrapperSetJavaState(useLoggerQueue, WRAPPER_JSTATE_DOWN, nowTicks, -1);
+    wrapperProtocolClose();
+
+    /* Remove java pid file if it was registered and created by this process. */
+    if (wrapperData->javaPidFilename) {
+        unlink(wrapperData->javaPidFilename);
+    }
 }
 
 void wrapperBuildKey() {

Modified: trunk/wrapper/src/c/wrapper.h
===================================================================
--- trunk/wrapper/src/c/wrapper.h	2006-10-10 04:16:15 UTC (rev 1203)
+++ trunk/wrapper/src/c/wrapper.h	2006-10-10 04:16:41 UTC (rev 1204)
@@ -355,7 +355,7 @@
  * Called when the Wrapper detects that the JVM process has exited.
  *  Contains code common to all platforms.
  */
-extern void wrapperJVMProcessExited(int useLoggerQueue, int exitCode);
+extern void wrapperJVMProcessExited(int useLoggerQueue, DWORD nowTicks, int exitCode);
 
 /**
  * Logs a single line of child output allowing any filtering
@@ -433,7 +433,7 @@
  * Checks on the status of the JVM Process.
  * Returns WRAPPER_PROCESS_UP or WRAPPER_PROCESS_DOWN
  */
-extern int wrapperGetProcessStatus(int useLoggerQueue);
+extern int wrapperGetProcessStatus(int useLoggerQueue, DWORD nowTicks);
 
 /**
  * Immediately kill the JVM process and set the JVM state to

Modified: trunk/wrapper/src/c/wrapper_unix.c
===================================================================
--- trunk/wrapper/src/c/wrapper_unix.c	2006-10-10 04:16:15 UTC (rev 1203)
+++ trunk/wrapper/src/c/wrapper_unix.c	2006-10-10 04:16:41 UTC (rev 1204)
@@ -430,12 +430,11 @@
 
     log_printf_queue(TRUE, WRAPPER_SOURCE_WRAPPER, LEVEL_DEBUG,
         "Received SIGCHLD, checking JVM process status.");
-    if (wrapperGetProcessStatus(TRUE) == WRAPPER_PROCESS_UP) {
+    if (wrapperGetProcessStatus(TRUE, wrapperGetTicks()) == WRAPPER_PROCESS_UP) {
         log_printf_queue(TRUE, WRAPPER_SOURCE_WRAPPER, LEVEL_WARN,
             "JVM process was still running after receiving a SIGCHLD signal.");
     } else {
-        log_printf_queue(TRUE, WRAPPER_SOURCE_WRAPPER, LEVEL_DEBUG,
-            "JVM process is no longer running.");
+        /* Handled and logged. */
     }
 }
 
@@ -872,7 +871,7 @@
  * Checks on the status of the JVM Process.
  * Returns WRAPPER_PROCESS_UP or WRAPPER_PROCESS_DOWN
  */
-int wrapperGetProcessStatus(int useLoggerQueue) {
+int wrapperGetProcessStatus(int useLoggerQueue, DWORD nowTicks) {
     int retval;
     int status;
     int exitCode;
@@ -905,12 +904,7 @@
             exitCode = 1;
         }
 
-        wrapperJVMProcessExited(useLoggerQueue, exitCode);
-
-        /* Remove java pid file if it was registered and created by this process. */
-        if (wrapperData->javaPidFilename) {
-            unlink(wrapperData->javaPidFilename);
-        }
+        wrapperJVMProcessExited(useLoggerQueue, nowTicks, exitCode);
     }
     
     return res;

Modified: trunk/wrapper/src/c/wrapper_win.c
===================================================================
--- trunk/wrapper/src/c/wrapper_win.c	2006-10-10 04:16:15 UTC (rev 1203)
+++ trunk/wrapper/src/c/wrapper_win.c	2006-10-10 04:16:41 UTC (rev 1204)
@@ -1200,7 +1200,7 @@
  * Checks on the status of the JVM Process.
  * Returns WRAPPER_PROCESS_UP or WRAPPER_PROCESS_DOWN
  */
-int wrapperGetProcessStatus(int useLoggerQueue) {
+int wrapperGetProcessStatus(int useLoggerQueue, DWORD nowTicks) {
     int res;
     DWORD exitCode;
     char *exName;
@@ -1233,12 +1233,7 @@
             exitCode = 1;
         }
         
-        wrapperJVMProcessExited(useLoggerQueue, exitCode);
-
-        /* Remove java pid file if it was registered and created by this process. */
-        if (wrapperData->javaPidFilename) {
-            unlink(wrapperData->javaPidFilename);
-        }
+        wrapperJVMProcessExited(useLoggerQueue, nowTicks, exitCode);
         
         if (!CloseHandle(javaProcess)) {
             log_printf_queue(useLoggerQueue, WRAPPER_SOURCE_WRAPPER, LEVEL_ERROR,

Modified: trunk/wrapper/src/c/wrappereventloop.c
===================================================================
--- trunk/wrapper/src/c/wrappereventloop.c	2006-10-10 04:16:15 UTC (rev 1203)
+++ trunk/wrapper/src/c/wrappereventloop.c	2006-10-10 04:16:41 UTC (rev 1204)
@@ -1034,9 +1034,8 @@
             wrapperExecute();
         
             /* Check if the start was successful. */
-            if (nextSleep && (wrapperGetProcessStatus(FALSE) == WRAPPER_PROCESS_DOWN)) {
+            if (nextSleep && (wrapperGetProcessStatus(FALSE, nowTicks) == WRAPPER_PROCESS_DOWN)) {
                 /* Failed to start the JVM.  Tell the wrapper to shutdown. */
-                log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_ERROR, "Unable to start a JVM");
                 wrapperSetWrapperState(FALSE, WRAPPER_WSTATE_STOPPING);
             } else {
                 /* The JVM was launched.  We still do not know whether the
@@ -1071,13 +1070,8 @@
  */
 void jStateLaunching(DWORD nowTicks, int nextSleep) {
     /* Make sure that the JVM process is still up and running */
-    if (nextSleep && (wrapperGetProcessStatus(FALSE) == WRAPPER_PROCESS_DOWN)) {
-        /* The process is gone.  Restart it. */
-        wrapperSetJavaState(FALSE, WRAPPER_JSTATE_DOWN, nowTicks, -1);
-        wrapperData->restartRequested = TRUE;
-        log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_ERROR,
-                   "JVM exited while loading the application.");
-        wrapperProtocolClose();
+    if (nextSleep && (wrapperGetProcessStatus(FALSE, nowTicks) == WRAPPER_PROCESS_DOWN)) {
+        /* The process is gone.  Restart it. (Handled and logged) */
     } else {
         /* The process is up and running.
          * We are waiting in this state until we receive a KEY packet
@@ -1155,13 +1149,8 @@
  */
 void jStateStarting(DWORD nowTicks, int nextSleep) {
     /* Make sure that the JVM process is still up and running */
-    if (nextSleep && (wrapperGetProcessStatus(FALSE) == WRAPPER_PROCESS_DOWN)) {
-        /* The process is gone.  Restart it. */
-        wrapperSetJavaState(FALSE, WRAPPER_JSTATE_DOWN, nowTicks, -1);
-        wrapperData->restartRequested = TRUE;
-        log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_ERROR,
-                   "JVM exited while starting the application.");
-        wrapperProtocolClose();
+    if (nextSleep && (wrapperGetProcessStatus(FALSE, nowTicks) == WRAPPER_PROCESS_DOWN)) {
+        /* The process is gone.  Restart it. (Handled and logged) */
     } else {
         /* Have we waited too long already */
         if (wrapperData->jStateTimeoutTicksSet && (wrapperGetTickAge(wrapperData->jStateTimeoutTicks, nowTicks) >= 0)) {
@@ -1202,13 +1191,8 @@
     int ret;
 
     /* Make sure that the JVM process is still up and running */
-    if (nextSleep && (wrapperGetProcessStatus(FALSE) == WRAPPER_PROCESS_DOWN)) {
-        /* The process is gone.  Restart it. */
-        wrapperSetJavaState(FALSE, WRAPPER_JSTATE_DOWN, nowTicks, -1);
-        wrapperData->restartRequested = TRUE;
-        log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_ERROR,
-                   "JVM exited unexpectedly.");
-        wrapperProtocolClose();
+    if (nextSleep && (wrapperGetProcessStatus(FALSE, nowTicks) == WRAPPER_PROCESS_DOWN)) {
+        /* The process is gone.  Restart it. (Handled and logged) */
     } else {
         /* Have we waited too long already.  The jStateTimeoutTicks is reset each time a ping
          *  response is received from the JVM. */
@@ -1261,12 +1245,8 @@
  */
 void jStateStopping(DWORD nowTicks, int nextSleep) {
     /* Make sure that the JVM process is still up and running */
-    if (nextSleep && (wrapperGetProcessStatus(FALSE) == WRAPPER_PROCESS_DOWN)) {
-        /* The process is gone. */
-        wrapperSetJavaState(FALSE, WRAPPER_JSTATE_DOWN, nowTicks, -1);
-        log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_WARN,
-                   "JVM exited unexpectedly while stopping the application.");
-        wrapperProtocolClose();
+    if (nextSleep && (wrapperGetProcessStatus(FALSE, nowTicks) == WRAPPER_PROCESS_DOWN)) {
+        /* The process is gone. (Handled and logged)*/
     } else {
         /* Have we waited too long already */
         if (wrapperData->jStateTimeoutTicksSet && (wrapperGetTickAge(wrapperData->jStateTimeoutTicks, nowTicks) >= 0)) {
@@ -1301,13 +1281,8 @@
  *            function will be called again immediately.
  */
 void jStateStopped(DWORD nowTicks, int nextSleep) {
-    if (nextSleep && (wrapperGetProcessStatus(FALSE) == WRAPPER_PROCESS_DOWN)) {
-        /* The process is gone. */
-        wrapperSetJavaState(FALSE, WRAPPER_JSTATE_DOWN, nowTicks, -1);
-        if (wrapperData->isDebugging) {
-            log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_DEBUG, "JVM exited normally.");
-        }
-        wrapperProtocolClose();
+    if (nextSleep && (wrapperGetProcessStatus(FALSE, nowTicks) == WRAPPER_PROCESS_DOWN)) {
+        /* The process is gone. (Handled and logged) */
     } else {
         /* Have we waited too long already */
         if (wrapperData->jStateTimeoutTicksSet && (wrapperGetTickAge(wrapperData->jStateTimeoutTicks, nowTicks) >= 0)) {
@@ -1342,12 +1317,8 @@
  */
 void jStateKilling(DWORD nowTicks, int nextSleep) {
     /* Make sure that the JVM process is still up and running */
-    if (nextSleep && (wrapperGetProcessStatus(FALSE) == WRAPPER_PROCESS_DOWN)) {
-        /* The process is gone. */
-        wrapperSetJavaState(FALSE, WRAPPER_JSTATE_DOWN, nowTicks, -1);
-        log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_INFO,
-                   "JVM exited on its own while waiting to kill the application.");
-        wrapperProtocolClose();
+    if (nextSleep && (wrapperGetProcessStatus(FALSE, nowTicks) == WRAPPER_PROCESS_DOWN)) {
+        /* The process is gone. (Handled and logged) */
     } else {
         /* Have we waited long enough */
         if (wrapperData->jStateTimeoutTicksSet && (wrapperGetTickAge(wrapperData->jStateTimeoutTicks, nowTicks) >= 0)) {
@@ -1586,13 +1557,11 @@
                 /** The JVM is already being stopped, so nothing else needs to be done. */
             } else {
                 /* The JVM should be running, so it needs to be stopped. */
-                if (wrapperGetProcessStatus(FALSE) == WRAPPER_PROCESS_DOWN) {
-                    /* The process is gone. */
-                    log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_ERROR,
-                        "JVM shut down unexpectedly.");
+                if (wrapperGetProcessStatus(FALSE, nowTicks) == WRAPPER_PROCESS_DOWN) {
+                    /* The process is gone.  (Handled and logged) */
 
-                    wrapperSetJavaState(FALSE, WRAPPER_JSTATE_DOWN, nowTicks, -1);
-                    wrapperProtocolClose();
+                    /* We never want to restart here. */
+                    wrapperData->restartRequested = FALSE;
                 } else {
                     /* JVM is still up.  Try asking it to shutdown nicely. */
                     if (wrapperData->isDebugging) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1209
          http://svn.sourceforge.net/wrapper/?rev=1209&view=rev
Author:   mortenson
Date:     2006-10-10 06:59:52 -0700 (Tue, 10 Oct 2006)

Log Message:
-----------
Clean up a bunch of compiler warnings caused by the upgrade to VC8

Modified Paths:
--------------
    trunk/wrapper/src/c/logger.c
    trunk/wrapper/src/c/logger.h
    trunk/wrapper/src/c/property.c
    trunk/wrapper/src/c/wrapper.c
    trunk/wrapper/src/c/wrapper_win.c
    trunk/wrapper/src/c/wrappereventloop.c

Added Paths:
-----------
    trunk/wrapper/src/c/wrapper32.sln
    trunk/wrapper/src/c/wrapper32.vcproj

Property Changed:
----------------
    trunk/wrapper/src/c/


Property changes on: trunk/wrapper/src/c
___________________________________________________________________
Name: svn:ignore
   - messages.rc
wrapperinfo.c
Debug*
Release*
WrapperJNI___Win??_Debug*
WrapperJNI___Win??_Release*
Wrapper??.aps
Wrapper??.ncb
Wrapper??.opt
Wrapper??.dep
WrapperJNI??.dep
WrapperJNI??.mak
.deps
   + messages.rc
wrapperinfo.c
Debug*
Release*
WrapperJNI___Win??_Debug*
WrapperJNI___Win??_Release*
Wrapper??.aps
Wrapper??.ncb
Wrapper??.opt
Wrapper??.dep
WrapperJNI??.dep
WrapperJNI??.mak
.deps
*.ncb
*.suo
*.user


Modified: trunk/wrapper/src/c/logger.c
===================================================================
--- trunk/wrapper/src/c/logger.c	2006-10-10 04:45:10 UTC (rev 1208)
+++ trunk/wrapper/src/c/logger.c	2006-10-10 13:59:52 UTC (rev 1209)
@@ -62,6 +62,11 @@
 #include <conio.h>
 #include <sys/timeb.h>
 #include "messages.h"
+
+// MS Visual Studio 8 went and deprecated the POXIX names for functions.
+//  Fixing them all would be a big headache for UNIX versions.
+#pragma warning(disable : 4996)
+
 #else
 #include <glob.h>
 #include <syslog.h>
@@ -143,9 +148,9 @@
 pthread_t threadIds[WRAPPER_THREAD_COUNT];
 #endif
 char *threadMessageBuffer = NULL;
-int threadMessageBufferSize = 0;
+size_t threadMessageBufferSize = 0;
 char *threadPrintBuffer = NULL;
-int threadPrintBufferSize = 0;
+size_t threadPrintBufferSize = 0;
 
 /* Logger file pointer.  It is kept open under high log loads but closed whenever it has been idle. */
 FILE *logfileFP = NULL;
@@ -177,8 +182,8 @@
  * newToken may be null, implying "".
  */
 char *replaceStringLongWithShort(char *string, const char *oldToken, const char *newToken) {
-    int oldLen = strlen(oldToken);
-    int newLen;
+    size_t oldLen = strlen(oldToken);
+    size_t newLen;
     char *in = string;
     char *out = string;
     
@@ -364,7 +369,7 @@
 /* Logfile functions */
 
 void setLogfilePath( const char *log_file_path ) {
-    int len = strlen(log_file_path);
+    size_t len = strlen(log_file_path);
 #ifdef WIN32
     char *c;
 #endif
@@ -640,7 +645,7 @@
  *  It should not be released. */
 char* buildPrintBuffer( int source_id, int level, struct tm *nowTM, int nowMillis, char *format, char *message ) {
     int       i;
-    int       reqSize;
+    size_t    reqSize;
     int       numColumns;
     char      *pos;
     int       currentColumn;
@@ -844,7 +849,7 @@
 /* General log functions */
 void log_printf( int source_id, int level, const char *lpszFmt, ... ) {
     va_list     vargs;
-    int         count;
+    size_t      count;
     char        *printBuffer;
     int         old_umask;
     char        nowDate[9];
@@ -1106,13 +1111,13 @@
 
             if( RegOpenKeyEx( HKEY_LOCAL_MACHINE, regPath, 0, KEY_WRITE, (PHKEY) &hKey ) == ERROR_SUCCESS ) {
                 /* Set EventMessageFile */
-                if( RegSetValueEx( hKey, "EventMessageFile", (DWORD) 0, (DWORD) REG_SZ, (const unsigned char *) buffer, (strlen(buffer) + 1) ) != ERROR_SUCCESS ) {
+                if( RegSetValueEx( hKey, "EventMessageFile", (DWORD) 0, (DWORD) REG_SZ, (const unsigned char *) buffer, (DWORD)(strlen(buffer) + 1) ) != ERROR_SUCCESS ) {
                     RegCloseKey( hKey );
                     return -1;
                 }
 
                 /* Set CategoryMessageFile */
-                if( RegSetValueEx( hKey, "CategoryMessageFile", (DWORD) 0, (DWORD) REG_SZ, (const unsigned char *) buffer, (strlen(buffer) + 1) ) != ERROR_SUCCESS ) {
+                if( RegSetValueEx( hKey, "CategoryMessageFile", (DWORD) 0, (DWORD) REG_SZ, (const unsigned char *) buffer, (DWORD)(strlen(buffer) + 1) ) != ERROR_SUCCESS ) {
                     RegCloseKey( hKey );
                     return -1;
                 }
@@ -1366,7 +1371,7 @@
     }
 
     /* We can now write the message. */
-    WriteConsole(consoleStdoutHandle, vWriteToConsoleBuffer, strlen( vWriteToConsoleBuffer ), &wrote, NULL);
+    WriteConsole(consoleStdoutHandle, vWriteToConsoleBuffer, (DWORD)strlen( vWriteToConsoleBuffer ), &wrote, NULL);
 }
 void writeToConsole( char *lpszFmt, ... ) {
     va_list		vargs;
@@ -1585,7 +1590,7 @@
 #ifdef WIN32
     char* path;
     char* c;
-    long handle;
+    intptr_t handle;
     struct _finddata_t fblock;
     char* testFile;
 #else

Modified: trunk/wrapper/src/c/logger.h
===================================================================
--- trunk/wrapper/src/c/logger.h	2006-10-10 04:45:10 UTC (rev 1208)
+++ trunk/wrapper/src/c/logger.h	2006-10-10 13:59:52 UTC (rev 1209)
@@ -121,7 +121,7 @@
 
 /* * * Function predeclaration * * */
 #ifdef WIN32
-#define strcmpIgnoreCase(str1, str2) stricmp(str1, str2)
+#define strcmpIgnoreCase(str1, str2) _stricmp(str1, str2)
 #else
 #define strcmpIgnoreCase(str1, str2) strcasecmp(str1, str2)
 #endif

Modified: trunk/wrapper/src/c/property.c
===================================================================
--- trunk/wrapper/src/c/property.c	2006-10-10 04:45:10 UTC (rev 1208)
+++ trunk/wrapper/src/c/property.c	2006-10-10 13:59:52 UTC (rev 1209)
@@ -52,6 +52,11 @@
 #include <string.h>
 
 #ifdef WIN32
+
+// MS Visual Studio 8 went and deprecated the POXIX names for functions.
+//  Fixing them all would be a big headache for UNIX versions.
+#pragma warning(disable : 4996)
+
 #else
 #include <strings.h>
 #endif
@@ -164,9 +169,9 @@
     char *envValue;
     char *start;
     char *end;
-    int len;
-    int outLen;
-    int bufferAvailable;
+    size_t len;
+    size_t outLen;
+    size_t bufferAvailable;
 
 #ifdef _DEBUG
     log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_STATUS, "evaluateEnvironmentVariables('%s', buffer, %d)",
@@ -190,7 +195,7 @@
             if (end != NULL) {
                 /* A pair of '%' characters was found.  An environment */
                 /*  variable name should be between the two. */
-                len = end - start - 1;
+                len = (int)(end - start - 1);
                 memcpy(envName, start + 1, len);
                 envName[len] = '\0';
 
@@ -199,7 +204,7 @@
                 if (envValue != NULL) {
                     /* An envvar value was found. */
                     /* Copy over any text before the envvar */
-                    outLen = start - in;
+                    outLen = (int)(start - in);
                     if (bufferAvailable < outLen) {
                         outLen = bufferAvailable;
                     }
@@ -329,11 +334,11 @@
     char buffer[MAX_PROPERTY_NAME_VALUE_LENGTH];
     char expBuffer[MAX_PROPERTY_NAME_VALUE_LENGTH];
     char *trimmedBuffer;
-    int trimmedBufferLen;
+    size_t trimmedBufferLen;
     char *c;
     char *d;
-    int i, j;
-    int len;
+    size_t i, j;
+    size_t len;
     int quoted;
 
 #ifdef _DEBUG
@@ -533,9 +538,9 @@
  *  buffer is at least as large as the in buffer. */
 void trim(const char *in, char *out)
 {
-    int len;
-    int first;
-    int last;
+    size_t len;
+    size_t first;
+    size_t last;
 
     len = strlen(in);
     first = 0;
@@ -760,7 +765,7 @@
  *  The returned buffer must be freed by the calling code. */
 char *linearizeProperties(Properties *properties, char separator) {
     Property *property;
-    int size;
+    size_t size;
     char *c;
     char *fullBuffer;
     char *buffer;

Modified: trunk/wrapper/src/c/wrapper.c
===================================================================
--- trunk/wrapper/src/c/wrapper.c	2006-10-10 04:45:10 UTC (rev 1208)
+++ trunk/wrapper/src/c/wrapper.c	2006-10-10 13:59:52 UTC (rev 1209)
@@ -63,6 +63,10 @@
 #include <winsock.h>
 #include <shlwapi.h>
 
+// MS Visual Studio 8 went and deprecated the POXIX names for functions.
+//  Fixing them all would be a big headache for UNIX versions.
+#pragma warning(disable : 4996)
+
 #define EADDRINUSE  WSAEADDRINUSE
 #define EWOULDBLOCK WSAEWOULDBLOCK
 #define ENOTSOCK    WSAENOTSOCK
@@ -591,11 +595,11 @@
     return name;
 }
 
-int protocolSendBufferSize = 0;
+size_t protocolSendBufferSize = 0;
 char *protocolSendBuffer = NULL;
 int wrapperProtocolFunction(char function, const char *message) {
     int rc;
-    int len;
+    size_t len;
     const char *logMsg;
     
     /* We don't want to show the full properties log message.  It is quite long and distracting. */
@@ -641,7 +645,7 @@
     }
 
     /* Send the packet */
-    rc = send(sd, protocolSendBuffer, len, 0);
+    rc = send(sd, protocolSendBuffer, (int)len, 0);
     if (rc == SOCKET_ERROR) {
         if (wrapperData->isDebugging) {
             log_printf(WRAPPER_SOURCE_PROTOCOL, LEVEL_DEBUG, "socket send failed. (%d)", wrapperGetLastError());
@@ -665,11 +669,11 @@
     int pos;
     int err;
     struct timeb timeBuffer;
-    long startTime;
+    time_t startTime;
     int startTimeMillis;
-    long now;
+    time_t now;
     int nowMillis;
-    long durr;
+    time_t durr;
     
     wrapperGetCurrentTime(&timeBuffer);
     startTime = now = timeBuffer.time;
@@ -1202,12 +1206,13 @@
  *  in this case the backslash is stripped.
  */
 void wrapperStripQuotes(const char *prop, char *propStripped) {
-    int len, i, j;
+    size_t len;
+	int i, j;
     
     len = strlen(prop);
     j = 0;
-    for (i = 0; i < len; i++) {
-        if ((prop[i] == '\\') && (i < len - 1)) {
+    for (i = 0; i < (int)len; i++) {
+        if ((prop[i] == '\\') && (i < (int)len - 1)) {
             if (prop[i + 1] == '\\') {
                 /* Double backslash.  Keep the first, and skip the second. */
                 propStripped[j] = prop[i];
@@ -1265,16 +1270,18 @@
     int initMemory = 0, maxMemory;
     char paramBuffer[128];
     int quotable;
-    int i, j, len2;
-    int cpLen, cpLenAlloc;
+    int i, j;
+	size_t len2;
+    size_t cpLen, cpLenAlloc;
     char *tmpString;
     struct stat statBuffer;
     char *systemPath;
     char *c;
 #ifdef WIN32
     char cpPath[512];
-    long handle;
-    int len, found;
+    intptr_t handle;
+    size_t len;
+	int found;
     struct _finddata_t fblock;
 #else
     glob_t g;
@@ -2241,7 +2248,7 @@
     const char *dependencies[10];
     char *work;
     const char *priority;
-    int len;
+    size_t len;
     int i;
 
     if (!wrapperData->configured) {
@@ -2827,8 +2834,8 @@
     wrapperGetCurrentTime(&timeBuffer);
 
     /* Break in half. */
-    high = timeBuffer.time >> 16;
-    low = timeBuffer.time & 0xffff;
+    high = (DWORD)(timeBuffer.time >> 16);
+    low = (DWORD)(timeBuffer.time & 0xffff);
 
     /* Work on each half. */
     high = high * 1000 / WRAPPER_TICK_MS;

Added: trunk/wrapper/src/c/wrapper32.sln
===================================================================
--- trunk/wrapper/src/c/wrapper32.sln	                        (rev 0)
+++ trunk/wrapper/src/c/wrapper32.sln	2006-10-10 13:59:52 UTC (rev 1209)
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wrapper32", "wrapper32.vcproj", "{18A1381E-03E3-486D-B34F-B73D21FBACB3}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{18A1381E-03E3-486D-B34F-B73D21FBACB3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{18A1381E-03E3-486D-B34F-B73D21FBACB3}.Debug|Win32.Build.0 = Debug|Win32
+		{18A1381E-03E3-486D-B34F-B73D21FBACB3}.Release|Win32.ActiveCfg = Release|Win32
+		{18A1381E-03E3-486D-B34F-B73D21FBACB3}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Added: trunk/wrapper/src/c/wrapper32.vcproj
===================================================================
--- trunk/wrapper/src/c/wrapper32.vcproj	                        (rev 0)
+++ trunk/wrapper/src/c/wrapper32.vcproj	2006-10-10 13:59:52 UTC (rev 1209)
@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="shift_jis"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="wrapper32"
+	ProjectGUID="{18A1381E-03E3-486D-B34F-B73D21FBACB3}"
+	RootNamespace="wrapper32"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				UseUnicodeResponseFiles="false"
+				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
+				TreatWChar_tAsBuiltInType="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="wsock32.lib shlwapi.lib"
+				OutputFile="$(InputDir)\..\..\bin\wrapper.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="0"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="wsock32.lib shlwapi.lib"
+				OutputFile="$(InputDir)\..\..\bin\wrapper.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="\x83\\x81[\x83X \x83t\x83@..."
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\logger.c"
+				>
+			</File>
+			<File
+				RelativePath=".\property.c"
+				>
+			</File>
+			<File
+				RelativePath=".\wrapper.c"
+				>
+			</File>
+			<File
+				RelativePath=".\wrapper_win.c"
+				>
+			</File>
+			<File
+				RelativePath=".\wrappereventloop.c"
+				>
+			</File>
+			<File
+				RelativePath=".\wrapperinfo.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="\x83w\x83b\x83_\x81[ \x83t\x83@..."
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\logger.h"
+				>
+			</File>
+			<File
+				RelativePath=".\messages.h"
+				>
+			</File>
+			<File
+				RelativePath=".\property.h"
+				>
+			</File>
+			<File
+				RelativePath=".\resource.h"
+				>
+			</File>
+			<File
+				RelativePath=".\wrapper.h"
+				>
+			</File>
+			<File
+				RelativePath=".\wrapperinfo.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="\x83\x8A\x83\\x81[\x83X \x83t\x83@..."
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Modified: trunk/wrapper/src/c/wrapper_win.c
===================================================================
--- trunk/wrapper/src/c/wrapper_win.c	2006-10-10 04:45:10 UTC (rev 1208)
+++ trunk/wrapper/src/c/wrapper_win.c	2006-10-10 13:59:52 UTC (rev 1209)
@@ -158,7 +158,7 @@
  */
 void buildSystemPath() {
     char *envBuffer;
-    int len, i;
+    size_t len, i;
     char *c, *lc;
 
     /* Get the length of the PATH environment variable. */
@@ -171,7 +171,7 @@
 
     /* Allocate the memory to hold the PATH */
     envBuffer = malloc(sizeof(char) * len);
-    GetEnvironmentVariable("PATH", envBuffer, len);
+    GetEnvironmentVariable("PATH", envBuffer, (DWORD)len);
 
 #ifdef _DEBUG
     printf("Getting the system path: %s\n", envBuffer);
@@ -185,7 +185,7 @@
     /* Get the elements ending in a ';' */
     while (((c = strchr(lc, ';')) != NULL) && (i < SYSTEM_PATH_MAX_LEN - 2))
     {
-        len = c - lc;
+        len = (int)(c - lc);
         systemPath[i] = malloc(sizeof(char) * (len + 1));
         memcpy(systemPath[i], lc, len);
         systemPath[i][len] = '\0';
@@ -268,32 +268,32 @@
     if (cleanUpPIDFilesOnExit) {
         /* Remove pid file.  It may no longer exist. */
         if (wrapperData->pidFilename) {
-            unlink(wrapperData->pidFilename);
+            _unlink(wrapperData->pidFilename);
         }
         
         /* Remove lock file.  It may no longer exist. */
         if (wrapperData->lockFilename) {
-            unlink(wrapperData->lockFilename);
+            _unlink(wrapperData->lockFilename);
         }
         
         /* Remove status file.  It may no longer exist. */
         if (wrapperData->statusFilename) {
-            unlink(wrapperData->statusFilename);
+            _unlink(wrapperData->statusFilename);
         }
         
         /* Remove java status file if it was registered and created by this process. */
         if (wrapperData->javaStatusFilename) {
-            unlink(wrapperData->javaStatusFilename);
+            _unlink(wrapperData->javaStatusFilename);
         }
         
         /* Remove java id file if it was registered and created by this process. */
         if (wrapperData->javaIdFilename) {
-            unlink(wrapperData->javaIdFilename);
+            _unlink(wrapperData->javaIdFilename);
         }
         
         /* Remove anchor file.  It may no longer exist. */
         if (wrapperData->anchorFilename) {
-            unlink(wrapperData->anchorFilename);
+            _unlink(wrapperData->anchorFilename);
         }
     }
     
@@ -586,7 +586,7 @@
 }
 
 void wrapperBuildJavaCommand() {
-    int commandLen;
+    size_t commandLen;
     char **strings;
     int length, i;
 
@@ -1008,11 +1008,11 @@
     DWORD keepCnt;
     int thisLF;
     struct timeb timeBuffer;
-    long startTime;
+    time_t startTime;
     int startTimeMillis;
-    long now;
+    time_t now;
     int nowMillis;
-    long durr;
+    time_t durr;
 
 
     if (!wrapperChildStdoutRdBuffer) {
@@ -1052,7 +1052,7 @@
          *  full buffer, but not more than the READ_BUFFER_BLOCK_SIZE at a time.
          *  Always peeking the max will just waste CPU as most lines will be much
          *  shorter. */
-        maxRead = wrapperChildStdoutRdBufferSize - (bufferP - wrapperChildStdoutRdBuffer) - 1;
+        maxRead = wrapperChildStdoutRdBufferSize - (int)(bufferP - wrapperChildStdoutRdBuffer) - 1;
         if (maxRead <= 0 ) {
             /* We are out of buffer space.  The buffer needs to be expanded. */
             /*
@@ -1096,7 +1096,7 @@
 
             if ((cCR != NULL) && ((cLF == NULL) || (cLF > cCR))) {
                 /* CR was found.  If both were found then the CR was first. */
-                keepCnt = cCR - bufferP + 1;
+                keepCnt = (int)(cCR - bufferP) + 1;
                 if (cCR[1] == (char)0x0a) {
                     /* CR+LF found. Read count should include it as well. */
                     keepCnt++;
@@ -1113,15 +1113,15 @@
 
                 /* Terminate the buffer to just before the CR. */
                 cCR[0] = '\0';
-                lineLength = cCR - wrapperChildStdoutRdBuffer;
+                lineLength = (int)(cCR - wrapperChildStdoutRdBuffer);
 
             } else if (cLF != NULL) {
                 /* LF found. */
-                keepCnt = cLF - bufferP + 1;
+                keepCnt = (int)(cLF - bufferP) + 1;
 
                 /* Terminate the buffer to just before the LF. */
                 cLF[0] = '\0';
-                lineLength = cLF - wrapperChildStdoutRdBuffer;
+                lineLength = (int)(cLF - wrapperChildStdoutRdBuffer);
                 thisLF = 1;
               /*log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_DEBUG, "  LF");*/
             } else {
@@ -1293,7 +1293,7 @@
 
     /* Remove java pid file if it was registered and created by this process. */
     if (wrapperData->javaPidFilename) {
-        unlink(wrapperData->javaPidFilename);
+        _unlink(wrapperData->javaPidFilename);
     }
     
     if (!CloseHandle(javaProcess)) {
@@ -2151,7 +2151,7 @@
                 /* Set Description key in registry */
                 RegSetValueEx(hKey, "Description", (DWORD) 0, (DWORD) REG_SZ,
                     (const unsigned char *)wrapperData->ntServiceDescription,
-                    (strlen(wrapperData->ntServiceDescription) + 1));
+                    (int)(strlen(wrapperData->ntServiceDescription) + 1));
                 RegCloseKey(hKey);
             }
             
@@ -2256,7 +2256,7 @@
                     envKeys[dwIndex] = malloc(MAX_PROPERTY_NAME_LENGTH - 1 + MAX_PROPERTY_VALUE_LENGTH - 1 + 2);
                     if (envKeys[dwIndex] != NULL) {
                         sprintf(envKeys[dwIndex], "%s=%s", name, data);
-                        if (putenv(envKeys[dwIndex])) {
+                        if (_putenv(envKeys[dwIndex])) {
                             log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_FATAL, "Unable to set environment variable from the registry - %s", getLastErrorText());
                             err = ERROR_NO_MORE_ITEMS;
                             result = 1;
@@ -2326,7 +2326,7 @@
 #endif
                                     /* Replace the env string. */
                                     sprintf(envKeys[ dwIndex ], "%s=%s", name, data);
-                                    if (putenv(envKeys[ dwIndex ])) {
+                                    if (_putenv(envKeys[ dwIndex ])) {
                                         log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_FATAL, "Unable to set environment variable from the registry - %s", getLastErrorText());
                                         err = ERROR_NO_MORE_ITEMS;
                                         result = 1;
@@ -3185,7 +3185,7 @@
     log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_FATAL, "  exceptionCode    = %s", exName);
     log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_FATAL, "  exceptionFlag    = %s", 
         (exceptionPointers->ExceptionRecord->ExceptionFlags == EXCEPTION_NONCONTINUABLE ? "EXCEPTION_NONCONTINUABLE" : "EXCEPTION_NONCONTINUABLE_EXCEPTION"));
-    log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_FATAL, "  exceptionAddress = %p", (int)exceptionPointers->ExceptionRecord->ExceptionAddress);
+    log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_FATAL, "  exceptionAddress = %p", exceptionPointers->ExceptionRecord->ExceptionAddress);
     if (exCode == EXCEPTION_ACCESS_VIOLATION) {
         if (exceptionPointers->ExceptionRecord->ExceptionInformation[0] == 0) {
             log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_FATAL, "  Read access exception from %p", 
@@ -3322,7 +3322,7 @@
         }
         
         /* Set the default umask of the Wrapper process. */
-        umask(wrapperData->umask);
+        _umask(wrapperData->umask);
         
         /* Perform the specified command */
         if(!strcmpIgnoreCase(wrapperData->argCommand,"i") || !strcmpIgnoreCase(wrapperData->argCommand,"-install")) {
@@ -3524,9 +3524,9 @@
     /*
      * Initialize the string variables used to retrieve values from Windows Registry
      */
-    memset(&jresubkey, sizeof(jresubkey), 0);
-    memset(&jreversion, sizeof(jreversion), 0);
-    memset(&jhome, sizeof(jhome), 0);
+    memset(&jresubkey, 0, sizeof(jresubkey));
+    memset(&jreversion, 0, sizeof(jreversion));
+    memset(&jhome, 0, sizeof(jhome));
 
     /* SubKey containing the jvm version */
     strcpy(jresubkey, "SOFTWARE\\JavaSoft\\Java Runtime Environment");

Modified: trunk/wrapper/src/c/wrappereventloop.c
===================================================================
--- trunk/wrapper/src/c/wrappereventloop.c	2006-10-10 04:45:10 UTC (rev 1208)
+++ trunk/wrapper/src/c/wrappereventloop.c	2006-10-10 13:59:52 UTC (rev 1209)
@@ -57,6 +57,11 @@
 
 #ifdef WIN32
 #include <io.h>
+
+// MS Visual Studio 8 went and deprecated the POXIX names for functions.
+//  Fixing them all would be a big headache for UNIX versions.
+#pragma warning(disable : 4996)
+
 #else /* UNIX */
 #include <unistd.h>
 #include <stdlib.h>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1212
          http://svn.sourceforge.net/wrapper/?rev=1212&view=rev
Author:   mortenson
Date:     2006-10-11 07:42:29 -0700 (Wed, 11 Oct 2006)

Log Message:
-----------
Fix some compiler errors under VC6

Modified Paths:
--------------
    trunk/wrapper/src/c/Wrapper32.plg
    trunk/wrapper/src/c/logger.c
    trunk/wrapper/src/c/wrapper.c

Modified: trunk/wrapper/src/c/Wrapper32.plg
===================================================================
--- trunk/wrapper/src/c/Wrapper32.plg	2006-10-11 10:25:34 UTC (rev 1211)
+++ trunk/wrapper/src/c/Wrapper32.plg	2006-10-11 14:42:29 UTC (rev 1212)
@@ -6,20 +6,14 @@
 --------------------\x8D\\x90\xAC: Wrapper - Win32 Debug--------------------
 </h3>
 <h3>\xBA\xCF\xDD\xC4\xDE ײ\xDD</h3>
-Creating command line "rc.exe /l 0x411 /fo"Debug32/Wrapper.res" /d "_DEBUG" "D:\SourceForge\wrapper\src\c\Wrapper.rc"" 
-\x88ꎞ̧\xB2\xD9 "C:\DOCUME~1\leif\LOCALS~1\Temp\RSP41C.tmp" \x82\xF0\x8D쐬\x82\xB5\x81A\x8E\x9F\x82̓\xE0\x97e\x82\xF0\x8BL\x98^\x82\xB5\x82܂\xB7
+\x88ꎞ̧\xB2\xD9 "C:\DOCUME~1\leif\LOCALS~1\Temp\RSP23.tmp" \x82\xF0\x8D쐬\x82\xB5\x81A\x8E\x9F\x82̓\xE0\x97e\x82\xF0\x8BL\x98^\x82\xB5\x82܂\xB7
 [
 /nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "DEBUG" /FR"Debug32/" /Fp"Debug32/Wrapper32.pch" /YX /Fo"Debug32/" /Fd"Debug32/" /FD /GZ /c 
-"D:\SourceForge\wrapper\src\c\logger.c"
-"D:\SourceForge\wrapper\src\c\property.c"
-"D:\SourceForge\wrapper\src\c\wrapper.c"
-"D:\SourceForge\wrapper\src\c\wrapper_unix.c"
-"D:\SourceForge\wrapper\src\c\wrapper_win.c"
-"D:\SourceForge\wrapper\src\c\wrappereventloop.c"
-"D:\SourceForge\wrapper\src\c\wrapperinfo.c"
+"C:\SourceForge\wrapper\src\c\logger.c"
+"C:\SourceForge\wrapper\src\c\wrapper.c"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\leif\LOCALS~1\Temp\RSP41C.tmp" 
-\x88ꎞ̧\xB2\xD9 "C:\DOCUME~1\leif\LOCALS~1\Temp\RSP41D.tmp" \x82\xF0\x8D쐬\x82\xB5\x81A\x8E\x9F\x82̓\xE0\x97e\x82\xF0\x8BL\x98^\x82\xB5\x82܂\xB7
+Creating command line "cl.exe @C:\DOCUME~1\leif\LOCALS~1\Temp\RSP23.tmp" 
+\x88ꎞ̧\xB2\xD9 "C:\DOCUME~1\leif\LOCALS~1\Temp\RSP24.tmp" \x82\xF0\x8D쐬\x82\xB5\x81A\x8E\x9F\x82̓\xE0\x97e\x82\xF0\x8BL\x98^\x82\xB5\x82܂\xB7
 [
 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib shlwapi.lib /nologo /subsystem:console /incremental:yes /pdb:"Debug32/wrapper.pdb" /debug /machine:I386 /out:"../../bin/wrapper.exe" /pdbtype:sept 
 .\Debug32\logger.obj
@@ -29,19 +23,12 @@
 .\Debug32\wrapper_win.obj
 .\Debug32\wrappereventloop.obj
 .\Debug32\wrapperinfo.obj
-.\Debug32\Wrapper.res
 ]
-\xBA\xCF\xDD\xC4\xDE ײ\xDD "link.exe @C:\DOCUME~1\leif\LOCALS~1\Temp\RSP41D.tmp" \x82̍쐬\x92\x86
+\xBA\xCF\xDD\xC4\xDE ײ\xDD "link.exe @C:\DOCUME~1\leif\LOCALS~1\Temp\RSP24.tmp" \x82̍쐬\x92\x86
 <h3>\xB1\xB3\xC4\xCC߯\xC4 \xB3\xA8\xDD\xC4޳</h3>
-ؿ\xB0\xBD\x82\xF0\xBA\xDD\xCAْ߲\x86...
 \xBA\xDD\xCAْ߲\x86...
 logger.c
-property.c
 wrapper.c
-wrapper_unix.c
-wrapper_win.c
-wrappereventloop.c
-wrapperinfo.c
 \xD8ݸ\x92\x86...
 
 

Modified: trunk/wrapper/src/c/logger.c
===================================================================
--- trunk/wrapper/src/c/logger.c	2006-10-11 10:25:34 UTC (rev 1211)
+++ trunk/wrapper/src/c/logger.c	2006-10-11 14:42:29 UTC (rev 1212)
@@ -67,6 +67,11 @@
 //  Fixing them all would be a big headache for UNIX versions.
 #pragma warning(disable : 4996)
 
+// Defines for MS Visual Studio 6
+#ifndef intptr_t
+typedef long intptr_t;
+#endif
+
 #else
 #include <glob.h>
 #include <syslog.h>

Modified: trunk/wrapper/src/c/wrapper.c
===================================================================
--- trunk/wrapper/src/c/wrapper.c	2006-10-11 10:25:34 UTC (rev 1211)
+++ trunk/wrapper/src/c/wrapper.c	2006-10-11 14:42:29 UTC (rev 1212)
@@ -67,6 +67,11 @@
 //  Fixing them all would be a big headache for UNIX versions.
 #pragma warning(disable : 4996)
 
+// Defines for MS Visual Studio 6
+#ifndef intptr_t
+typedef long intptr_t;
+#endif
+
 #define EADDRINUSE  WSAEADDRINUSE
 #define EWOULDBLOCK WSAEWOULDBLOCK
 #define ENOTSOCK    WSAENOTSOCK


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1213
          http://svn.sourceforge.net/wrapper/?rev=1213&view=rev
Author:   mortenson
Date:     2006-10-11 07:58:19 -0700 (Wed, 11 Oct 2006)

Log Message:
-----------
Remove some code duplication in application startup.

Modified Paths:
--------------
    trunk/wrapper/src/c/Wrapper32.plg
    trunk/wrapper/src/c/wrapper.c
    trunk/wrapper/src/c/wrapper.h
    trunk/wrapper/src/c/wrapper_unix.c
    trunk/wrapper/src/c/wrapper_win.c

Modified: trunk/wrapper/src/c/Wrapper32.plg
===================================================================
--- trunk/wrapper/src/c/Wrapper32.plg	2006-10-11 14:42:29 UTC (rev 1212)
+++ trunk/wrapper/src/c/Wrapper32.plg	2006-10-11 14:58:19 UTC (rev 1213)
@@ -6,14 +6,16 @@
 --------------------\x8D\\x90\xAC: Wrapper - Win32 Debug--------------------
 </h3>
 <h3>\xBA\xCF\xDD\xC4\xDE ײ\xDD</h3>
-\x88ꎞ̧\xB2\xD9 "C:\DOCUME~1\leif\LOCALS~1\Temp\RSP23.tmp" \x82\xF0\x8D쐬\x82\xB5\x81A\x8E\x9F\x82̓\xE0\x97e\x82\xF0\x8BL\x98^\x82\xB5\x82܂\xB7
+\x88ꎞ̧\xB2\xD9 "C:\DOCUME~1\leif\LOCALS~1\Temp\RSP3E.tmp" \x82\xF0\x8D쐬\x82\xB5\x81A\x8E\x9F\x82̓\xE0\x97e\x82\xF0\x8BL\x98^\x82\xB5\x82܂\xB7
 [
 /nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "DEBUG" /FR"Debug32/" /Fp"Debug32/Wrapper32.pch" /YX /Fo"Debug32/" /Fd"Debug32/" /FD /GZ /c 
-"C:\SourceForge\wrapper\src\c\logger.c"
 "C:\SourceForge\wrapper\src\c\wrapper.c"
+"C:\SourceForge\wrapper\src\c\wrapper_unix.c"
+"C:\SourceForge\wrapper\src\c\wrapper_win.c"
+"C:\SourceForge\wrapper\src\c\wrappereventloop.c"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\leif\LOCALS~1\Temp\RSP23.tmp" 
-\x88ꎞ̧\xB2\xD9 "C:\DOCUME~1\leif\LOCALS~1\Temp\RSP24.tmp" \x82\xF0\x8D쐬\x82\xB5\x81A\x8E\x9F\x82̓\xE0\x97e\x82\xF0\x8BL\x98^\x82\xB5\x82܂\xB7
+Creating command line "cl.exe @C:\DOCUME~1\leif\LOCALS~1\Temp\RSP3E.tmp" 
+\x88ꎞ̧\xB2\xD9 "C:\DOCUME~1\leif\LOCALS~1\Temp\RSP3F.tmp" \x82\xF0\x8D쐬\x82\xB5\x81A\x8E\x9F\x82̓\xE0\x97e\x82\xF0\x8BL\x98^\x82\xB5\x82܂\xB7
 [
 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib shlwapi.lib /nologo /subsystem:console /incremental:yes /pdb:"Debug32/wrapper.pdb" /debug /machine:I386 /out:"../../bin/wrapper.exe" /pdbtype:sept 
 .\Debug32\logger.obj
@@ -24,11 +26,13 @@
 .\Debug32\wrappereventloop.obj
 .\Debug32\wrapperinfo.obj
 ]
-\xBA\xCF\xDD\xC4\xDE ײ\xDD "link.exe @C:\DOCUME~1\leif\LOCALS~1\Temp\RSP24.tmp" \x82̍쐬\x92\x86
+\xBA\xCF\xDD\xC4\xDE ײ\xDD "link.exe @C:\DOCUME~1\leif\LOCALS~1\Temp\RSP3F.tmp" \x82̍쐬\x92\x86
 <h3>\xB1\xB3\xC4\xCC߯\xC4 \xB3\xA8\xDD\xC4޳</h3>
 \xBA\xDD\xCAْ߲\x86...
-logger.c
 wrapper.c
+wrapper_unix.c
+wrapper_win.c
+wrappereventloop.c
 \xD8ݸ\x92\x86...
 
 

Modified: trunk/wrapper/src/c/wrapper.c
===================================================================
--- trunk/wrapper/src/c/wrapper.c	2006-10-11 14:42:29 UTC (rev 1212)
+++ trunk/wrapper/src/c/wrapper.c	2006-10-11 14:58:19 UTC (rev 1213)
@@ -600,6 +600,12 @@
     return name;
 }
 
+/* Mutex for syncronization of the wrapperProtocolFunction function. */
+#ifdef WIN32
+HANDLE wrapperProtocolFunctionMutexHandle = NULL;
+#else
+pthread_mutex_t wrapperProtocolFunctionMutex = PTHREAD_MUTEX_INITIALIZER;
+#endif
 size_t protocolSendBufferSize = 0;
 char *protocolSendBuffer = NULL;
 int wrapperProtocolFunction(char function, const char *message) {
@@ -833,9 +839,31 @@
  *****************************************************************************/
 
 /**
- * Initialize logging.
+ * Pre initialize the wrapper.
  */
-int wrapperInitializeLogging() {
+int wrapperInitialize() {
+    /* Initialize the properties variable. */
+    properties = NULL;
+
+    /* Make sure all values are reliably set to 0. All required values should also be
+     *  set below, but this extra step will protect against future changes.  Some
+     *  platforms appear to initialize maloc'd memory to 0 while others do not. */
+    wrapperData = malloc(sizeof(WrapperConfig));
+    memset(wrapperData, 0, sizeof(WrapperConfig));
+    /* Setup the initial values of required properties. */
+    wrapperData->configured = FALSE;
+    wrapperData->isConsole = TRUE;
+    wrapperSetWrapperState(FALSE, WRAPPER_WSTATE_STARTING);
+    wrapperSetJavaState(FALSE, WRAPPER_JSTATE_DOWN, 0, -1);
+    wrapperData->lastPingTicks = wrapperGetTicks();
+    wrapperData->jvmCommand = NULL;
+    wrapperData->exitRequested = FALSE;
+    wrapperData->restartRequested = TRUE; /* The first JVM needs to be started. */
+    wrapperData->exitCode = 0;
+    wrapperData->jvmRestarts = 0;
+    wrapperData->jvmLaunchTicks = wrapperGetTicks();
+    wrapperData->failedInvocationCount = 0;
+        
     if (initLogging()) {
         return 1;
     }
@@ -850,9 +878,24 @@
     setConsoleFlush(FALSE);
     setSyslogLevelInt(LEVEL_NONE);
 
+#ifdef WIN32
+    if (!(wrapperProtocolFunctionMutexHandle = CreateMutex(NULL, FALSE, NULL))) {
+        printf("Failed to create protocol mutex. %s\n", getLastErrorText());
+        fflush(NULL);
+        return 1;
+    }
+#endif
+
     return 0;
 }
 
+/** Common wrapper cleanup code. */
+void wrapperDispose()
+{
+    /* Clean up the logging system. */
+    disposeLogging();
+}
+
 /**
  * Returns the file name base as a newly malloced char *.  The resulting
  *  base file name will have any path and extension stripped.
@@ -1062,7 +1105,7 @@
     wrapperData->isConsole = TRUE;
 
     /* Initialize the wrapper */
-    res = wrapperInitialize();
+    res = wrapperInitializeRun();
     if (res != 0) {
         return res;
     }
@@ -1109,7 +1152,7 @@
     wrapperData->isConsole = FALSE;
 
     /* Initialize the wrapper */
-    res = wrapperInitialize();
+    res = wrapperInitializeRun();
     if (res != 0) {
         return res;
     }

Modified: trunk/wrapper/src/c/wrapper.h
===================================================================
--- trunk/wrapper/src/c/wrapper.h	2006-10-11 14:42:29 UTC (rev 1212)
+++ trunk/wrapper/src/c/wrapper.h	2006-10-11 14:58:19 UTC (rev 1213)
@@ -325,7 +325,8 @@
 extern void wrapperBuildJavaCommandArray(char ***strings, int *length, int addQuotes);
 extern void wrapperFreeJavaCommandArray(char **strings, int length);
 
-extern int wrapperInitializeLogging();
+extern int wrapperInitialize();
+extern void wrapperDispose();
 
 /**
  * Returns the file name base as a newly malloced char *.  The resulting
@@ -405,7 +406,7 @@
 /**
  * Execute initialization code to get the wrapper set up.
  */
-extern int wrapperInitialize();
+extern int wrapperInitializeRun();
 
 /**
  * Cause the current thread to sleep for the specified number of milliseconds.

Modified: trunk/wrapper/src/c/wrapper_unix.c
===================================================================
--- trunk/wrapper/src/c/wrapper_unix.c	2006-10-11 14:42:29 UTC (rev 1212)
+++ trunk/wrapper/src/c/wrapper_unix.c	2006-10-11 14:58:19 UTC (rev 1213)
@@ -138,8 +138,8 @@
         unlink(wrapperData->anchorFilename);
     }
     
-    /* Clean up the logging system. */
-    disposeLogging();
+	/* Common wrapper cleanup code. */
+	wrapperDispose();
 
     exit(exitCode);
 }
@@ -585,7 +585,7 @@
 /**
  * Execute initialization code to get the wrapper set up.
  */
-int wrapperInitialize() {
+int wrapperInitializeRun() {
     int retval = 0;
     int res;
 
@@ -1266,29 +1266,7 @@
     int i;
 #endif
 
-    /* Initialize the properties variable. */
-    properties = NULL;
-
-    /* Make sure all values are reliably set to 0. All required values should also be
-     *  set below, but this extra step will protect against future changes.  Some
-     *  platforms appear to initialize maloc'd memory to 0 while others do not. */
-    wrapperData = malloc(sizeof(WrapperConfig));
-    memset(wrapperData, 0, sizeof(WrapperConfig));
-    /* Setup the initial values of required properties. */
-    wrapperData->configured = FALSE;
-    wrapperData->isConsole = TRUE;
-    wrapperSetWrapperState(FALSE, WRAPPER_WSTATE_STARTING);
-    wrapperSetJavaState(FALSE, WRAPPER_JSTATE_DOWN, 0, -1);
-    wrapperData->lastPingTicks = wrapperGetTicks();
-    wrapperData->jvmCommand = NULL;
-    wrapperData->exitRequested = FALSE;
-    wrapperData->restartRequested = TRUE; /* The first JVM needs to be started. */
-    wrapperData->exitCode = 0;
-    wrapperData->jvmRestarts = 0;
-    wrapperData->jvmLaunchTicks = wrapperGetTicks();
-    wrapperData->failedInvocationCount = 0;
-        
-    if (wrapperInitializeLogging()) {
+    if (wrapperInitialize()) {
         appExit(1);
         return 1; /* For compiler. */
     }

Modified: trunk/wrapper/src/c/wrapper_win.c
===================================================================
--- trunk/wrapper/src/c/wrapper_win.c	2006-10-11 14:42:29 UTC (rev 1212)
+++ trunk/wrapper/src/c/wrapper_win.c	2006-10-11 14:58:19 UTC (rev 1213)
@@ -303,8 +303,8 @@
         invocationMutexHandle = NULL;
     }
     
-    /* Clean up the logging system. */
-    disposeLogging();
+	/* Common wrapper cleanup code. */
+	wrapperDispose();
 
     /* Do this here to unregister the syslog resources on exit.*/
     /*unregisterSyslogMessageFile(); */
@@ -790,7 +790,7 @@
 /**
  * Execute initialization code to get the wrapper set up.
  */
-int wrapperInitialize() {
+int wrapperInitializeRun() {
     WORD ws_version=MAKEWORD(1, 1);
     WSADATA ws_data;
     HANDLE hStdout;
@@ -3219,29 +3219,7 @@
 
     buildSystemPath();
 
-    /* Initialize the properties variable. */
-    properties = NULL;
-
-    /* Make sure all values are reliably set to 0. All required values should also be
-     *  set below, but this extra step will protect against future changes.  Some
-     *  platforms appear to initialize maloc'd memory to 0 while others do not. */
-    wrapperData = malloc(sizeof(WrapperConfig));
-    memset(wrapperData, 0, sizeof(WrapperConfig));
-    /* Setup the initial values of required properties. */
-    wrapperData->configured = FALSE;
-    wrapperData->isConsole = TRUE;
-    wrapperSetWrapperState(FALSE, WRAPPER_WSTATE_STARTING);
-    wrapperSetJavaState(FALSE, WRAPPER_JSTATE_DOWN, 0, -1);
-    wrapperData->lastPingTicks = wrapperGetTicks();
-    wrapperData->jvmCommand = NULL;
-    wrapperData->exitRequested = FALSE;
-    wrapperData->restartRequested = TRUE; /* The first JVM needs to be started. */
-    wrapperData->exitCode = 0;
-    wrapperData->jvmRestarts = 0;
-    wrapperData->jvmLaunchTicks = wrapperGetTicks();
-    wrapperData->failedInvocationCount = 0;
-
-    if (wrapperInitializeLogging()) {
+    if (wrapperInitialize()) {
         appExit(1);
         return; /* For clarity. */
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1214
          http://svn.sourceforge.net/wrapper/?rev=1214&view=rev
Author:   mortenson
Date:     2006-10-11 08:23:53 -0700 (Wed, 11 Oct 2006)

Log Message:
-----------
Fix a compiler error on VC8

Modified Paths:
--------------
    trunk/wrapper/src/c/logger.c
    trunk/wrapper/src/c/wrapper.c

Modified: trunk/wrapper/src/c/logger.c
===================================================================
--- trunk/wrapper/src/c/logger.c	2006-10-11 14:58:19 UTC (rev 1213)
+++ trunk/wrapper/src/c/logger.c	2006-10-11 15:23:53 UTC (rev 1214)
@@ -68,8 +68,9 @@
 #pragma warning(disable : 4996)
 
 // Defines for MS Visual Studio 6
-#ifndef intptr_t
+#ifndef _INTPTR_T_DEFINED
 typedef long intptr_t;
+#define _INTPTR_T_DEFINED
 #endif
 
 #else

Modified: trunk/wrapper/src/c/wrapper.c
===================================================================
--- trunk/wrapper/src/c/wrapper.c	2006-10-11 14:58:19 UTC (rev 1213)
+++ trunk/wrapper/src/c/wrapper.c	2006-10-11 15:23:53 UTC (rev 1214)
@@ -68,8 +68,9 @@
 #pragma warning(disable : 4996)
 
 // Defines for MS Visual Studio 6
-#ifndef intptr_t
+#ifndef _INTPTR_T_DEFINED
 typedef long intptr_t;
+#define _INTPTR_T_DEFINED
 #endif
 
 #define EADDRINUSE  WSAEADDRINUSE


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1216
          http://svn.sourceforge.net/wrapper/?rev=1216&view=rev
Author:   mortenson
Date:     2006-10-11 09:01:14 -0700 (Wed, 11 Oct 2006)

Log Message:
-----------
Update the VC8 project.

Added Paths:
-----------
    trunk/wrapper/src/c/wrapper32_VC8.sln
    trunk/wrapper/src/c/wrapper32_VC8.vcproj

Removed Paths:
-------------
    trunk/wrapper/src/c/wrapper32.sln
    trunk/wrapper/src/c/wrapper32.vcproj

Property Changed:
----------------
    trunk/wrapper/src/c/


Property changes on: trunk/wrapper/src/c
___________________________________________________________________
Name: svn:ignore
   - messages.rc
wrapperinfo.c
Debug*
Release*
WrapperJNI___Win??_Debug*
WrapperJNI___Win??_Release*
Wrapper??.aps
Wrapper??.ncb
Wrapper??.opt
Wrapper??.dep
WrapperJNI??.dep
WrapperJNI??.mak
.deps
*.ncb
*.suo
*.user

   + messages.rc
wrapperinfo.c
Debug*
Release*
WrapperJNI___Win??_Debug*
WrapperJNI___Win??_Release*
Wrapper??.aps
Wrapper??.ncb
Wrapper??.opt
Wrapper??.dep
WrapperJNI??.dep
WrapperJNI??.mak
.deps
*.ncb
*.suo
*.user
wrapper32_VC8__Win32_Debug
wrapper32_VC8__Win32_Release


Deleted: trunk/wrapper/src/c/wrapper32.sln
===================================================================
--- trunk/wrapper/src/c/wrapper32.sln	2006-10-11 15:36:27 UTC (rev 1215)
+++ trunk/wrapper/src/c/wrapper32.sln	2006-10-11 16:01:14 UTC (rev 1216)
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wrapper32", "wrapper32.vcproj", "{18A1381E-03E3-486D-B34F-B73D21FBACB3}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{18A1381E-03E3-486D-B34F-B73D21FBACB3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{18A1381E-03E3-486D-B34F-B73D21FBACB3}.Debug|Win32.Build.0 = Debug|Win32
-		{18A1381E-03E3-486D-B34F-B73D21FBACB3}.Release|Win32.ActiveCfg = Release|Win32
-		{18A1381E-03E3-486D-B34F-B73D21FBACB3}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

Deleted: trunk/wrapper/src/c/wrapper32.vcproj
===================================================================
--- trunk/wrapper/src/c/wrapper32.vcproj	2006-10-11 15:36:27 UTC (rev 1215)
+++ trunk/wrapper/src/c/wrapper32.vcproj	2006-10-11 16:01:14 UTC (rev 1216)
@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="wrapper32"
-	ProjectGUID="{18A1381E-03E3-486D-B34F-B73D21FBACB3}"
-	RootNamespace="wrapper32"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				UseUnicodeResponseFiles="false"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				BufferSecurityCheck="true"
-				TreatWChar_tAsBuiltInType="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="wsock32.lib shlwapi.lib"
-				OutputFile="$(InputDir)\..\..\bin\wrapper.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="wsock32.lib shlwapi.lib"
-				OutputFile="$(InputDir)\..\..\bin\wrapper.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="\x83\\x81[\x83X \x83t\x83@..."
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\logger.c"
-				>
-			</File>
-			<File
-				RelativePath=".\property.c"
-				>
-			</File>
-			<File
-				RelativePath=".\wrapper.c"
-				>
-			</File>
-			<File
-				RelativePath=".\wrapper_win.c"
-				>
-			</File>
-			<File
-				RelativePath=".\wrappereventloop.c"
-				>
-			</File>
-			<File
-				RelativePath=".\wrapperinfo.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="\x83w\x83b\x83_\x81[ \x83t\x83@..."
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\logger.h"
-				>
-			</File>
-			<File
-				RelativePath=".\messages.h"
-				>
-			</File>
-			<File
-				RelativePath=".\property.h"
-				>
-			</File>
-			<File
-				RelativePath=".\resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\wrapper.h"
-				>
-			</File>
-			<File
-				RelativePath=".\wrapperinfo.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="\x83\x8A\x83\\x81[\x83X \x83t\x83@..."
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

Added: trunk/wrapper/src/c/wrapper32_VC8.sln
===================================================================
--- trunk/wrapper/src/c/wrapper32_VC8.sln	                        (rev 0)
+++ trunk/wrapper/src/c/wrapper32_VC8.sln	2006-10-11 16:01:14 UTC (rev 1216)
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wrapper32_VC8", "wrapper32_VC8.vcproj", "{18A1381E-03E3-486D-B34F-B73D21FBACB3}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{18A1381E-03E3-486D-B34F-B73D21FBACB3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{18A1381E-03E3-486D-B34F-B73D21FBACB3}.Debug|Win32.Build.0 = Debug|Win32
+		{18A1381E-03E3-486D-B34F-B73D21FBACB3}.Release|Win32.ActiveCfg = Release|Win32
+		{18A1381E-03E3-486D-B34F-B73D21FBACB3}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Added: trunk/wrapper/src/c/wrapper32_VC8.vcproj
===================================================================
--- trunk/wrapper/src/c/wrapper32_VC8.vcproj	                        (rev 0)
+++ trunk/wrapper/src/c/wrapper32_VC8.vcproj	2006-10-11 16:01:14 UTC (rev 1216)
@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="shift_jis"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="wrapper32_VC8"
+	ProjectGUID="{18A1381E-03E3-486D-B34F-B73D21FBACB3}"
+	RootNamespace="wrapper32_VC8"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(IntDir)"
+			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				UseUnicodeResponseFiles="false"
+				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				BufferSecurityCheck="true"
+				TreatWChar_tAsBuiltInType="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="wsock32.lib shlwapi.lib"
+				OutputFile="$(InputDir)\..\..\bin\wrapper.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(IntDir)"
+			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="0"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="wsock32.lib shlwapi.lib"
+				OutputFile="$(InputDir)\..\..\bin\wrapper.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source File"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\logger.c"
+				>
+			</File>
+			<File
+				RelativePath=".\property.c"
+				>
+			</File>
+			<File
+				RelativePath=".\wrapper.c"
+				>
+			</File>
+			<File
+				RelativePath=".\wrapper_win.c"
+				>
+			</File>
+			<File
+				RelativePath=".\wrappereventloop.c"
+				>
+			</File>
+			<File
+				RelativePath=".\wrapperinfo.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header File"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\logger.h"
+				>
+			</File>
+			<File
+				RelativePath=".\messages.h"
+				>
+			</File>
+			<File
+				RelativePath=".\property.h"
+				>
+			</File>
+			<File
+				RelativePath=".\resource.h"
+				>
+			</File>
+			<File
+				RelativePath=".\wrapper.h"
+				>
+			</File>
+			<File
+				RelativePath=".\wrapperinfo.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource File"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath=".\messages.mc"
+				>
+			</File>
+			<File
+				RelativePath=".\Wrapper.rc"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1221
          http://svn.sourceforge.net/wrapper/?rev=1221&view=rev
Author:   mortenson
Date:     2006-10-11 18:49:57 -0700 (Wed, 11 Oct 2006)

Log Message:
-----------
Fix a synchronization problem sending packets to the JVM

Modified Paths:
--------------
    trunk/wrapper/src/c/logger.c
    trunk/wrapper/src/c/wrapper.c

Modified: trunk/wrapper/src/c/logger.c
===================================================================
--- trunk/wrapper/src/c/logger.c	2006-10-11 17:55:09 UTC (rev 1220)
+++ trunk/wrapper/src/c/logger.c	2006-10-12 01:49:57 UTC (rev 1221)
@@ -499,15 +499,15 @@
 #ifdef WIN32
     switch (WaitForSingleObject(log_printfMutexHandle, INFINITE)) {
     case WAIT_ABANDONED:
-        printf("Logging Mutex was abandoned.\n");
+        printf("Logging mutex was abandoned.\n");
         fflush(NULL);
         return -1;
     case WAIT_FAILED:
-        printf("Logging Mutex wait failed.\n");
+        printf("Logging mutex wait failed.\n");
         fflush(NULL);
         return -1;
     case WAIT_TIMEOUT:
-        printf("Logging Mutex wait timed out.\n");
+        printf("Logging mutex wait timed out.\n");
         fflush(NULL);
         return -1;
     default:

Modified: trunk/wrapper/src/c/wrapper.c
===================================================================
--- trunk/wrapper/src/c/wrapper.c	2006-10-11 17:55:09 UTC (rev 1220)
+++ trunk/wrapper/src/c/wrapper.c	2006-10-12 01:49:57 UTC (rev 1221)
@@ -603,17 +603,66 @@
 
 /* Mutex for syncronization of the wrapperProtocolFunction function. */
 #ifdef WIN32
-HANDLE wrapperProtocolFunctionMutexHandle = NULL;
+HANDLE protocolMutexHandle = NULL;
 #else
-pthread_mutex_t wrapperProtocolFunctionMutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t protocolMutex = PTHREAD_MUTEX_INITIALIZER;
 #endif
+
+
+/** Obtains a lock on the protocol mutex. */
+int lockProtocolMutex() {
+#ifdef WIN32
+    switch (WaitForSingleObject(protocolMutexHandle, INFINITE)) {
+    case WAIT_ABANDONED:
+        printf("Protocol mutex was abandoned.\n");
+        fflush(NULL);
+        return -1;
+    case WAIT_FAILED:
+        printf("Protocol mutex wait failed.\n");
+        fflush(NULL);
+        return -1;
+    case WAIT_TIMEOUT:
+        printf("Protocol mutex wait timed out.\n");
+        fflush(NULL);
+        return -1;
+    default:
+        /* Ok */
+        break;
+    }
+#else
+    pthread_mutex_lock(&protocolMutex);
+#endif
+    
+    return 0;
+}
+
+/** Releases a lock on the protocol mutex. */
+int releaseProtocolMutex() {
+#ifdef WIN32
+    if (!ReleaseMutex(protocolMutexHandle)) {
+        printf( "Failed to release protocol mutex. %s\n", getLastErrorText());
+        fflush(NULL);
+        return -1;
+    }
+#else
+    pthread_mutex_unlock(&protocolMutex);
+#endif
+    return 0;
+}
+
 size_t protocolSendBufferSize = 0;
 char *protocolSendBuffer = NULL;
 int wrapperProtocolFunction(char function, const char *message) {
     int rc;
     size_t len;
     const char *logMsg;
+    int returnVal;
     
+    /* It is important than there is never more than one thread allowed in here at a time. */
+    if (lockProtocolMutex()) {
+        return -1;
+    }
+
     /* We don't want to show the full properties log message.  It is quite long and distracting. */
     if (function == WRAPPER_MSG_PROPERTIES) {
         logMsg = "(Property Values)";
@@ -640,33 +689,40 @@
             log_printf(WRAPPER_SOURCE_PROTOCOL, LEVEL_DEBUG, "socket not open, so packet not sent %s : %s",
                 wrapperProtocolGetCodeName(function), (message == NULL ? "NULL" : logMsg));
         }
-        return -1;
-    }
-
-    if (wrapperData->isDebugging) {
-        log_printf(WRAPPER_SOURCE_PROTOCOL, LEVEL_DEBUG, "send a packet %s : %s",
-            wrapperProtocolGetCodeName(function), (message == NULL ? "NULL" : logMsg));
-    }
-
-    /* Build the packet */
-    protocolSendBuffer[0] = function;
-    if (message == NULL) {
-        protocolSendBuffer[1] = '\0';
+        returnVal = -1;
     } else {
-        strcpy((char*)(protocolSendBuffer + 1), message);
-    }
-
-    /* Send the packet */
-    rc = send(sd, protocolSendBuffer, (int)len, 0);
-    if (rc == SOCKET_ERROR) {
         if (wrapperData->isDebugging) {
-            log_printf(WRAPPER_SOURCE_PROTOCOL, LEVEL_DEBUG, "socket send failed. (%d)", wrapperGetLastError());
+            log_printf(WRAPPER_SOURCE_PROTOCOL, LEVEL_DEBUG, "send a packet %s : %s",
+                wrapperProtocolGetCodeName(function), (message == NULL ? "NULL" : logMsg));
         }
-        wrapperProtocolClose();
-        return -1;
+    
+        /* Build the packet */
+        protocolSendBuffer[0] = function;
+        if (message == NULL) {
+            protocolSendBuffer[1] = '\0';
+        } else {
+            strcpy((char*)(protocolSendBuffer + 1), message);
+        }
+    
+        /* Send the packet */
+        rc = send(sd, protocolSendBuffer, (int)len, 0);
+        if (rc == SOCKET_ERROR) {
+            if (wrapperData->isDebugging) {
+                log_printf(WRAPPER_SOURCE_PROTOCOL, LEVEL_DEBUG, "socket send failed. (%d)", wrapperGetLastError());
+            }
+            wrapperProtocolClose();
+            returnVal = -1;
+        } else {
+            returnVal = 1;
+        }
     }
 
-    return 1;
+    /* Always make sure the mutex is released. */
+    if (releaseProtocolMutex()) {
+        returnVal = -1;
+    }
+
+    return returnVal;
 }
 
 /**
@@ -880,7 +936,7 @@
     setSyslogLevelInt(LEVEL_NONE);
 
 #ifdef WIN32
-    if (!(wrapperProtocolFunctionMutexHandle = CreateMutex(NULL, FALSE, NULL))) {
+    if (!(protocolMutexHandle = CreateMutex(NULL, FALSE, NULL))) {
         printf("Failed to create protocol mutex. %s\n", getLastErrorText());
         fflush(NULL);
         return 1;
@@ -893,6 +949,16 @@
 /** Common wrapper cleanup code. */
 void wrapperDispose()
 {
+#ifdef WIN32
+    if (protocolMutexHandle) {
+        if (!CloseHandle(protocolMutexHandle))
+        {
+            printf("Unable to close protocol mutex handle. %s\n", getLastErrorText());
+            fflush(NULL);
+        }
+    }
+#endif
+    
     /* Clean up the logging system. */
     disposeLogging();
 }
@@ -1256,7 +1322,7 @@
  */
 void wrapperStripQuotes(const char *prop, char *propStripped) {
     size_t len;
-	int i, j;
+    int i, j;
     
     len = strlen(prop);
     j = 0;
@@ -1320,7 +1386,7 @@
     char paramBuffer[128];
     int quotable;
     int i, j;
-	size_t len2;
+    size_t len2;
     size_t cpLen, cpLenAlloc;
     char *tmpString;
     struct stat statBuffer;
@@ -1330,7 +1396,7 @@
     char cpPath[512];
     intptr_t handle;
     size_t len;
-	int found;
+    int found;
     struct _finddata_t fblock;
 #else
     glob_t g;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1223
          http://svn.sourceforge.net/wrapper/?rev=1223&view=rev
Author:   mortenson
Date:     2006-10-11 20:43:26 -0700 (Wed, 11 Oct 2006)

Log Message:
-----------
Correct some linux compiler errors.

Modified Paths:
--------------
    trunk/wrapper/src/c/logger.h
    trunk/wrapper/src/c/wrapper.c

Modified: trunk/wrapper/src/c/logger.h
===================================================================
--- trunk/wrapper/src/c/logger.h	2006-10-12 03:10:37 UTC (rev 1222)
+++ trunk/wrapper/src/c/logger.h	2006-10-12 03:43:26 UTC (rev 1223)
@@ -182,7 +182,7 @@
  *  funtion for the exceptions.
  */
 extern void log_printf_thread( int source_id, int level, int threadId, const char *lpszFmt, ... );
-#define log_printf( source_id, level, lpszFmt, ... ) log_printf_thread( source_id, level, WRAPPER_THREAD_CURRENT, lpszFmt, __VA_ARGS__ )
+#define log_printf( source_id, level, lpszFmt, ... ) log_printf_thread( source_id, level, WRAPPER_THREAD_CURRENT, lpszFmt, ##__VA_ARGS__ )
 
 /**
  * The log_printf_queue function is less efficient than the log_printf

Modified: trunk/wrapper/src/c/wrapper.c
===================================================================
--- trunk/wrapper/src/c/wrapper.c	2006-10-12 03:10:37 UTC (rev 1222)
+++ trunk/wrapper/src/c/wrapper.c	2006-10-12 03:43:26 UTC (rev 1223)
@@ -85,6 +85,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <limits.h>
+#include <pthread.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <netinet/in.h>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1226
          http://svn.sourceforge.net/wrapper/?rev=1226&view=rev
Author:   mortenson
Date:     2006-10-12 07:03:46 -0700 (Thu, 12 Oct 2006)

Log Message:
-----------
Break out some logging code into a different method to improve the efficiency of queued log messages.  Also removed the need to define a macro that takes a variable argument list.  That didn't work on VC6.
Fix a problem were log output from the wrapperProtocolFunction function was not being queued correctly when called from the signal thread.

Modified Paths:
--------------
    trunk/wrapper/src/c/logger.c
    trunk/wrapper/src/c/logger.h
    trunk/wrapper/src/c/wrapper.c
    trunk/wrapper/src/c/wrapper.h
    trunk/wrapper/src/c/wrapper_win.c
    trunk/wrapper/src/c/wrappereventloop.c

Modified: trunk/wrapper/src/c/logger.c
===================================================================
--- trunk/wrapper/src/c/logger.c	2006-10-12 06:01:50 UTC (rev 1225)
+++ trunk/wrapper/src/c/logger.c	2006-10-12 14:03:46 UTC (rev 1226)
@@ -123,8 +123,8 @@
 int consoleFlush = FALSE;
 
 /* Internal function declaration */
-void sendEventlogMessage( int source_id, int level, char *szBuff );
-void sendLoginfoMessage( int source_id, int level, char *szBuff );
+void sendEventlogMessage( int source_id, int level, const char *szBuff );
+void sendLoginfoMessage( int source_id, int level, const char *szBuff );
 #ifdef WIN32
 void writeToConsole( char *lpszFmt, ... );
 #endif
@@ -655,7 +655,7 @@
 
 /* Writes to and then returns a buffer that is reused by the current thread.
  *  It should not be released. */
-char* buildPrintBuffer( int source_id, int level, int threadId, struct tm *nowTM, int nowMillis, char *format, char *message ) {
+char* buildPrintBuffer( int source_id, int level, int threadId, int queued, struct tm *nowTM, int nowMillis, const char *format, const char *message ) {
     int       i;
     size_t    reqSize;
     int       numColumns;
@@ -682,6 +682,11 @@
             numColumns++;
             break;
 
+        case 'Q':
+            reqSize += 1 + 3;
+            numColumns++;
+            break;
+
         case 'T':
             reqSize += 19 + 3;
             numColumns++;
@@ -771,6 +776,11 @@
             currentColumn++;
             break;
 
+        case 'Q':
+            pos += sprintf( pos, "%c", ( queued ? 'Q' : ' ' ) );
+            currentColumn++;
+            break;
+
         case 'T':
             pos += sprintf( pos, "%04d/%02d/%02d %02d:%02d:%02d",
                 nowTM->tm_year + 1900, nowTM->tm_mon + 1, nowTM->tm_mday, 
@@ -858,10 +868,12 @@
     }
 }
 
-/* General log functions */
-void log_printf_thread( int source_id, int level, int threadId, const char *lpszFmt, ... ) {
-    va_list     vargs;
-    int         count;
+/**
+ * Prints the contents of a buffer to all configured targets.
+ *
+ * Must be called while locked.
+ */
+void log_printf_message( int source_id, int level, int threadId, int queued, const char *message ) {
     char        *printBuffer;
     int         old_umask;
     char        nowDate[9];
@@ -874,67 +886,6 @@
     int         nowMillis;
     struct tm   *nowTM;
 
-    /* We need to be very careful that only one thread is allowed in here
-     *  at a time.  On Windows this is done using a Mutex object that is
-     *  initialized in the initLogging function. */
-    if (lockLoggingMutex()) {
-        return;
-    }
-
-    if ( threadId < 0 )
-    {
-        threadId = getThreadId();
-    }
-
-    /* Loop until the buffer is large enough that we are able to successfully
-     *  print into it. Once the buffer has grown to the largest message size,
-     *  smaller messages will pass through this code without looping. */
-    do {
-        if ( threadMessageBufferSize == 0 )
-        {
-            /* No buffer yet. Allocate one to get started. */
-            threadMessageBufferSize = 100;
-            threadMessageBuffer = (char*)malloc( threadMessageBufferSize * sizeof(char) );
-        }
-
-        /* Try writing to the buffer. */
-        va_start( vargs, lpszFmt );
-#ifdef WIN32
-        count = _vsnprintf( threadMessageBuffer, threadMessageBufferSize, lpszFmt, vargs );
-#else
-        count = vsnprintf( threadMessageBuffer, threadMessageBufferSize, lpszFmt, vargs );
-#endif
-        va_end( vargs );
-        /*
-        printf( " vsnprintf->%d, size=%d\n", count, threadMessageBufferSize );
-        fflush(NULL);
-        */
-        if ( ( count < 0 ) || ( count >= (int)threadMessageBufferSize ) ) {
-            /* If the count is exactly equal to the buffer size then a null char was not written.
-             *  It must be larger.
-             * Windows will return -1 if the buffer is too small. If the number is
-             *  exact however, we still need to expand it to have room for the null.
-             * UNIX will return the required size. */
-
-            /* Free the old buffer for starters. */
-            free( threadMessageBuffer );
-
-            /* Decide on a new buffer size. */
-            if ( count <= (int)threadMessageBufferSize ) {
-                threadMessageBufferSize += 100;
-            } else if ( count + 1 <= (int)threadMessageBufferSize + 100 ) {
-                threadMessageBufferSize += 100;
-            } else {
-                threadMessageBufferSize = count + 1;
-            }
-
-            threadMessageBuffer = (char*)malloc( threadMessageBufferSize * sizeof(char) );
-
-            /* Always set the count to -1 so we will loop again. */
-            count = -1;
-        }
-    } while ( count < 0 );
-
     /* Build a timestamp */
 #ifdef WIN32
     _ftime( &timebNow );
@@ -947,11 +898,15 @@
 #endif
     nowTM = localtime( &now );
 
+    if ( threadId < 0 )
+    {
+        threadId = getThreadId();
+    }
     
     /* Console output by format */
     if( level >= currentConsoleLevel ) {
         /* Build up the printBuffer. */
-        printBuffer = buildPrintBuffer( source_id, level, threadId, nowTM, nowMillis, consoleFormat, threadMessageBuffer );
+        printBuffer = buildPrintBuffer( source_id, level, threadId, queued, nowTM, nowMillis, consoleFormat, message );
 
         /* Write the print buffer to the console. */
 #ifdef WIN32
@@ -1020,7 +975,7 @@
                 strcpy(logFileLastNowDate, nowDate);
                 
                 /* Build up the printBuffer. */
-                printBuffer = buildPrintBuffer( source_id, level, threadId, nowTM, nowMillis, logfileFormat, threadMessageBuffer );
+                printBuffer = buildPrintBuffer( source_id, level, threadId, queued, nowTM, nowMillis, logfileFormat, message );
                 
                 fprintf( logfileFP, "%s\n", printBuffer );
                 
@@ -1054,11 +1009,79 @@
 
     default:
         if( level >= currentLoginfoLevel ) {
-            sendEventlogMessage( source_id, level, threadMessageBuffer );
-            sendLoginfoMessage( source_id, level, threadMessageBuffer );
+            sendEventlogMessage( source_id, level, message );
+            sendLoginfoMessage( source_id, level, message );
         }
     }
+}
 
+
+/* General log functions */
+void log_printf( int source_id, int level, const char *lpszFmt, ... ) {
+    va_list     vargs;
+    int         count;
+    int         threadId;
+
+    /* We need to be very careful that only one thread is allowed in here
+     *  at a time.  On Windows this is done using a Mutex object that is
+     *  initialized in the initLogging function. */
+    if (lockLoggingMutex()) {
+        return;
+    }
+
+    threadId = getThreadId();
+
+    /* Loop until the buffer is large enough that we are able to successfully
+     *  print into it. Once the buffer has grown to the largest message size,
+     *  smaller messages will pass through this code without looping. */
+    do {
+        if ( threadMessageBufferSize == 0 )
+        {
+            /* No buffer yet. Allocate one to get started. */
+            threadMessageBufferSize = 100;
+            threadMessageBuffer = (char*)malloc( threadMessageBufferSize * sizeof(char) );
+        }
+
+        /* Try writing to the buffer. */
+        va_start( vargs, lpszFmt );
+#ifdef WIN32
+        count = _vsnprintf( threadMessageBuffer, threadMessageBufferSize, lpszFmt, vargs );
+#else
+        count = vsnprintf( threadMessageBuffer, threadMessageBufferSize, lpszFmt, vargs );
+#endif
+        va_end( vargs );
+        /*
+        printf( " vsnprintf->%d, size=%d\n", count, threadMessageBufferSize );
+        fflush(NULL);
+        */
+        if ( ( count < 0 ) || ( count >= (int)threadMessageBufferSize ) ) {
+            /* If the count is exactly equal to the buffer size then a null char was not written.
+             *  It must be larger.
+             * Windows will return -1 if the buffer is too small. If the number is
+             *  exact however, we still need to expand it to have room for the null.
+             * UNIX will return the required size. */
+
+            /* Free the old buffer for starters. */
+            free( threadMessageBuffer );
+
+            /* Decide on a new buffer size. */
+            if ( count <= (int)threadMessageBufferSize ) {
+                threadMessageBufferSize += 100;
+            } else if ( count + 1 <= (int)threadMessageBufferSize + 100 ) {
+                threadMessageBufferSize += 100;
+            } else {
+                threadMessageBufferSize = count + 1;
+            }
+
+            threadMessageBuffer = (char*)malloc( threadMessageBufferSize * sizeof(char) );
+
+            /* Always set the count to -1 so we will loop again. */
+            count = -1;
+        }
+    } while ( count < 0 );
+
+    log_printf_message( source_id, level, threadId, FALSE, threadMessageBuffer );
+
     /* Release the lock we have on this function so that other threads can get in. */
     if (releaseLoggingMutex()) {
         return;
@@ -1183,10 +1206,10 @@
 #endif
 }
 
-void sendEventlogMessage( int source_id, int level, char *szBuff ) {
+void sendEventlogMessage( int source_id, int level, const char *szBuff ) {
 #ifdef WIN32
     char   header[16];
-    char   **strings = (char **) malloc( 3 * sizeof( char * ) );
+    const char   **strings = (char **) malloc( 3 * sizeof( char * ) );
     WORD   eventType;
     HANDLE handle;
     WORD   eventID, categoryID;
@@ -1314,7 +1337,7 @@
 #endif
 }
 
-void sendLoginfoMessage( int source_id, int level, char *szBuff ) {
+void sendLoginfoMessage( int source_id, int level, const char *szBuff ) {
 #ifndef WIN32 /* If UNIX */
     int eventType;
 
@@ -1918,37 +1941,48 @@
 
     /* NOTE - The queue variables are not synchronized so we need to access them
      *        carefully and assume that data could possibly be corrupted. */
+    localWriteIndex = queueWriteIndex; /* Snapshot the value to maintain a constant reference. */
+    if ( queueReadIndex != localWriteIndex ) {
+        /* Lock the logging mutex. */
+        if (lockLoggingMutex()) {
+            return;
+        }
 
+        /* Empty the queue of any logged messages. */
+        localWriteIndex = queueWriteIndex; /* Snapshot the value to maintain a constant reference. */
+        while ( queueReadIndex != localWriteIndex ) {
+            /* Snapshot the values in the queue at that index. */
+            source_id = queueSourceIds[queueReadIndex];
+            level = queueLevels[queueReadIndex];
+            threadId = queueThreadIds[queueReadIndex];
+            buffer = queueMessages[queueReadIndex];
 
-    /* Empty the queue of any logged messages. */
-    localWriteIndex = queueWriteIndex; /* Snapshot the value to maintain a constant reference. */
-    while ( queueReadIndex != localWriteIndex ) {
-        /* Snapshot the values in the queue at that index. */
-        source_id = queueSourceIds[queueReadIndex];
-        level = queueLevels[queueReadIndex];
-        threadId = queueThreadIds[queueReadIndex];
-        buffer = queueMessages[queueReadIndex];
+            /* Now we have safe values.  Everything below this is thread safe. */
 
-        /* Now we have safe values.  Everything below this is thread safe. */
+            if (buffer) {
+                /* non null, assume it is valid. */
 
-        if (buffer) {
-            /* non null, assume it is valid. */
-
 #ifdef _DEBUG
-            printf( "LOG QUEUED[%d]: %s\n", queueReadIndex, buffer );
-            fflush( NULL );
+                printf( "LOG QUEUED[%d]: %s\n", queueReadIndex, buffer );
+                fflush( NULL );
 #endif
 
-            log_printf_thread( source_id, level, threadId, "%s", buffer );
-        } else {
+                log_printf_message( source_id, level, threadId, TRUE, buffer );
+            } else {
 #ifdef _DEBUG
-            printf( "LOG QUEUED[%d]: <NULL> SYNCHRONIZATION CONFLICT!\n", queueReadIndex );
-            fflush( NULL );
+                printf( "LOG QUEUED[%d]: <NULL> SYNCHRONIZATION CONFLICT!\n", queueReadIndex );
+                fflush( NULL );
 #endif
+            }
+            queueReadIndex++;
+            if ( queueReadIndex >= QUEUE_SIZE ) {
+                queueReadIndex = 0;
+            }
         }
-        queueReadIndex++;
-        if ( queueReadIndex >= QUEUE_SIZE ) {
-            queueReadIndex = 0;
+
+        /* Release the lock we have on the logging mutes so that other threads can get in. */
+        if (releaseLoggingMutex()) {
+            return;
         }
     }
 }

Modified: trunk/wrapper/src/c/logger.h
===================================================================
--- trunk/wrapper/src/c/logger.h	2006-10-12 06:01:50 UTC (rev 1225)
+++ trunk/wrapper/src/c/logger.h	2006-10-12 14:03:46 UTC (rev 1226)
@@ -181,8 +181,7 @@
  * This method can be used safely in most cases.  See the log_printf_queue
  *  funtion for the exceptions.
  */
-extern void log_printf_thread( int source_id, int level, int threadId, const char *lpszFmt, ... );
-#define log_printf( source_id, level, lpszFmt, ... ) log_printf_thread( source_id, level, WRAPPER_THREAD_CURRENT, lpszFmt, ##__VA_ARGS__ )
+extern void log_printf( int source_id, int level, const char *lpszFmt, ... );
 
 /**
  * The log_printf_queue function is less efficient than the log_printf

Modified: trunk/wrapper/src/c/wrapper.c
===================================================================
--- trunk/wrapper/src/c/wrapper.c	2006-10-12 06:01:50 UTC (rev 1225)
+++ trunk/wrapper/src/c/wrapper.c	2006-10-12 14:03:46 UTC (rev 1226)
@@ -653,7 +653,7 @@
 
 size_t protocolSendBufferSize = 0;
 char *protocolSendBuffer = NULL;
-int wrapperProtocolFunction(char function, const char *message) {
+int wrapperProtocolFunction(int useLoggerQueue, char function, const char *message) {
     int rc;
     size_t len;
     const char *logMsg;
@@ -687,13 +687,15 @@
     if (sd == INVALID_SOCKET) {
         /* A socket was not opened */
         if (wrapperData->isDebugging) {
-            log_printf(WRAPPER_SOURCE_PROTOCOL, LEVEL_DEBUG, "socket not open, so packet not sent %s : %s",
+            log_printf_queue(useLoggerQueue, WRAPPER_SOURCE_PROTOCOL, LEVEL_DEBUG,
+                "socket not open, so packet not sent %s : %s",
                 wrapperProtocolGetCodeName(function), (message == NULL ? "NULL" : logMsg));
         }
         returnVal = -1;
     } else {
         if (wrapperData->isDebugging) {
-            log_printf(WRAPPER_SOURCE_PROTOCOL, LEVEL_DEBUG, "send a packet %s : %s",
+            log_printf_queue(useLoggerQueue, WRAPPER_SOURCE_PROTOCOL, LEVEL_DEBUG,
+                "send a packet %s : %s",
                 wrapperProtocolGetCodeName(function), (message == NULL ? "NULL" : logMsg));
         }
     
@@ -709,7 +711,8 @@
         rc = send(sd, protocolSendBuffer, (int)len, 0);
         if (rc == SOCKET_ERROR) {
             if (wrapperData->isDebugging) {
-                log_printf(WRAPPER_SOURCE_PROTOCOL, LEVEL_DEBUG, "socket send failed. (%d)", wrapperGetLastError());
+                log_printf_queue(useLoggerQueue, WRAPPER_SOURCE_PROTOCOL, LEVEL_DEBUG,
+                    "socket send failed. (%d)", wrapperGetLastError());
             }
             wrapperProtocolClose();
             returnVal = -1;
@@ -1156,7 +1159,7 @@
     char *buffer;
     
     buffer = linearizeProperties(properties, '\t');
-    wrapperProtocolFunction(WRAPPER_MSG_PROPERTIES, buffer);
+    wrapperProtocolFunction(FALSE, WRAPPER_MSG_PROPERTIES, buffer);
     
     free(buffer);
 }
@@ -3103,7 +3106,7 @@
 
             /* Send the low log level to the JVM so that it can control output via the log method. */
             sprintf(buffer, "%d", getLowLogLevel());
-            wrapperProtocolFunction(WRAPPER_MSG_LOW_LOG_LEVEL, buffer);
+            wrapperProtocolFunction(FALSE, WRAPPER_MSG_LOW_LOG_LEVEL, buffer);
 
             /* Send the ping timeout to the JVM. */
             if (wrapperData->pingTimeout >= WRAPPER_TIMEOUT_MAX) {
@@ -3112,7 +3115,7 @@
             } else {
                 sprintf(buffer, "%d", wrapperData->pingTimeout);
             }
-            wrapperProtocolFunction(WRAPPER_MSG_PING_TIMEOUT, buffer);
+            wrapperProtocolFunction(FALSE, WRAPPER_MSG_PING_TIMEOUT, buffer);
             
             /* Send the properties. */
             sendProperties();
@@ -3120,7 +3123,7 @@
             log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_ERROR, "Received a connection request with an incorrect key.  Waiting for another connection.");
 
             /* This was the wrong key.  Send a response. */
-            wrapperProtocolFunction(WRAPPER_MSG_BADKEY, "Incorrect key.  Connection rejected.");
+            wrapperProtocolFunction(FALSE, WRAPPER_MSG_BADKEY, "Incorrect key.  Connection rejected.");
 
             /* Close the current connection.  Assume that the real JVM
              *  is still out there trying to connect.  So don't change
@@ -3136,7 +3139,7 @@
          *  being launched but the Wrapper is trying to stop.  Now that the
          *  connection to the JVM has been opened, tell it to stop cleanly. */
         
-        wrapperProtocolFunction(WRAPPER_MSG_STOP, NULL);
+        wrapperProtocolFunction(FALSE, WRAPPER_MSG_STOP, NULL);
         
         /* Allow up to 5 + <shutdownTimeout> seconds for the application to stop itself. */
         /* Already in this state. */
@@ -3293,7 +3296,7 @@
     } else if (wrapperData->jState == WRAPPER_JSTATE_STOPPING) {
         /* This will happen if the Wrapper was asked to stop as the JVM is being launched. */
         
-        wrapperProtocolFunction(WRAPPER_MSG_STOP, NULL);
+        wrapperProtocolFunction(FALSE, WRAPPER_MSG_STOP, NULL);
         
         /* Allow up to 5 + <shutdownTimeout> seconds for the application to stop itself. */
         /* Already in this state. */

Modified: trunk/wrapper/src/c/wrapper.h
===================================================================
--- trunk/wrapper/src/c/wrapper.h	2006-10-12 06:01:50 UTC (rev 1225)
+++ trunk/wrapper/src/c/wrapper.h	2006-10-12 14:03:46 UTC (rev 1226)
@@ -299,7 +299,7 @@
 
 /* Protocol Functions */
 extern void wrapperProtocolClose();
-extern int wrapperProtocolFunction(char function, const char *message);
+extern int wrapperProtocolFunction(int useLoggerQueue, char function, const char *message);
 extern int wrapperProtocolRead();
 
 /******************************************************************************

Modified: trunk/wrapper/src/c/wrapper_win.c
===================================================================
--- trunk/wrapper/src/c/wrapper_win.c	2006-10-12 06:01:50 UTC (rev 1225)
+++ trunk/wrapper/src/c/wrapper_win.c	2006-10-12 14:03:46 UTC (rev 1226)
@@ -752,7 +752,7 @@
 
             /* Store this tick offset for the next time through the loop. */
             lastTickOffset = tickOffset;
-            //wrapperProtocolFunction(WRAPPER_MSG_SERVICE_CONTROL_CODE, "255");
+            //wrapperProtocolFunction(FALSE, WRAPPER_MSG_SERVICE_CONTROL_CODE, "255");
         }
     } __except (exceptionFilterFunction(GetExceptionInformation())) {
         log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_FATAL, "Fatal error in the Timer thread.");
@@ -1805,7 +1805,7 @@
         
         /* Forward the control code off to the JVM. */
         sprintf(buffer, "%d", dwCtrlCode);
-        wrapperProtocolFunction(WRAPPER_MSG_SERVICE_CONTROL_CODE, buffer);
+        wrapperProtocolFunction(TRUE, WRAPPER_MSG_SERVICE_CONTROL_CODE, buffer);
     
         switch(dwCtrlCode) {
         case SERVICE_CONTROL_PAUSE:

Modified: trunk/wrapper/src/c/wrappereventloop.c
===================================================================
--- trunk/wrapper/src/c/wrappereventloop.c	2006-10-12 06:01:50 UTC (rev 1225)
+++ trunk/wrapper/src/c/wrappereventloop.c	2006-10-12 14:03:46 UTC (rev 1226)
@@ -561,7 +561,7 @@
                                             wrapperData->isDebugging = (newLowLogLevel <= LEVEL_DEBUG);
                                             
                                             sprintf(buffer, "%d", getLowLogLevel());
-                                            wrapperProtocolFunction(WRAPPER_MSG_LOW_LOG_LEVEL, buffer);
+                                            wrapperProtocolFunction(FALSE, WRAPPER_MSG_LOW_LOG_LEVEL, buffer);
                                         }
                                     }
                                 }
@@ -1118,7 +1118,7 @@
     if (wrapperData->isDebugging) {
         log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_DEBUG, "Start Application.");
     }
-    ret = wrapperProtocolFunction(WRAPPER_MSG_START, "start");
+    ret = wrapperProtocolFunction(FALSE, WRAPPER_MSG_START, "start");
     if (ret < 0) {
         log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_ERROR, "Unable to send the start command to the JVM.");
 
@@ -1220,7 +1220,7 @@
             if (wrapperData->isLoopOutputEnabled) {
                 log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_STATUS, "    Temp: Sending a ping packet.");
             }
-            ret = wrapperProtocolFunction(WRAPPER_MSG_PING, "ping");
+            ret = wrapperProtocolFunction(FALSE, WRAPPER_MSG_PING, "ping");
             if (ret < 0) {
                 /* Failed to send the ping. */
                 if (wrapperData->isDebugging) {
@@ -1574,7 +1574,7 @@
                             "Sending stop signal to JVM");
                     }
                 
-                    wrapperProtocolFunction(WRAPPER_MSG_STOP, NULL);
+                    wrapperProtocolFunction(FALSE, WRAPPER_MSG_STOP, NULL);
                 
                     /* Allow up to 5 + <shutdownTimeout> seconds for the application to stop itself. */
                     if (wrapperData->shutdownTimeout > 0) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1227
          http://svn.sourceforge.net/wrapper/?rev=1227&view=rev
Author:   mortenson
Date:     2006-10-13 07:12:21 -0700 (Fri, 13 Oct 2006)

Log Message:
-----------
Add the unix source files to the windows projects.  They are not built, but it makes them easier to work with.

Modified Paths:
--------------
    trunk/wrapper/src/c/wrapper32_VC8.vcproj
    trunk/wrapper/src/c/wrapperJNI32_VC8.vcproj

Modified: trunk/wrapper/src/c/wrapper32_VC8.vcproj
===================================================================
--- trunk/wrapper/src/c/wrapper32_VC8.vcproj	2006-10-12 14:03:46 UTC (rev 1226)
+++ trunk/wrapper/src/c/wrapper32_VC8.vcproj	2006-10-13 14:12:21 UTC (rev 1227)
@@ -198,6 +198,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\wrapper_unix.c"
+				>
+			</File>
+			<File
 				RelativePath=".\wrapper_win.c"
 				>
 			</File>

Modified: trunk/wrapper/src/c/wrapperJNI32_VC8.vcproj
===================================================================
--- trunk/wrapper/src/c/wrapperJNI32_VC8.vcproj	2006-10-12 14:03:46 UTC (rev 1226)
+++ trunk/wrapper/src/c/wrapperJNI32_VC8.vcproj	2006-10-13 14:12:21 UTC (rev 1227)
@@ -193,6 +193,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\wrapperjni_unix.c"
+				>
+			</File>
+			<File
 				RelativePath=".\wrapperjni_win.c"
 				>
 			</File>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1230
          http://svn.sourceforge.net/wrapper/?rev=1230&view=rev
Author:   mortenson
Date:     2006-10-13 09:29:10 -0700 (Fri, 13 Oct 2006)

Log Message:
-----------
Fix several C++ comments.

Modified Paths:
--------------
    trunk/wrapper/src/c/logger.c
    trunk/wrapper/src/c/property.c
    trunk/wrapper/src/c/wrapper.c
    trunk/wrapper/src/c/wrapper_win.c
    trunk/wrapper/src/c/wrappereventloop.c
    trunk/wrapper/src/c/wrapperjni_win.c

Modified: trunk/wrapper/src/c/logger.c
===================================================================
--- trunk/wrapper/src/c/logger.c	2006-10-13 16:16:12 UTC (rev 1229)
+++ trunk/wrapper/src/c/logger.c	2006-10-13 16:29:10 UTC (rev 1230)
@@ -63,11 +63,11 @@
 #include <sys/timeb.h>
 #include "messages.h"
 
-// MS Visual Studio 8 went and deprecated the POXIX names for functions.
-//  Fixing them all would be a big headache for UNIX versions.
+/* MS Visual Studio 8 went and deprecated the POXIX names for functions.
+ *  Fixing them all would be a big headache for UNIX versions. */
 #pragma warning(disable : 4996)
 
-// Defines for MS Visual Studio 6
+/* Defines for MS Visual Studio 6 */
 #ifndef _INTPTR_T_DEFINED
 typedef long intptr_t;
 #define _INTPTR_T_DEFINED

Modified: trunk/wrapper/src/c/property.c
===================================================================
--- trunk/wrapper/src/c/property.c	2006-10-13 16:16:12 UTC (rev 1229)
+++ trunk/wrapper/src/c/property.c	2006-10-13 16:29:10 UTC (rev 1230)
@@ -53,8 +53,8 @@
 
 #ifdef WIN32
 
-// MS Visual Studio 8 went and deprecated the POXIX names for functions.
-//  Fixing them all would be a big headache for UNIX versions.
+/* MS Visual Studio 8 went and deprecated the POXIX names for functions.
+ *  Fixing them all would be a big headache for UNIX versions. */
 #pragma warning(disable : 4996)
 
 #else

Modified: trunk/wrapper/src/c/wrapper.c
===================================================================
--- trunk/wrapper/src/c/wrapper.c	2006-10-13 16:16:12 UTC (rev 1229)
+++ trunk/wrapper/src/c/wrapper.c	2006-10-13 16:29:10 UTC (rev 1230)
@@ -63,11 +63,11 @@
 #include <winsock.h>
 #include <shlwapi.h>
 
-// MS Visual Studio 8 went and deprecated the POXIX names for functions.
-//  Fixing them all would be a big headache for UNIX versions.
+/* MS Visual Studio 8 went and deprecated the POXIX names for functions.
+ *  Fixing them all would be a big headache for UNIX versions. */
 #pragma warning(disable : 4996)
 
-// Defines for MS Visual Studio 6
+/* Defines for MS Visual Studio 6 */
 #ifndef _INTPTR_T_DEFINED
 typedef long intptr_t;
 #define _INTPTR_T_DEFINED

Modified: trunk/wrapper/src/c/wrapper_win.c
===================================================================
--- trunk/wrapper/src/c/wrapper_win.c	2006-10-13 16:16:12 UTC (rev 1229)
+++ trunk/wrapper/src/c/wrapper_win.c	2006-10-13 16:29:10 UTC (rev 1230)
@@ -752,7 +752,6 @@
 
             /* Store this tick offset for the next time through the loop. */
             lastTickOffset = tickOffset;
-            //wrapperProtocolFunction(FALSE, WRAPPER_MSG_SERVICE_CONTROL_CODE, "255");
         }
     } __except (exceptionFilterFunction(GetExceptionInformation())) {
         log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_FATAL, "Fatal error in the Timer thread.");
@@ -1738,7 +1737,7 @@
         }
         
         
-        // Convert the times to ms.
+        /* Convert the times to ms. */
         wKernelTimeMs = filetimeToMS(&wKernelTime);
         wUserTimeMs = filetimeToMS(&wUserTime);
         wTimeMs = wKernelTimeMs + wUserTimeMs;
@@ -2017,7 +2016,7 @@
             }
             break;
         }
-        //printf( "(%02x)", c );
+        /*printf( "(%02x)", c );*/
     } while ((c != 0x0d) && (c != 0x0a));
     printf("\n");
     
@@ -2122,7 +2121,7 @@
                                  );
     
     if (schSCManager) {
-        // Make sure that an empty length password is null.
+        /* Make sure that an empty length password is null. */
         ntServicePassword = wrapperData->ntServicePassword;
         if ((ntServicePassword != NULL) && (strlen(ntServicePassword) <= 0)) {
             ntServicePassword = NULL;

Modified: trunk/wrapper/src/c/wrappereventloop.c
===================================================================
--- trunk/wrapper/src/c/wrappereventloop.c	2006-10-13 16:16:12 UTC (rev 1229)
+++ trunk/wrapper/src/c/wrappereventloop.c	2006-10-13 16:29:10 UTC (rev 1230)
@@ -58,8 +58,8 @@
 #ifdef WIN32
 #include <io.h>
 
-// MS Visual Studio 8 went and deprecated the POXIX names for functions.
-//  Fixing them all would be a big headache for UNIX versions.
+/* MS Visual Studio 8 went and deprecated the POXIX names for functions.
+ *  Fixing them all would be a big headache for UNIX versions. */
 #pragma warning(disable : 4996)
 
 #else /* UNIX */

Modified: trunk/wrapper/src/c/wrapperjni_win.c
===================================================================
--- trunk/wrapper/src/c/wrapperjni_win.c	2006-10-13 16:16:12 UTC (rev 1229)
+++ trunk/wrapper/src/c/wrapperjni_win.c	2006-10-13 16:29:10 UTC (rev 1230)
@@ -55,8 +55,8 @@
 #include <tlhelp32.h>
 #include "wrapperjni.h"
 
-// MS Visual Studio 8 went and deprecated the POXIX names for functions.
-//  Fixing them all would be a big headache for UNIX versions.
+/* MS Visual Studio 8 went and deprecated the POXIX names for functions.
+ *  Fixing them all would be a big headache for UNIX versions. */
 #pragma warning(disable : 4996)
 
 static DWORD wrapperProcessId = 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1250
          http://svn.sourceforge.net/wrapper/?rev=1250&view=rev
Author:   mortenson
Date:     2006-11-10 15:10:31 -0800 (Fri, 10 Nov 2006)

Log Message:
-----------
Add the -lm to the command line when building linux 32 and 64 bit versions of the wrapper on linux.  This is to support building on recent Debian and Ubuntu versions.  Thanks to Robey Pointer for the patch.

Modified Paths:
--------------
    trunk/wrapper/src/c/Makefile-linux-x86-32
    trunk/wrapper/src/c/Makefile-linux-x86-64

Modified: trunk/wrapper/src/c/Makefile-linux-x86-32
===================================================================
--- trunk/wrapper/src/c/Makefile-linux-x86-32	2006-11-10 23:05:20 UTC (rev 1249)
+++ trunk/wrapper/src/c/Makefile-linux-x86-32	2006-11-10 23:10:31 UTC (rev 1250)
@@ -1,4 +1,4 @@
-COMPILE = gcc -O3 -Wall --pedantic
+COMPILE = gcc -O3 -Wall --pedantic -lm
 
 INCLUDE=$(JAVA_HOME)/include
 

Modified: trunk/wrapper/src/c/Makefile-linux-x86-64
===================================================================
--- trunk/wrapper/src/c/Makefile-linux-x86-64	2006-11-10 23:05:20 UTC (rev 1249)
+++ trunk/wrapper/src/c/Makefile-linux-x86-64	2006-11-10 23:10:31 UTC (rev 1250)
@@ -1,6 +1,6 @@
 # This makefile is inprogess.  It builds, but the resulting libwrapper.so does not yet work.
 # If you know how to fix it then please help out.
-COMPILE = gcc -O3 -fPIC -Wall --pedantic
+COMPILE = gcc -O3 -fPIC -Wall --pedantic -lm
 
 INCLUDE=$(JAVA_HOME)/include
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1256
          http://svn.sourceforge.net/wrapper/?rev=1256&view=rev
Author:   mortenson
Date:     2006-12-14 22:34:11 -0800 (Thu, 14 Dec 2006)

Log Message:
-----------
Rename and move the wrapperGetJavaHomeFromWindowsRegistry function name so it conforms to naming standards.

Modified Paths:
--------------
    trunk/wrapper/src/c/wrapper.c
    trunk/wrapper/src/c/wrapper.h
    trunk/wrapper/src/c/wrapper_win.c

Modified: trunk/wrapper/src/c/wrapper.c
===================================================================
--- trunk/wrapper/src/c/wrapper.c	2006-12-15 02:57:19 UTC (rev 1255)
+++ trunk/wrapper/src/c/wrapper.c	2006-12-15 06:34:11 UTC (rev 1256)
@@ -1491,7 +1491,7 @@
         if (strcmp(prop, "") == 0) {
             /* If the java command is an empty string, we want to look for the
              *  the java command in the windows registry. */
-            if (getJavaHomeFromWindowsRegistry(cpPath)) {
+            if (wrapperGetJavaHomeFromWindowsRegistry(cpPath)) {
                 strcat(cpPath, "\\bin\\java.exe");
                 if (wrapperData->isDebugging) {
                     log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_DEBUG,

Modified: trunk/wrapper/src/c/wrapper.h
===================================================================
--- trunk/wrapper/src/c/wrapper.h	2006-12-15 02:57:19 UTC (rev 1255)
+++ trunk/wrapper/src/c/wrapper.h	2006-12-15 06:34:11 UTC (rev 1256)
@@ -319,7 +319,7 @@
 
 #ifdef WIN32
 extern char** wrapperGetSystemPath();
-extern int getJavaHomeFromWindowsRegistry(char *javaHome);
+extern int wrapperGetJavaHomeFromWindowsRegistry(char *javaHome);
 #endif
 
 extern int wrapperCheckRestartTimeOK();

Modified: trunk/wrapper/src/c/wrapper_win.c
===================================================================
--- trunk/wrapper/src/c/wrapper_win.c	2006-12-15 02:57:19 UTC (rev 1255)
+++ trunk/wrapper/src/c/wrapper_win.c	2006-12-15 06:34:11 UTC (rev 1256)
@@ -2404,6 +2404,73 @@
     return 0;
 }
 
+/**
+ * Gets the JavaHome absolute path from the windows registry
+ */
+int wrapperGetJavaHomeFromWindowsRegistry(char *javaHome) {
+    char jresubkey[255];    /* Registry subkey that jvm creates when is installed */
+    char jreversion[10];    /* Will receive a registry value that has jvm version */
+    char jhome[2048];       /* Will hold that full path for JavaHome */
+    HKEY jreopenkey = NULL; /* Will receive the handle to the opened registry key */
+    DWORD n = 5;            /* Buffer size to retrieve the jvm version */
+    LPDWORD tipoval = NULL; /* Will receive the type of value that was read from the registry */
+
+    /*
+     * Initialize the string variables used to retrieve values from Windows Registry
+     */
+    memset(&jresubkey, 0, sizeof(jresubkey));
+    memset(&jreversion, 0, sizeof(jreversion));
+    memset(&jhome, 0, sizeof(jhome));
+
+    /* SubKey containing the jvm version */
+    strcpy(jresubkey, "SOFTWARE\\JavaSoft\\Java Runtime Environment");
+
+    /*
+     * Opens the Registry Key needed to query the jvm version
+     */
+    if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, jresubkey, 0, KEY_QUERY_VALUE, &jreopenkey) != ERROR_SUCCESS) {
+        return 0;
+    }
+
+    /*
+     * Queries for the jvm version
+     */
+
+    if (RegQueryValueEx(jreopenkey, "CurrentVersion", NULL, tipoval, jreversion, &n) != ERROR_SUCCESS) {
+        return 0;
+    }
+
+    RegCloseKey(jreopenkey);
+
+
+    /* adds the jvm version to the subkey */
+    strcat(jresubkey, "\\");
+    strcat(jresubkey, jreversion);
+    n = 2048;
+    tipoval = NULL;
+
+    /*
+     * Opens the Registry Key needed to query the JavaHome
+     */
+    if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, jresubkey, 0, KEY_QUERY_VALUE, &jreopenkey) != ERROR_SUCCESS) {
+        return 0;
+    }
+
+    /*
+     * Queries for the JavaHome
+     */
+    if (RegQueryValueEx(jreopenkey, "JavaHome", NULL, tipoval, jhome, &n) != ERROR_SUCCESS) {
+        return 0;
+    }
+
+    RegCloseKey(jreopenkey);
+
+    /* Returns the JavaHome path */
+    strcpy(javaHome, jhome);
+
+    return 1;
+}
+
 char *getNTServiceStatusName(int status)
 {
     char *name;
@@ -3500,72 +3567,5 @@
     }
 }
 
-/**
- * Gets the JavaHome absolute path from the windows registry
- */
-int getJavaHomeFromWindowsRegistry(char *javaHome) {
-    char jresubkey[255];    /* Registry subkey that jvm creates when is installed */
-    char jreversion[10];    /* Will receive a registry value that has jvm version */
-    char jhome[2048];       /* Will hold that full path for JavaHome */
-    HKEY jreopenkey = NULL; /* Will receive the handle to the opened registry key */
-    DWORD n = 5;            /* Buffer size to retrieve the jvm version */
-    LPDWORD tipoval = NULL; /* Will receive the type of value that was read from the registry */
-
-    /*
-     * Initialize the string variables used to retrieve values from Windows Registry
-     */
-    memset(&jresubkey, 0, sizeof(jresubkey));
-    memset(&jreversion, 0, sizeof(jreversion));
-    memset(&jhome, 0, sizeof(jhome));
-
-    /* SubKey containing the jvm version */
-    strcpy(jresubkey, "SOFTWARE\\JavaSoft\\Java Runtime Environment");
-
-    /*
-     * Opens the Registry Key needed to query the jvm version
-     */
-    if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, jresubkey, 0, KEY_QUERY_VALUE, &jreopenkey) != ERROR_SUCCESS) {
-        return 0;
-    }
-
-    /*
-     * Queries for the jvm version
-     */
-
-    if (RegQueryValueEx(jreopenkey, "CurrentVersion", NULL, tipoval, jreversion, &n) != ERROR_SUCCESS) {
-        return 0;
-    }
-
-    RegCloseKey(jreopenkey);
-
-
-    /* adds the jvm version to the subkey */
-    strcat(jresubkey, "\\");
-    strcat(jresubkey, jreversion);
-    n = 2048;
-    tipoval = NULL;
-
-    /*
-     * Opens the Registry Key needed to query the JavaHome
-     */
-    if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, jresubkey, 0, KEY_QUERY_VALUE, &jreopenkey) != ERROR_SUCCESS) {
-        return 0;
-    }
-
-    /*
-     * Queries for the JavaHome
-     */
-    if (RegQueryValueEx(jreopenkey, "JavaHome", NULL, tipoval, jhome, &n) != ERROR_SUCCESS) {
-        return 0;
-    }
-
-    RegCloseKey(jreopenkey);
-
-    /* Returns the JavaHome path */
-    strcpy(javaHome, jhome);
-
-    return 1;
-}
-
 #endif /* ifdef WIN32 */
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1263
          http://svn.sourceforge.net/wrapper/?rev=1263&view=rev
Author:   mortenson
Date:     2007-01-05 22:25:23 -0800 (Fri, 05 Jan 2007)

Log Message:
-----------
Fix comments.

Modified Paths:
--------------
    trunk/wrapper/src/c/wrapper.c
    trunk/wrapper/src/c/wrappereventloop.c

Modified: trunk/wrapper/src/c/wrapper.c
===================================================================
--- trunk/wrapper/src/c/wrapper.c	2007-01-06 06:02:03 UTC (rev 1262)
+++ trunk/wrapper/src/c/wrapper.c	2007-01-06 06:25:23 UTC (rev 1263)
@@ -757,8 +757,10 @@
     } else {
         if (wrapperData->isDebugging) {
             if ( ( function == WRAPPER_MSG_PING ) && ( strcmp( message, "silent" ) == 0 ) ) {
-                //log_printf_queue(useLoggerQueue, WRAPPER_SOURCE_PROTOCOL, LEVEL_DEBUG,
-                //    "send a silent ping packet");
+                /*
+                log_printf_queue(useLoggerQueue, WRAPPER_SOURCE_PROTOCOL, LEVEL_DEBUG,
+                    "send a silent ping packet");
+                */
             } else {
                 log_printf_queue(useLoggerQueue, WRAPPER_SOURCE_PROTOCOL, LEVEL_DEBUG,
                     "send a packet %s : %s",
@@ -894,7 +896,9 @@
 
         if (wrapperData->isDebugging) {
             if ( ( code == WRAPPER_MSG_PING ) && ( strcmp( packetBuffer, "silent" ) == 0 ) ) {
-                //log_printf(WRAPPER_SOURCE_PROTOCOL, LEVEL_DEBUG, "read a silent ping packet");
+                /*
+                log_printf(WRAPPER_SOURCE_PROTOCOL, LEVEL_DEBUG, "read a silent ping packet");
+                */
             } else {
                 log_printf(WRAPPER_SOURCE_PROTOCOL, LEVEL_DEBUG, "read a packet %s : %s",
                     wrapperProtocolGetCodeName(code), packetBuffer);

Modified: trunk/wrapper/src/c/wrappereventloop.c
===================================================================
--- trunk/wrapper/src/c/wrappereventloop.c	2007-01-06 06:02:03 UTC (rev 1262)
+++ trunk/wrapper/src/c/wrappereventloop.c	2007-01-06 06:25:23 UTC (rev 1263)
@@ -643,7 +643,7 @@
     if (wrapperData->startupTimeout > 0 ) {
         timeout = (wrapperData->startupTimeout) * 1000;
     } else {
-        timeout = 86400000; // Set infinity at 1 day.
+        timeout = 86400000; /* Set infinity at 1 day. */
     }
     wrapperReportStatus(FALSE, WRAPPER_WSTATE_STARTING, 0, timeout);
     
@@ -696,7 +696,7 @@
         } else {
             /* Tell the service manager that we are pausing */
             if ( (wrapperData->shutdownTimeout <= 0) || (wrapperData->jvmExitTimeout <= 0)) {
-                timeout = 86400000; // Set infinity at 1 day.
+                timeout = 86400000; /* Set infinity at 1 day. */
             } else {
                 timeout = MAX(wrapperData->shutdownTimeout, wrapperData->jvmExitTimeout) * 1000;
             }
@@ -764,7 +764,7 @@
         if (wrapperData->startupTimeout > 0 ) {
             timeout = wrapperData->startupTimeout * 1000;
         } else {
-            timeout = 86400000; // Set infinity at 1 day.
+            timeout = 86400000; /* Set infinity at 1 day. */
         }
         wrapperReportStatus(FALSE, WRAPPER_WSTATE_CONTINUING, 0, timeout);
     }
@@ -787,7 +787,7 @@
     
     /* Tell the service manager that we are stopping */
     if ( (wrapperData->shutdownTimeout <= 0) || (wrapperData->jvmExitTimeout <= 0)) {
-        timeout = 86400000; // Set infinity at 1 day.
+        timeout = 86400000; /* Set infinity at 1 day. */
     } else {
         timeout = MAX(wrapperData->shutdownTimeout, wrapperData->jvmExitTimeout) * 1000;
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1264
          http://svn.sourceforge.net/wrapper/?rev=1264&view=rev
Author:   mortenson
Date:     2007-01-05 22:55:04 -0800 (Fri, 05 Jan 2007)

Log Message:
-----------
Correct UNIX compiler errors

Modified Paths:
--------------
    trunk/wrapper/src/c/wrapper_unix.c
    trunk/wrapper/src/c/wrapperjni.c
    trunk/wrapper/src/c/wrapperjni_unix.c

Modified: trunk/wrapper/src/c/wrapper_unix.c
===================================================================
--- trunk/wrapper/src/c/wrapper_unix.c	2007-01-06 06:25:23 UTC (rev 1263)
+++ trunk/wrapper/src/c/wrapper_unix.c	2007-01-06 06:55:04 UTC (rev 1264)
@@ -680,7 +680,7 @@
  *
  * @return TRUE if there were any problems.
  */
-void wrapperBuildJavaCommand() {
+int wrapperBuildJavaCommand() {
     char **strings;
     int length, i;
 

Modified: trunk/wrapper/src/c/wrapperjni.c
===================================================================
--- trunk/wrapper/src/c/wrapperjni.c	2007-01-06 06:25:23 UTC (rev 1263)
+++ trunk/wrapper/src/c/wrapperjni.c	2007-01-06 06:55:04 UTC (rev 1264)
@@ -59,10 +59,6 @@
 int controlEventQueueLastReadIndex = 0;
 int controlEventQueueLastWriteIndex = 0;
 
-
-//volatile int lastControlEvent = 0;
-//volatile int checkingControlEvent = 0;
-
 /**
  * Create an error message from GetLastError() using the
  *  FormatMessage API Call...

Modified: trunk/wrapper/src/c/wrapperjni_unix.c
===================================================================
--- trunk/wrapper/src/c/wrapperjni_unix.c	2007-01-06 06:25:23 UTC (rev 1263)
+++ trunk/wrapper/src/c/wrapperjni_unix.c	2007-01-06 06:55:04 UTC (rev 1264)
@@ -65,7 +65,7 @@
     
     /* Only wait for up to 30 seconds to make sure we don't get into a deadlock situation.
      *  This could happen if a signal is encountered while locked. */
-    while (pthread_mutex_trylock(&controlEventQueueMutex) = EBUSY) {
+    while (pthread_mutex_trylock(&controlEventQueueMutex) == EBUSY) {
         if (count >= 3000) {
             printf("WrapperJNI Error: Timed out waiting for control event queue lock.\n");
             fflush(NULL);
@@ -81,7 +81,7 @@
     if ( count > 0 ) {
         if (wrapperJNIDebugging) {
             /* This is useful for making sure that the JNI call is working. */
-            printf("WrapperJNI Debug: wrapperLockControlEventQueue looped %d times before lock.\n");
+            printf("WrapperJNI Debug: wrapperLockControlEventQueue looped %d times before lock.\n", count);
             fflush(NULL);
         }
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1299
          http://svn.sourceforge.net/wrapper/?rev=1299&view=rev
Author:   mortenson
Date:     2007-03-04 05:52:54 -0800 (Sun, 04 Mar 2007)

Log Message:
-----------
Add copyright headers

Modified Paths:
--------------
    trunk/wrapper/src/c/Makefile-aix-ppc-32.gmake
    trunk/wrapper/src/c/Makefile-aix-ppc-64.gmake
    trunk/wrapper/src/c/Makefile-freebsd-x86-32.gmake
    trunk/wrapper/src/c/Makefile-hpux-parisc-32.gmake
    trunk/wrapper/src/c/Makefile-hpux-parisc-32.make
    trunk/wrapper/src/c/Makefile-hpux-parisc-64.make
    trunk/wrapper/src/c/Makefile-irix-mips-32.cc
    trunk/wrapper/src/c/Makefile-irix-mips-32.gmake
    trunk/wrapper/src/c/Makefile-linux-ppc-64.make
    trunk/wrapper/src/c/Makefile-linux-x86-32.make
    trunk/wrapper/src/c/Makefile-linux-x86-64.make
    trunk/wrapper/src/c/Makefile-macosx-ppc-32.make
    trunk/wrapper/src/c/Makefile-macosx-universal-32.make
    trunk/wrapper/src/c/Makefile-macosx-x86-32.make
    trunk/wrapper/src/c/Makefile-osf1-alpha-64.gmake
    trunk/wrapper/src/c/Makefile-solaris-sparc-32.make
    trunk/wrapper/src/c/Makefile-solaris-sparc-64.make
    trunk/wrapper/src/c/Makefile-solaris-x86-32.make
    trunk/wrapper/src/c/Makefile-solaris-x86-64.make

Modified: trunk/wrapper/src/c/Makefile-aix-ppc-32.gmake
===================================================================
--- trunk/wrapper/src/c/Makefile-aix-ppc-32.gmake	2007-03-04 13:42:14 UTC (rev 1298)
+++ trunk/wrapper/src/c/Makefile-aix-ppc-32.gmake	2007-03-04 13:52:54 UTC (rev 1299)
@@ -1,3 +1,26 @@
+# Copyright (c) 1999, 2007 Tanuki Software Inc.
+# 
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of the Java Service Wrapper and associated
+# documentation files (the "Software"), to deal in the Software
+# without  restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sub-license,
+# and/or sell copies of the Software, and to permit persons to
+# whom the Software is furnished to do so, subject to the
+# following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+# NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
 COMPILE = gcc -DAIX
 
 INCLUDE=$(JAVA_HOME)/include

Modified: trunk/wrapper/src/c/Makefile-aix-ppc-64.gmake
===================================================================
--- trunk/wrapper/src/c/Makefile-aix-ppc-64.gmake	2007-03-04 13:42:14 UTC (rev 1298)
+++ trunk/wrapper/src/c/Makefile-aix-ppc-64.gmake	2007-03-04 13:52:54 UTC (rev 1299)
@@ -1,3 +1,26 @@
+# Copyright (c) 1999, 2007 Tanuki Software Inc.
+# 
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of the Java Service Wrapper and associated
+# documentation files (the "Software"), to deal in the Software
+# without  restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sub-license,
+# and/or sell copies of the Software, and to permit persons to
+# whom the Software is furnished to do so, subject to the
+# following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+# NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
 COMPILE = gcc -DAIX -maix64
 
 INCLUDE=$(JAVA_HOME)/include

Modified: trunk/wrapper/src/c/Makefile-freebsd-x86-32.gmake
===================================================================
--- trunk/wrapper/src/c/Makefile-freebsd-x86-32.gmake	2007-03-04 13:42:14 UTC (rev 1298)
+++ trunk/wrapper/src/c/Makefile-freebsd-x86-32.gmake	2007-03-04 13:52:54 UTC (rev 1299)
@@ -1,3 +1,26 @@
+# Copyright (c) 1999, 2007 Tanuki Software Inc.
+# 
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of the Java Service Wrapper and associated
+# documentation files (the "Software"), to deal in the Software
+# without  restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sub-license,
+# and/or sell copies of the Software, and to permit persons to
+# whom the Software is furnished to do so, subject to the
+# following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+# NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
 CC = gcc -Wall -pedantic -DFREEBSD
 
 INCLUDE=$(JAVA_HOME)/include

Modified: trunk/wrapper/src/c/Makefile-hpux-parisc-32.gmake
===================================================================
--- trunk/wrapper/src/c/Makefile-hpux-parisc-32.gmake	2007-03-04 13:42:14 UTC (rev 1298)
+++ trunk/wrapper/src/c/Makefile-hpux-parisc-32.gmake	2007-03-04 13:52:54 UTC (rev 1299)
@@ -1,3 +1,26 @@
+# Copyright (c) 1999, 2007 Tanuki Software Inc.
+# 
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of the Java Service Wrapper and associated
+# documentation files (the "Software"), to deal in the Software
+# without  restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sub-license,
+# and/or sell copies of the Software, and to permit persons to
+# whom the Software is furnished to do so, subject to the
+# following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+# NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
 COMPILE = gcc -O3 -Wall --pedantic -DHPUX -D_XOPEN_SOURCE_EXTENDED
 
 INCLUDE=$(JAVA_HOME)/include

Modified: trunk/wrapper/src/c/Makefile-hpux-parisc-32.make
===================================================================
--- trunk/wrapper/src/c/Makefile-hpux-parisc-32.make	2007-03-04 13:42:14 UTC (rev 1298)
+++ trunk/wrapper/src/c/Makefile-hpux-parisc-32.make	2007-03-04 13:52:54 UTC (rev 1299)
@@ -1,3 +1,26 @@
+# Copyright (c) 1999, 2007 Tanuki Software Inc.
+# 
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of the Java Service Wrapper and associated
+# documentation files (the "Software"), to deal in the Software
+# without  restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sub-license,
+# and/or sell copies of the Software, and to permit persons to
+# whom the Software is furnished to do so, subject to the
+# following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+# NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
 COMPILE = cc  -DHPUX -D_XOPEN_SOURCE_EXTENDED -Ae +Z
 
 INCLUDE=$(JAVA_HOME)/include

Modified: trunk/wrapper/src/c/Makefile-hpux-parisc-64.make
===================================================================
--- trunk/wrapper/src/c/Makefile-hpux-parisc-64.make	2007-03-04 13:42:14 UTC (rev 1298)
+++ trunk/wrapper/src/c/Makefile-hpux-parisc-64.make	2007-03-04 13:52:54 UTC (rev 1299)
@@ -1,3 +1,26 @@
+# Copyright (c) 1999, 2007 Tanuki Software Inc.
+# 
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of the Java Service Wrapper and associated
+# documentation files (the "Software"), to deal in the Software
+# without  restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sub-license,
+# and/or sell copies of the Software, and to permit persons to
+# whom the Software is furnished to do so, subject to the
+# following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+# NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
 JNI_HEADERS = $(JAVA_HOME)/include
 DEFS = -I$(JNI_HEADERS) -I$(JNI_HEADERS)/hp-ux
  

Modified: trunk/wrapper/src/c/Makefile-irix-mips-32.cc
===================================================================
--- trunk/wrapper/src/c/Makefile-irix-mips-32.cc	2007-03-04 13:42:14 UTC (rev 1298)
+++ trunk/wrapper/src/c/Makefile-irix-mips-32.cc	2007-03-04 13:52:54 UTC (rev 1299)
@@ -1,3 +1,26 @@
+# Copyright (c) 1999, 2007 Tanuki Software Inc.
+# 
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of the Java Service Wrapper and associated
+# documentation files (the "Software"), to deal in the Software
+# without  restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sub-license,
+# and/or sell copies of the Software, and to permit persons to
+# whom the Software is furnished to do so, subject to the
+# following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+# NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
 # Makefile for SGI IRIX 6.5 (may work on other versions as well but not tested)
 # MIPSpro Compilers: Version 7.3.1.3m
 COMPILE = cc -DIRIX -KPIC

Modified: trunk/wrapper/src/c/Makefile-irix-mips-32.gmake
===================================================================
--- trunk/wrapper/src/c/Makefile-irix-mips-32.gmake	2007-03-04 13:42:14 UTC (rev 1298)
+++ trunk/wrapper/src/c/Makefile-irix-mips-32.gmake	2007-03-04 13:52:54 UTC (rev 1299)
@@ -1,3 +1,26 @@
+# Copyright (c) 1999, 2007 Tanuki Software Inc.
+# 
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of the Java Service Wrapper and associated
+# documentation files (the "Software"), to deal in the Software
+# without  restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sub-license,
+# and/or sell copies of the Software, and to permit persons to
+# whom the Software is furnished to do so, subject to the
+# following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+# NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
 COMPILE = gcc -DIRIX
 
 INCLUDE=$(JAVA_HOME)/include

Modified: trunk/wrapper/src/c/Makefile-linux-ppc-64.make
===================================================================
--- trunk/wrapper/src/c/Makefile-linux-ppc-64.make	2007-03-04 13:42:14 UTC (rev 1298)
+++ trunk/wrapper/src/c/Makefile-linux-ppc-64.make	2007-03-04 13:52:54 UTC (rev 1299)
@@ -1,3 +1,26 @@
+# Copyright (c) 1999, 2007 Tanuki Software Inc.
+# 
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of the Java Service Wrapper and associated
+# documentation files (the "Software"), to deal in the Software
+# without  restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sub-license,
+# and/or sell copies of the Software, and to permit persons to
+# whom the Software is furnished to do so, subject to the
+# following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+# NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
 # This makefile is inprogess.  It builds, but the resulting libwrapper.so does not yet work.
 # If you know how to fix it then please help out.
 COMPILE = gcc -O3 -m64 -fPIC --pedantic

Modified: trunk/wrapper/src/c/Makefile-linux-x86-32.make
===================================================================
--- trunk/wrapper/src/c/Makefile-linux-x86-32.make	2007-03-04 13:42:14 UTC (rev 1298)
+++ trunk/wrapper/src/c/Makefile-linux-x86-32.make	2007-03-04 13:52:54 UTC (rev 1299)
@@ -1,3 +1,26 @@
+# Copyright (c) 1999, 2007 Tanuki Software Inc.
+# 
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of the Java Service Wrapper and associated
+# documentation files (the "Software"), to deal in the Software
+# without  restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sub-license,
+# and/or sell copies of the Software, and to permit persons to
+# whom the Software is furnished to do so, subject to the
+# following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+# NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
 COMPILE = gcc -O3 -Wall --pedantic
 
 INCLUDE=$(JAVA_HOME)/include

Modified: trunk/wrapper/src/c/Makefile-linux-x86-64.make
===================================================================
--- trunk/wrapper/src/c/Makefile-linux-x86-64.make	2007-03-04 13:42:14 UTC (rev 1298)
+++ trunk/wrapper/src/c/Makefile-linux-x86-64.make	2007-03-04 13:52:54 UTC (rev 1299)
@@ -1,3 +1,26 @@
+# Copyright (c) 1999, 2007 Tanuki Software Inc.
+# 
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of the Java Service Wrapper and associated
+# documentation files (the "Software"), to deal in the Software
+# without  restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sub-license,
+# and/or sell copies of the Software, and to permit persons to
+# whom the Software is furnished to do so, subject to the
+# following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+# NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
 # This makefile is inprogess.  It builds, but the resulting libwrapper.so does not yet work.
 # If you know how to fix it then please help out.
 COMPILE = gcc -O3 -fPIC -Wall --pedantic

Modified: trunk/wrapper/src/c/Makefile-macosx-ppc-32.make
===================================================================
--- trunk/wrapper/src/c/Makefile-macosx-ppc-32.make	2007-03-04 13:42:14 UTC (rev 1298)
+++ trunk/wrapper/src/c/Makefile-macosx-ppc-32.make	2007-03-04 13:52:54 UTC (rev 1299)
@@ -1,3 +1,26 @@
+# Copyright (c) 1999, 2007 Tanuki Software Inc.
+# 
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of the Java Service Wrapper and associated
+# documentation files (the "Software"), to deal in the Software
+# without  restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sub-license,
+# and/or sell copies of the Software, and to permit persons to
+# whom the Software is furnished to do so, subject to the
+# following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+# NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
 COMPILE = gcc -O3 -Wall -pedantic
 
 INCLUDE=$(JAVA_HOME)/include

Modified: trunk/wrapper/src/c/Makefile-macosx-universal-32.make
===================================================================
--- trunk/wrapper/src/c/Makefile-macosx-universal-32.make	2007-03-04 13:42:14 UTC (rev 1298)
+++ trunk/wrapper/src/c/Makefile-macosx-universal-32.make	2007-03-04 13:52:54 UTC (rev 1299)
@@ -1,3 +1,26 @@
+# Copyright (c) 1999, 2007 Tanuki Software Inc.
+# 
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of the Java Service Wrapper and associated
+# documentation files (the "Software"), to deal in the Software
+# without  restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sub-license,
+# and/or sell copies of the Software, and to permit persons to
+# whom the Software is furnished to do so, subject to the
+# following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+# NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
 UNIVERSAL_SDK_HOME=/Developer/SDKs/MacOSX10.4u.sdk
 COMPILE = gcc -O3 -Wall -DUSE_NANOSLEEP -DMACOSX -arch ppc -arch i386 -isysroot $(UNIVERSAL_SDK_HOME)
 

Modified: trunk/wrapper/src/c/Makefile-macosx-x86-32.make
===================================================================
--- trunk/wrapper/src/c/Makefile-macosx-x86-32.make	2007-03-04 13:42:14 UTC (rev 1298)
+++ trunk/wrapper/src/c/Makefile-macosx-x86-32.make	2007-03-04 13:52:54 UTC (rev 1299)
@@ -1,3 +1,26 @@
+# Copyright (c) 1999, 2007 Tanuki Software Inc.
+# 
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of the Java Service Wrapper and associated
+# documentation files (the "Software"), to deal in the Software
+# without  restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sub-license,
+# and/or sell copies of the Software, and to permit persons to
+# whom the Software is furnished to do so, subject to the
+# following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+# NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
 COMPILE = gcc -O3 -Wall -pedantic
 
 INCLUDE=$(JAVA_HOME)/include

Modified: trunk/wrapper/src/c/Makefile-osf1-alpha-64.gmake
===================================================================
--- trunk/wrapper/src/c/Makefile-osf1-alpha-64.gmake	2007-03-04 13:42:14 UTC (rev 1298)
+++ trunk/wrapper/src/c/Makefile-osf1-alpha-64.gmake	2007-03-04 13:52:54 UTC (rev 1299)
@@ -1,3 +1,26 @@
+# Copyright (c) 1999, 2007 Tanuki Software Inc.
+# 
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of the Java Service Wrapper and associated
+# documentation files (the "Software"), to deal in the Software
+# without  restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sub-license,
+# and/or sell copies of the Software, and to permit persons to
+# whom the Software is furnished to do so, subject to the
+# following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+# NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
 COMPILE = gcc -DOSF1 -D_REENTRANT
 
 INCLUDE=$(JAVA_HOME)/include

Modified: trunk/wrapper/src/c/Makefile-solaris-sparc-32.make
===================================================================
--- trunk/wrapper/src/c/Makefile-solaris-sparc-32.make	2007-03-04 13:42:14 UTC (rev 1298)
+++ trunk/wrapper/src/c/Makefile-solaris-sparc-32.make	2007-03-04 13:52:54 UTC (rev 1299)
@@ -1,3 +1,26 @@
+# Copyright (c) 1999, 2007 Tanuki Software Inc.
+# 
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of the Java Service Wrapper and associated
+# documentation files (the "Software"), to deal in the Software
+# without  restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sub-license,
+# and/or sell copies of the Software, and to permit persons to
+# whom the Software is furnished to do so, subject to the
+# following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+# NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
 COMPILE = gcc -O3 -Wall --pedantic -DSOLARIS
 
 INCLUDE=$(JAVA_HOME)/include

Modified: trunk/wrapper/src/c/Makefile-solaris-sparc-64.make
===================================================================
--- trunk/wrapper/src/c/Makefile-solaris-sparc-64.make	2007-03-04 13:42:14 UTC (rev 1298)
+++ trunk/wrapper/src/c/Makefile-solaris-sparc-64.make	2007-03-04 13:52:54 UTC (rev 1299)
@@ -1,3 +1,26 @@
+# Copyright (c) 1999, 2007 Tanuki Software Inc.
+# 
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of the Java Service Wrapper and associated
+# documentation files (the "Software"), to deal in the Software
+# without  restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sub-license,
+# and/or sell copies of the Software, and to permit persons to
+# whom the Software is furnished to do so, subject to the
+# following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+# NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
 COMPILE = gcc -m64 -O3 -Wall --pedantic -DSOLARIS
 
 INCLUDE=$(JAVA_HOME)/include

Modified: trunk/wrapper/src/c/Makefile-solaris-x86-32.make
===================================================================
--- trunk/wrapper/src/c/Makefile-solaris-x86-32.make	2007-03-04 13:42:14 UTC (rev 1298)
+++ trunk/wrapper/src/c/Makefile-solaris-x86-32.make	2007-03-04 13:52:54 UTC (rev 1299)
@@ -1,3 +1,26 @@
+# Copyright (c) 1999, 2007 Tanuki Software Inc.
+# 
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of the Java Service Wrapper and associated
+# documentation files (the "Software"), to deal in the Software
+# without  restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sub-license,
+# and/or sell copies of the Software, and to permit persons to
+# whom the Software is furnished to do so, subject to the
+# following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+# NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
 COMPILE = gcc -O3 -Wall --pedantic -DSOLARIS
 
 INCLUDE=$(JAVA_HOME)/include

Modified: trunk/wrapper/src/c/Makefile-solaris-x86-64.make
===================================================================
--- trunk/wrapper/src/c/Makefile-solaris-x86-64.make	2007-03-04 13:42:14 UTC (rev 1298)
+++ trunk/wrapper/src/c/Makefile-solaris-x86-64.make	2007-03-04 13:52:54 UTC (rev 1299)
@@ -1,3 +1,26 @@
+# Copyright (c) 1999, 2007 Tanuki Software Inc.
+# 
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of the Java Service Wrapper and associated
+# documentation files (the "Software"), to deal in the Software
+# without  restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sub-license,
+# and/or sell copies of the Software, and to permit persons to
+# whom the Software is furnished to do so, subject to the
+# following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+# NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
 COMPILE = gcc -m64 -O3 -Wall --pedantic -DSOLARIS
 
 INCLUDE=$(JAVA_HOME)/include


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1303
          http://svn.sourceforge.net/wrapper/?rev=1303&view=rev
Author:   mortenson
Date:     2007-03-05 08:07:48 -0800 (Mon, 05 Mar 2007)

Log Message:
-----------
Work on the 32/64 bit windows makefiles.

Modified Paths:
--------------
    trunk/wrapper/src/c/Makefile-windows-x86-32.nmake

Added Paths:
-----------
    trunk/wrapper/src/c/Makefile-windows-x86-64.nmake

Modified: trunk/wrapper/src/c/Makefile-windows-x86-32.nmake
===================================================================
--- trunk/wrapper/src/c/Makefile-windows-x86-32.nmake	2007-03-05 15:24:14 UTC (rev 1302)
+++ trunk/wrapper/src/c/Makefile-windows-x86-32.nmake	2007-03-05 16:07:48 UTC (rev 1303)
@@ -25,7 +25,7 @@
 
 COMPILE = cl /D "WIN32" /D "NDEBUG"  /FD /EHsc /MT /Zp4 /W3 /nologo /c /Zi /errorReport:prompt /D "_CRT_SECURE_NO_DEPRECATE"
 LINK = link /NOLOGO /MANIFEST /DEBUG /MACHINE:X86 /ERRORREPORT:PROMPT DelayImp.lib
-RC = rc /fo"$(OUTDIR)/$(PROJ).res"
+RC = rc
 
 # EXE Definitions
 EXE_OUTDIR = $(PROJ)32_VC8__Win32_Release
@@ -38,7 +38,7 @@
 DLL_OUTDIR = $(PROJ)JNI32_VC8__Win32_Release
 DLL_OBJS = $(DLL_OUTDIR)\wrapperjni.obj $(DLL_OUTDIR)\wrapperjni_win.obj $(DLL_OUTDIR)\wrapperinfo.obj
 DLL_LIBS = advapi32.lib user32.lib
-DLL_COMPILE_OPTS = /Od  /I "..\\" /I ".\\" /I "C:\Sun\j2sdk1.4.2_08\jre\..\\include" /I "C:\Sun\j2sdk1.4.2_08\jre\..\\include\win32" /D "_WINDOWS" /D "_USRDLL" /D "DECODERJNI_VC8_EXPORTS" /D "_WINDLL"
+DLL_COMPILE_OPTS = /Od  /I "..\" /I ".\" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "_WINDOWS" /D "_USRDLL" /D "DECODERJNI_VC8_EXPORTS" /D "_WINDLL"
 DLL_LINK_OPTS = /INCREMENTAL /DLL /SUBSYSTEM:WINDOWS /MANIFESTFILE:"$(DLL_OUTDIR)\$(PROJ).dll.intermediate.manifest" /PDB:"$(DLL_OUTDIR)\$(PROJ).pdb" 
 
 
@@ -64,17 +64,19 @@
     $(COMPILE) $(DLL_COMPILE_OPTS) /Fo"$(DLL_OUTDIR)\\" /Fd"$(DLL_OUTDIR)\\" $**
 
 # Build rule for resource file
-$(OUTDIR)\$(PROJ).res: $(PROJ).rc $(RC_DEP)
-    $(RC) $(PROJ).rc
-#    $(rc) $(rcflags) $(rcvars) /fo $(OUTDIR)\$(PROJ).res $(PROJ).rc
+$(EXE_OUTDIR)\$(PROJ).res: $(PROJ).rc $(RC_DEP)
+    $(RC) /fo"$(EXE_OUTDIR)/$(PROJ).res" $(PROJ).rc
+$(DLL_OUTDIR)\$(PROJ).res: $(PROJ).rc $(RC_DEP)
+    $(RC) /fo"$(DLL_OUTDIR)/$(PROJ).res" $(PROJ).rc
 
-$(PROJ).EXE: $(BASE_OBJS) $(EXE_OBJS) $(OUTDIR)\$(PROJ).res
-    $(LINK) $(EXE_LINK_OPTS) $(EXE_OBJS) $(EXE_LIBS) $(OUTDIR)\$(PROJ).res /OUT:"..\..\bin\$(PROJ).exe"
+$(PROJ).EXE: $(BASE_OBJS) $(EXE_OBJS) $(EXE_OUTDIR)\$(PROJ).res
+    $(LINK) $(EXE_LINK_OPTS) $(EXE_OBJS) $(EXE_LIBS) $(EXE_OUTDIR)\$(PROJ).res /OUT:"..\..\bin\$(PROJ).exe"
 
-$(PROJ).DLL: $(BASE_OBJS) $(DLL_OBJS) $(OUTDIR)\$(PROJ).res
-    $(LINK) $(DLL_LINK_OPTS) $(DLL_OBJS) $(DLL_LIBS) $(OUTDIR)\$(PROJ).res /OUT:"..\..\lib\$(PROJ).dll"
+$(PROJ).DLL: $(BASE_OBJS) $(DLL_OBJS) $(DLL_OUTDIR)\$(PROJ).res
+    $(LINK) $(DLL_LINK_OPTS) $(DLL_OBJS) $(DLL_LIBS) $(DLL_OUTDIR)\$(PROJ).res /OUT:"..\..\lib\$(PROJ).dll"
 
 clean:
-    if exist $(OUTDIR)/$(NULL) rd /s /q $(OUTDIR)
+    if exist $(EXE_OUTDIR)/$(NULL) rd /s /q $(EXE_OUTDIR)
+    if exist $(DLL_OUTDIR)/$(NULL) rd /s /q $(DLL_OUTDIR)
     if exist ..\..\bin\$(PROJ).exe del /q ..\..\bin\$(PROJ).exe
     if exist ..\..\lib\$(PROJ).dll del /q ..\..\lib\$(PROJ).dll

Added: trunk/wrapper/src/c/Makefile-windows-x86-64.nmake
===================================================================
--- trunk/wrapper/src/c/Makefile-windows-x86-64.nmake	                        (rev 0)
+++ trunk/wrapper/src/c/Makefile-windows-x86-64.nmake	2007-03-05 16:07:48 UTC (rev 1303)
@@ -0,0 +1,82 @@
+# Copyright (c) 1999, 2007 Tanuki Software Inc.
+# 
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of the Java Service Wrapper and associated
+# documentation files (the "Software"), to deal in the Software
+# without  restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sub-license,
+# and/or sell copies of the Software, and to permit persons to
+# whom the Software is furnished to do so, subject to the
+# following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+# NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
+PROJ = wrapper
+
+COMPILE = cl /D "_AMD64_=1" /D "WIN64" /D "_WIN64" /D "WIN32" /FIPRE64PRA.H /D "NDEBUG"  /FD /EHsc /MT /Zp4 /W3 /nologo /c /Zi /errorReport:prompt /D "_CRT_SECURE_NO_DEPRECATE"
+LINK = link /NOLOGO /MANIFEST /DEBUG /MACHINE:AMD64 /ERRORREPORT:PROMPT DelayImp.lib
+RC = rc
+
+# EXE Definitions
+EXE_OUTDIR = $(PROJ)64_VC8__Win32_Release
+EXE_OBJS = $(EXE_OUTDIR)\logger.obj $(EXE_OUTDIR)\property.obj $(EXE_OUTDIR)\wrapper.obj $(EXE_OUTDIR)\wrapper_win.obj $(EXE_OUTDIR)\wrappereventloop.obj $(EXE_OUTDIR)\wrapperinfo.obj 
+EXE_LIBS = wsock32.lib shlwapi.lib advapi32.lib user32.lib bufferoverflowu.lib
+EXE_COMPILE_OPTS = /O2 /GL /D "_CONSOLE" /Wp64
+EXE_LINK_OPTS = /INCREMENTAL:NO /SUBSYSTEM:CONSOLE /MANIFESTFILE:"$(EXE_OUTDIR)\$(PROJ).exe.intermediate.manifest" /PDB:"$(EXE_OUTDIR)\$(PROJ).pdb" /OPT:REF /OPT:ICF /OPT:WIN98 /LTCG 
+
+# DLL Definitions
+DLL_OUTDIR = $(PROJ)JNI64_VC8__Win32_Release
+DLL_OBJS = $(DLL_OUTDIR)\wrapperjni.obj $(DLL_OUTDIR)\wrapperjni_win.obj $(DLL_OUTDIR)\wrapperinfo.obj
+DLL_LIBS = advapi32.lib user32.lib bufferoverflowu.lib
+DLL_COMPILE_OPTS = /Od  /I "..\" /I ".\" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "_WINDOWS" /D "_USRDLL" /D "DECODERJNI_VC8_EXPORTS" /D "_WINDLL"
+DLL_LINK_OPTS = /INCREMENTAL /DLL /SUBSYSTEM:WINDOWS /MANIFESTFILE:"$(DLL_OUTDIR)\$(PROJ).dll.intermediate.manifest" /PDB:"$(DLL_OUTDIR)\$(PROJ).pdb" 
+
+
+all: $(EXE_OUTDIR) $(DLL_OUTDIR) $(PROJ).EXE $(PROJ).DLL
+
+# Define project specific macros
+
+#BASE_OBJS  =
+#EXTRA_LIBS = wsock32.lib shlwapi.lib advapi32.lib user32.lib
+#GLOBAL_DEP = logger.h property.h psapi.h wrapper.h wrapperinfo.h messages.h resource.h
+#RC_DEP     = resource.h
+
+#----- If OUTDIR does not exist, then create directory
+$(EXE_OUTDIR) :
+    if not exist "$(EXE_OUTDIR)/$(NULL)" mkdir $(EXE_OUTDIR)
+$(DLL_OUTDIR) :
+    if not exist "$(DLL_OUTDIR)/$(NULL)" mkdir $(DLL_OUTDIR)
+
+# Inference rule for updating the object files
+.c{$(EXE_OUTDIR)}.obj:
+    $(COMPILE) $(EXE_COMPILE_OPTS) /Fo"$(EXE_OUTDIR)\\" /Fd"$(EXE_OUTDIR)\\" $**
+.c{$(DLL_OUTDIR)}.obj:
+    $(COMPILE) $(DLL_COMPILE_OPTS) /Fo"$(DLL_OUTDIR)\\" /Fd"$(DLL_OUTDIR)\\" $**
+
+# Build rule for resource file
+$(EXE_OUTDIR)\$(PROJ).res: $(PROJ).rc $(RC_DEP)
+    $(RC) /fo"$(EXE_OUTDIR)/$(PROJ).res" $(PROJ).rc
+$(DLL_OUTDIR)\$(PROJ).res: $(PROJ).rc $(RC_DEP)
+    $(RC) /fo"$(DLL_OUTDIR)/$(PROJ).res" $(PROJ).rc
+
+$(PROJ).EXE: $(BASE_OBJS) $(EXE_OBJS) $(EXE_OUTDIR)\$(PROJ).res
+    $(LINK) $(EXE_LINK_OPTS) $(EXE_OBJS) $(EXE_LIBS) $(EXE_OUTDIR)\$(PROJ).res /OUT:"..\..\bin\$(PROJ).exe"
+
+$(PROJ).DLL: $(BASE_OBJS) $(DLL_OBJS) $(DLL_OUTDIR)\$(PROJ).res
+    $(LINK) $(DLL_LINK_OPTS) $(DLL_OBJS) $(DLL_LIBS) $(DLL_OUTDIR)\$(PROJ).res /OUT:"..\..\lib\$(PROJ).dll"
+
+clean:
+    if exist $(EXE_OUTDIR)/$(NULL) rd /s /q $(EXE_OUTDIR)
+    if exist $(DLL_OUTDIR)/$(NULL) rd /s /q $(DLL_OUTDIR)
+    if exist ..\..\bin\$(PROJ).exe del /q ..\..\bin\$(PROJ).exe
+    if exist ..\..\lib\$(PROJ).dll del /q ..\..\lib\$(PROJ).dll


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1316
          http://svn.sourceforge.net/wrapper/?rev=1316&view=rev
Author:   mortenson
Date:     2007-04-02 00:30:44 -0700 (Mon, 02 Apr 2007)

Log Message:
-----------
Fix a buffer overflow problem if the Wrapper was launched without explicitly specifying a configuration file.
Add tests of the return values of all malloc calls to catch out of memory errors and recover as gracefully as possible.  Bug #1649880.

Modified Paths:
--------------
    trunk/wrapper/src/c/Makefile-windows-x86-32.nmake
    trunk/wrapper/src/c/logger.c
    trunk/wrapper/src/c/logger.h
    trunk/wrapper/src/c/property.c
    trunk/wrapper/src/c/wrapper.c
    trunk/wrapper/src/c/wrapper.h
    trunk/wrapper/src/c/wrapper.ico
    trunk/wrapper/src/c/wrapperJNI_VC8.sln
    trunk/wrapper/src/c/wrapperJNI_VC8.vcproj
    trunk/wrapper/src/c/wrapper_VC8.sln
    trunk/wrapper/src/c/wrapper_VC8.vcproj
    trunk/wrapper/src/c/wrapper_unix.c
    trunk/wrapper/src/c/wrapper_win.c
    trunk/wrapper/src/c/wrapperjni_unix.c

Removed Paths:
-------------
    trunk/wrapper/src/c/Makefile-windows-x86-64.nmake
    trunk/wrapper/src/c/makewin64.bat

Property Changed:
----------------
    trunk/wrapper/src/c/


Property changes on: trunk/wrapper/src/c
___________________________________________________________________
Name: svn:ignore
   - messages.rc
wrapperinfo.c
Debug*
Release*
WrapperJNI___Win??_Debug*
WrapperJNI___Win??_Release*
Wrapper??.aps
Wrapper??.ncb
Wrapper??.opt
Wrapper??.dep
WrapperJNI??.dep
WrapperJNI??.mak
.deps
*.ncb
*.suo
*.user
wrapper32_VC8__Win32_Debug
wrapper32_VC8__Win32_Release
decoderJNI_VC8__Win32_Debug
decoderJNI_VC8__Win32_Release
*.aps
wrapper32.vsprops
wrapper.vsprops
wrapper_VC8__Win32_Release
wrapper_VC8__x64_Debug
wrapper_VC8__x64_Release
wrapperJNI32_VC8__Win32_Release
wrapperJNI64_VC8__Win32_Release
wrapper64_VC8__Win32_Release

   + messages.rc
wrapperinfo.c
Debug*
Release*
WrapperJNI___Win??_Debug*
WrapperJNI___Win??_Release*
Wrapper??.aps
Wrapper??.ncb
Wrapper??.opt
Wrapper??.dep
WrapperJNI??.dep
WrapperJNI??.mak
.deps
*.ncb
*.suo
*.user
wrapper32_VC8__Win32_Debug
wrapper32_VC8__Win32_Release
decoderJNI_VC8__Win32_Debug
decoderJNI_VC8__Win32_Release
*.aps
wrapper32.vsprops
wrapper.vsprops
wrapper_VC8__Win32_Release
wrapper_VC8__x64_Debug
wrapper_VC8__x64_Release
wrapperJNI32_VC8__Win32_Release
wrapperJNI64_VC8__Win32_Release
wrapper64_VC8__Win32_Release
wrapper_VC8__Win32_Debug


Modified: trunk/wrapper/src/c/Makefile-windows-x86-32.nmake
===================================================================
--- trunk/wrapper/src/c/Makefile-windows-x86-32.nmake	2007-03-23 16:32:24 UTC (rev 1315)
+++ trunk/wrapper/src/c/Makefile-windows-x86-32.nmake	2007-04-02 07:30:44 UTC (rev 1316)
@@ -29,7 +29,7 @@
 
 # EXE Definitions
 EXE_OUTDIR = $(PROJ)32_VC8__Win32_Release
-EXE_OBJS = $(EXE_OUTDIR)\logger.obj $(EXE_OUTDIR)\property.obj $(EXE_OUTDIR)\wrapper.obj $(EXE_OUTDIR)\wrapper_win.obj $(EXE_OUTDIR)\wrappereventloop.obj $(EXE_OUTDIR)\wrapperinfo.obj 
+EXE_OBJS = $(EXE_OUTDIR)\logger.obj $(EXE_OUTDIR)\property.obj $(EXE_OUTDIR)\wrapper.obj $(EXE_OUTDIR)\wrapper_win.obj $(EXE_OUTDIR)\wrappereventloop.obj $(EXE_OUTDIR)\wrapperinfo.obj
 EXE_LIBS = wsock32.lib shlwapi.lib advapi32.lib user32.lib
 EXE_COMPILE_OPTS = /O2 /GL /D "_CONSOLE" /Wp64
 EXE_LINK_OPTS = /INCREMENTAL:NO /SUBSYSTEM:CONSOLE /MANIFESTFILE:"$(EXE_OUTDIR)\$(PROJ).exe.intermediate.manifest" /PDB:"$(EXE_OUTDIR)\$(PROJ).pdb" /OPT:REF /OPT:ICF /OPT:WIN98 /LTCG 
@@ -46,11 +46,6 @@
 
 # Define project specific macros
 
-#BASE_OBJS  =
-#EXTRA_LIBS = wsock32.lib shlwapi.lib advapi32.lib user32.lib
-#GLOBAL_DEP = logger.h property.h psapi.h wrapper.h wrapperinfo.h messages.h resource.h
-#RC_DEP     = resource.h
-
 #----- If OUTDIR does not exist, then create directory
 $(EXE_OUTDIR) :
     if not exist "$(EXE_OUTDIR)/$(NULL)" mkdir $(EXE_OUTDIR)

Deleted: trunk/wrapper/src/c/Makefile-windows-x86-64.nmake
===================================================================
--- trunk/wrapper/src/c/Makefile-windows-x86-64.nmake	2007-03-23 16:32:24 UTC (rev 1315)
+++ trunk/wrapper/src/c/Makefile-windows-x86-64.nmake	2007-04-02 07:30:44 UTC (rev 1316)
@@ -1,82 +0,0 @@
-# Copyright (c) 1999, 2007 Tanuki Software Inc.
-# 
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of the Java Service Wrapper and associated
-# documentation files (the "Software"), to deal in the Software
-# without  restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sub-license,
-# and/or sell copies of the Software, and to permit persons to
-# whom the Software is furnished to do so, subject to the
-# following conditions:
-# 
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
-# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-# NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
-# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
-# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-
-PROJ = wrapper
-
-COMPILE = cl /D "_AMD64_=1" /D "WIN64" /D "_WIN64" /D "WIN32" /FIPRE64PRA.H /D "NDEBUG"  /FD /EHsc /MT /Zp8 /W3 /nologo /c /Zi /errorReport:prompt /D "_CRT_SECURE_NO_DEPRECATE"
-LINK = link /NOLOGO /MANIFEST /DEBUG /MACHINE:AMD64 /ERRORREPORT:PROMPT DelayImp.lib
-RC = rc
-
-# EXE Definitions
-EXE_OUTDIR = $(PROJ)64_VC8__Win32_Release
-EXE_OBJS = $(EXE_OUTDIR)\logger.obj $(EXE_OUTDIR)\property.obj $(EXE_OUTDIR)\wrapper.obj $(EXE_OUTDIR)\wrapper_win.obj $(EXE_OUTDIR)\wrappereventloop.obj $(EXE_OUTDIR)\wrapperinfo.obj 
-EXE_LIBS = wsock32.lib shlwapi.lib advapi32.lib user32.lib bufferoverflowu.lib
-EXE_COMPILE_OPTS = /O2 /GL /D "_CONSOLE" /Wp64
-EXE_LINK_OPTS = /INCREMENTAL:NO /SUBSYSTEM:CONSOLE /MANIFESTFILE:"$(EXE_OUTDIR)\$(PROJ).exe.intermediate.manifest" /PDB:"$(EXE_OUTDIR)\$(PROJ).pdb" /OPT:REF /OPT:ICF /OPT:WIN98 /LTCG 
-
-# DLL Definitions
-DLL_OUTDIR = $(PROJ)JNI64_VC8__Win32_Release
-DLL_OBJS = $(DLL_OUTDIR)\wrapperjni.obj $(DLL_OUTDIR)\wrapperjni_win.obj $(DLL_OUTDIR)\wrapperinfo.obj
-DLL_LIBS = advapi32.lib user32.lib bufferoverflowu.lib
-DLL_COMPILE_OPTS = /Od  /I "..\" /I ".\" /I "$(JAVA_HOME)\include" /I "$(JAVA_HOME)\include\win32" /D "_WINDOWS" /D "_USRDLL" /D "DECODERJNI_VC8_EXPORTS" /D "_WINDLL"
-DLL_LINK_OPTS = /INCREMENTAL /DLL /SUBSYSTEM:WINDOWS /MANIFESTFILE:"$(DLL_OUTDIR)\$(PROJ).dll.intermediate.manifest" /PDB:"$(DLL_OUTDIR)\$(PROJ).pdb" 
-
-
-all: $(EXE_OUTDIR) $(DLL_OUTDIR) $(PROJ).EXE $(PROJ).DLL
-
-# Define project specific macros
-
-#BASE_OBJS  =
-#EXTRA_LIBS = wsock32.lib shlwapi.lib advapi32.lib user32.lib
-#GLOBAL_DEP = logger.h property.h psapi.h wrapper.h wrapperinfo.h messages.h resource.h
-#RC_DEP     = resource.h
-
-#----- If OUTDIR does not exist, then create directory
-$(EXE_OUTDIR) :
-    if not exist "$(EXE_OUTDIR)/$(NULL)" mkdir $(EXE_OUTDIR)
-$(DLL_OUTDIR) :
-    if not exist "$(DLL_OUTDIR)/$(NULL)" mkdir $(DLL_OUTDIR)
-
-# Inference rule for updating the object files
-.c{$(EXE_OUTDIR)}.obj:
-    $(COMPILE) $(EXE_COMPILE_OPTS) /Fo"$(EXE_OUTDIR)\\" /Fd"$(EXE_OUTDIR)\\" $**
-.c{$(DLL_OUTDIR)}.obj:
-    $(COMPILE) $(DLL_COMPILE_OPTS) /Fo"$(DLL_OUTDIR)\\" /Fd"$(DLL_OUTDIR)\\" $**
-
-# Build rule for resource file
-$(EXE_OUTDIR)\$(PROJ).res: $(PROJ).rc $(RC_DEP)
-    $(RC) /fo"$(EXE_OUTDIR)/$(PROJ).res" $(PROJ).rc
-$(DLL_OUTDIR)\$(PROJ).res: $(PROJ).rc $(RC_DEP)
-    $(RC) /fo"$(DLL_OUTDIR)/$(PROJ).res" $(PROJ).rc
-
-$(PROJ).EXE: $(BASE_OBJS) $(EXE_OBJS) $(EXE_OUTDIR)\$(PROJ).res
-    $(LINK) $(EXE_LINK_OPTS) $(EXE_OBJS) $(EXE_LIBS) $(EXE_OUTDIR)\$(PROJ).res /OUT:"..\..\bin\$(PROJ).exe"
-
-$(PROJ).DLL: $(BASE_OBJS) $(DLL_OBJS) $(DLL_OUTDIR)\$(PROJ).res
-    $(LINK) $(DLL_LINK_OPTS) $(DLL_OBJS) $(DLL_LIBS) $(DLL_OUTDIR)\$(PROJ).res /OUT:"..\..\lib\$(PROJ).dll"
-
-clean:
-    if exist $(EXE_OUTDIR)/$(NULL) rd /s /q $(EXE_OUTDIR)
-    if exist $(DLL_OUTDIR)/$(NULL) rd /s /q $(DLL_OUTDIR)
-    if exist ..\..\bin\$(PROJ).exe del /q ..\..\bin\$(PROJ).exe
-    if exist ..\..\lib\$(PROJ).dll del /q ..\..\lib\$(PROJ).dll

Modified: trunk/wrapper/src/c/logger.c
===================================================================
--- trunk/wrapper/src/c/logger.c	2007-03-23 16:32:24 UTC (rev 1315)
+++ trunk/wrapper/src/c/logger.c	2007-04-02 07:30:44 UTC (rev 1316)
@@ -128,7 +128,7 @@
 #ifdef WIN32
 void writeToConsole( char *lpszFmt, ... );
 #endif
-void checkAndRollLogs( );
+void checkAndRollLogs(const char *nowDate);
 
 /* Any log messages generated within signal handlers must be stored until we
  *  have left the signal handler to avoid deadlocks in the logging code.
@@ -182,6 +182,11 @@
 }
 #endif
 
+void outOfMemory(const char *context, int id) {
+    log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_FATAL, "Out of memory (%s%02d). %s",
+        context, id, getLastErrorText());
+}
+
 /**
  * Replaces one token with another.  The length of the new token must be equal
  *  to or less than that of the old token.
@@ -391,12 +396,34 @@
         free(currentLogFileName);
         free(workLogFileName);
     }
+    logFilePath = NULL;
+    currentLogFileName = NULL;
+    workLogFileName = NULL;
+
     logFilePath = malloc(sizeof(char) * (len + 1));
+    if (!logFilePath) {
+        outOfMemory("SLP", 1);
+        return;
+    }
     strcpy(logFilePath, log_file_path);
 
     currentLogFileName = malloc(sizeof(char) * (len + 10 + 1));
+    if (!currentLogFileName) {
+        outOfMemory("SLP", 2);
+        free(logFilePath);
+        logFilePath = NULL;
+        return;
+    }
     currentLogFileName[0] = '\0';
     workLogFileName = malloc(sizeof(char) * (len + 10 + 1));
+    if (!workLogFileName) {
+        outOfMemory("SLP", 3);
+        free(logFilePath);
+        logFilePath = NULL;
+        free(currentLogFileName);
+        currentLogFileName = NULL;
+        return;
+    }
     workLogFileName[0] = '\0';
     
 #ifdef WIN32	
@@ -445,8 +472,11 @@
 
     if( max_file_size != NULL ) {
         /* Allocate buffer */
-        if( (tmpFileSizeBuff = (char *) malloc(sizeof(char) * (strlen( max_file_size ) + 1))) == NULL )
+        tmpFileSizeBuff = (char *) malloc(sizeof(char) * (strlen( max_file_size ) + 1));
+        if (!tmpFileSizeBuff) {
+            outOfMemory("SLMFS", 1);
             return;
+        }
 
         /* Generate multiple and remove unwanted chars */
         multiple = 1;
@@ -521,7 +551,9 @@
         break;
     }
 #else
-    pthread_mutex_lock(&log_printfMutex);
+    if (pthread_mutex_lock(&log_printfMutex)) {
+        printf("Failed to lock the Logging mutex. %s\n", getLastErrorText());
+    }
 #endif
     
     return 0;
@@ -536,7 +568,9 @@
         return -1;
     }
 #else
-    pthread_mutex_unlock(&log_printfMutex);
+    if (pthread_mutex_unlock(&log_printfMutex)) {
+        printf("Failed to unlock the Logging mutex. %s\n", getLastErrorText());
+    }
 #endif
     return 0;
 }
@@ -558,7 +592,9 @@
         
         fclose(logfileFP);
         logfileFP = NULL;
-        currentLogFileName[0] = '\0';
+        if (currentLogFileName) {
+            currentLogFileName[0] = '\0';
+        }
     }
 
     /* Release the lock we have on this function so that other threads can get in. */
@@ -709,10 +745,20 @@
 
     if ( threadPrintBuffer == NULL ) {
         threadPrintBuffer = (char *)malloc( reqSize * sizeof( char ) );
+        if (!threadPrintBuffer) {
+            printf("Out of memory is logging code (BPB1)\n");
+            threadPrintBufferSize = 0;
+            return NULL;
+        }
         threadPrintBufferSize = reqSize;
     } else if ( threadPrintBufferSize < reqSize ) {
         free( threadPrintBuffer );
         threadPrintBuffer = (char *)malloc( reqSize * sizeof( char ) );
+        if (!threadPrintBuffer) {
+            printf("Out of memory is logging code (BPB2)\n");
+            threadPrintBufferSize = 0;
+            return NULL;
+        }
         threadPrintBufferSize = reqSize;
     }
 
@@ -907,20 +953,21 @@
     if( level >= currentConsoleLevel ) {
         /* Build up the printBuffer. */
         printBuffer = buildPrintBuffer( source_id, level, threadId, queued, nowTM, nowMillis, consoleFormat, message );
-
-        /* Write the print buffer to the console. */
+        if (printBuffer) {
+            /* Write the print buffer to the console. */
 #ifdef WIN32
-        if ( consoleStdoutHandle != NULL ) {
-            writeToConsole( "%s\n", printBuffer );
-        } else {
+            if ( consoleStdoutHandle != NULL ) {
+                writeToConsole( "%s\n", printBuffer );
+            } else {
 #endif
-            fprintf( stdout, "%s\n", printBuffer );
-            if ( consoleFlush ) {
-                fflush( stdout );
+                fprintf( stdout, "%s\n", printBuffer );
+                if ( consoleFlush ) {
+                    fflush( stdout );
+                }
+#ifdef WIN32
             }
-#ifdef WIN32
+#endif
         }
-#endif
     }
 
     /* Logfile output by format */
@@ -928,7 +975,7 @@
     /* Log the message to the log file */
     if (level >= currentLogfileLevel) {
         /* If the log file was set to a blank value then it will not be used. */
-        if ( strlen( logFilePath ) > 0 )
+        if ( logFilePath && ( strlen( logFilePath ) > 0 ) )
         {
             /* If this the roll mode is date then we need a nowDate for this log entry. */
             if (logFileRollMode & ROLL_MODE_DATE) {
@@ -976,26 +1023,27 @@
                 
                 /* Build up the printBuffer. */
                 printBuffer = buildPrintBuffer( source_id, level, threadId, queued, nowTM, nowMillis, logfileFormat, message );
-                
-                fprintf( logfileFP, "%s\n", printBuffer );
-                
-                /* Increment the activity counter. */
-                logfileActivityCount++;
-                
-                /* Only close the file if autoClose is set.  Otherwise it will be closed later
-                 *  after an appropriate period of inactivity. */
-                if (autoCloseLogfile) {
+                if (printBuffer) {
+                    fprintf( logfileFP, "%s\n", printBuffer );
+                    
+                    /* Increment the activity counter. */
+                    logfileActivityCount++;
+                    
+                    /* Only close the file if autoClose is set.  Otherwise it will be closed later
+                     *  after an appropriate period of inactivity. */
+                    if (autoCloseLogfile) {
 #ifdef _DEBUG
-                    printf("Closing logfile immediately...\n");
-                    fflush(NULL);
+                        printf("Closing logfile immediately...\n");
+                        fflush(NULL);
 #endif
+                        
+                        fclose(logfileFP);
+                        logfileFP = NULL;
+                        currentLogFileName[0] = '\0';
+                    }
                     
-                    fclose(logfileFP);
-                    logfileFP = NULL;
-                    currentLogFileName[0] = '\0';
+                    /* Leave the file open.  It will be closed later after a period of inactivity. */
                 }
-                
-                /* Leave the file open.  It will be closed later after a period of inactivity. */
             }
         }
     }
@@ -1040,6 +1088,11 @@
             /* No buffer yet. Allocate one to get started. */
             threadMessageBufferSize = 100;
             threadMessageBuffer = (char*)malloc( threadMessageBufferSize * sizeof(char) );
+            if (!threadMessageBuffer) {
+                printf("Out of memory is logging code (P1)\n");
+                threadMessageBufferSize = 0;
+                return;
+            }
         }
 
         /* Try writing to the buffer. */
@@ -1074,6 +1127,11 @@
             }
 
             threadMessageBuffer = (char*)malloc( threadMessageBufferSize * sizeof(char) );
+            if (!threadMessageBuffer) {
+                printf("Out of memory is logging code (P2)\n");
+                threadMessageBufferSize = 0;
+                return;
+            }
 
             /* Always set the count to -1 so we will loop again. */
             count = -1;
@@ -1209,12 +1267,18 @@
 void sendEventlogMessage( int source_id, int level, const char *szBuff ) {
 #ifdef WIN32
     char   header[16];
-    const char   **strings = (char **) malloc( 3 * sizeof( char * ) );
+    const char   **strings;
     WORD   eventType;
     HANDLE handle;
     WORD   eventID, categoryID;
     int    result;
 
+    strings = (char **) malloc( 3 * sizeof( char * ) );
+    if (!strings) {
+        printf("Out of memory is logging code (SEM1)\n");
+        return;
+    }
+
     /* Build the source header */
     switch( source_id ) {
     case WRAPPER_SOURCE_WRAPPER:
@@ -1388,6 +1452,10 @@
 
     if ( vWriteToConsoleBuffer == NULL ) {
         vWriteToConsoleBuffer = (char *)malloc( vWriteToConsoleBufferSize * sizeof(char) );
+        if (!vWriteToConsoleBuffer) {
+            printf("Out of memory is logging code (WTC1)\n");
+            return;
+        }
     }
 
     /* The only way I could figure out how to write to the console
@@ -1408,6 +1476,10 @@
         free( vWriteToConsoleBuffer );
         vWriteToConsoleBufferSize += 100;
         vWriteToConsoleBuffer = (char *)malloc( vWriteToConsoleBufferSize * sizeof(char) );
+        if (!vWriteToConsoleBuffer) {
+            printf("Out of memory is logging code (WTC2)\n");
+            return;
+        }
     }
 
     /* We can now write the message. */
@@ -1430,6 +1502,10 @@
     char rollNum[11];
     struct stat fileStat;
     int result;
+
+    if (!logFilePath) {
+        return;
+    }
     
     /* If the log file is currently open, it needs to be closed. */
     if (logfileFP != NULL) {
@@ -1561,6 +1637,10 @@
             fflush(NULL);
 #endif
             latestFiles[i] = malloc(sizeof(char) * (strlen(testFile) + 1));
+            if (!latestFiles[i]) {
+                printf("Out of memory is logging code (LLFCHF1)\n");
+                return;
+            }
             strcpy(latestFiles[i], testFile);
             return;
         } else {
@@ -1602,6 +1682,10 @@
                 fflush(NULL);
 #endif
                 latestFiles[i] = malloc(sizeof(char) * (strlen(testFile) + 1));
+                if (!latestFiles[i]) {
+                    printf("Out of memory is logging code (LLFCHF2)\n");
+                    return;
+                }
                 strcpy(latestFiles[i], testFile);
                 return;
             }
@@ -1643,16 +1727,28 @@
 #endif
 
     latestFiles = malloc(sizeof(char *) * count);
+    if (!latestFiles) {
+        printf("Out of memory is logging code (LLFC1)\n");
+        return;
+    }
     for (i = 0; i < count; i++) {
         latestFiles[i] = NULL;
     }
     /* Set the first element to the current file so things will work correctly if it already
      *  exists. */
     latestFiles[0] = malloc(sizeof(char) * (strlen(current) + 1));
+    if (!latestFiles[0]) {
+        printf("Out of memory is logging code (LLFC2)\n");
+        return;
+    }
     strcpy(latestFiles[0], current);
 
 #ifdef WIN32
     path = malloc(sizeof(char) * (strlen(pattern) + 1));
+    if (!path) {
+        printf("Out of memory is logging code (LLFC3)\n");
+        return;
+    }
 
     /* Extract any path information from the beginning of the file */
     strcpy(path, pattern);
@@ -1673,6 +1769,10 @@
         }
     } else {
         testFile = malloc(sizeof(char) * (strlen(path) + strlen(fblock.name) + 1));
+        if (!testFile) {
+            printf("Out of memory is logging code (LLFC4)\n");
+            return;
+        }
         sprintf(testFile, "%s%s", path, fblock.name);
         limitLogFileCountHandleFile(current, testFile, latestFiles, count);
         free(testFile);
@@ -1681,6 +1781,10 @@
         /* Look for additional entries */
         while (_findnext(handle, &fblock) == 0) {
             testFile = malloc(sizeof(char) * (strlen(path) + strlen(fblock.name) + 1));
+            if (!testFile) {
+                printf("Out of memory is logging code (LLFC5)\n");
+                return;
+            }
             sprintf(testFile, "%s%s", path, fblock.name);
             limitLogFileCountHandleFile(current, testFile, latestFiles, count);
             free(testFile);
@@ -1868,6 +1972,10 @@
      *  efficient than necessary. */
     do {
         buffer = malloc( sizeof( char ) * bufferSize );
+        if (!buffer) {
+            printf("Out of memory is logging code (PQ1)\n");
+            return;
+        }
 
         /* Before we can store the string, we need to know how much space is required to do so. */
         va_start( vargs, lpszFmt );
@@ -1986,3 +2094,4 @@
         }
     }
 }
+

Modified: trunk/wrapper/src/c/logger.h
===================================================================
--- trunk/wrapper/src/c/logger.h	2007-03-23 16:32:24 UTC (rev 1315)
+++ trunk/wrapper/src/c/logger.h	2007-04-02 07:30:44 UTC (rev 1316)
@@ -127,6 +127,8 @@
 #define strcmpIgnoreCase(str1, str2) strcasecmp(str1, str2)
 #endif
 
+extern void outOfMemory(const char *context, int id);
+
 /* * Logfile functions * */
 extern void setLogfilePath( const char *log_file_path );
 extern int getLogfileRollModeForName( const char *logfileRollName );

Deleted: trunk/wrapper/src/c/makewin64.bat
===================================================================
--- trunk/wrapper/src/c/makewin64.bat	2007-03-23 16:32:24 UTC (rev 1315)
+++ trunk/wrapper/src/c/makewin64.bat	2007-04-02 07:30:44 UTC (rev 1316)
@@ -1,15 +0,0 @@
-@... off
-echo Building C Targets
-REM call VCVARSnn.BAT
-call %1
-
-NMAKE.EXE -f Wrapper64.mak CFG="Wrapper - Win64 Release" ALL
-if not errorlevel 1 goto ok1
-exit %ERRORLEVEL%
-
-:ok1
-NMAKE.EXE -f WrapperJNI64.mak CFG="WrapperJNI - Win64 Release" ALL
-if not errorlevel 1 goto end
-exit %ERRORLEVEL%
-
-:end

Modified: trunk/wrapper/src/c/property.c
===================================================================
--- trunk/wrapper/src/c/property.c	2007-03-23 16:32:24 UTC (rev 1315)
+++ trunk/wrapper/src/c/property.c	2007-04-02 07:30:44 UTC (rev 1316)
@@ -95,9 +95,13 @@
                 printf( "Unreplaced property %s=%s\n", property->name, property->value );
 #endif
                 oldValue = malloc(strlen(property->value) + 1);
-                strcpy(oldValue, property->value);
-                setInnerProperty(property, oldValue);
-                free(oldValue);
+                if (!oldValue) {
+                    outOfMemory("GIP", 1);
+                } else {
+                    strcpy(oldValue, property->value);
+                    setInnerProperty(property, oldValue);
+                    free(oldValue);
+                }
 #ifdef _DEBUG
                 printf( "        -> property %s=%s\n", property->name, property->value );
 #endif
@@ -157,6 +161,10 @@
     Property *property;
 
     property = malloc(sizeof(Property));
+    if (!property) {
+        outOfMemory("CIP", 1);
+        return NULL;
+    }
     property->name = NULL;
     property->next = NULL;
     property->previous = NULL;
@@ -324,23 +332,26 @@
         evaluateEnvironmentVariables(propertyValue, buffer, MAX_PROPERTY_VALUE_LENGTH);
 
         property->value = malloc(sizeof(char) * (strlen(buffer) + 1));
-
-        /* Strip any non valid characters like control characters. Some valid characters are
-         *  less than 0 when the char is unsigned. */
-        for (i = 0, count = 0; i < (int)strlen(buffer); i++) {
-            /* Only add valid chars, skip control chars.  We want all chars other than those
-             *  in the range 1..31.  0 is not possible as that would be end of the string.
-             *  On most platforms, char is signed, but on PowerPC, it is unsigned.  This
-             *  means that any comparison such as >= 0 will cause a compiler error as that
-             *  would always be true.
-             * The logic below is to get the correct behavior in either case assuming no 0. */
-            if ((buffer[i] < 1) || (buffer[i] > 31)) {
-                property->value[count++] = buffer[i];
+        if (!property->value) {
+            outOfMemory("SIP", 1);
+        } else {
+            /* Strip any non valid characters like control characters. Some valid characters are
+             *  less than 0 when the char is unsigned. */
+            for (i = 0, count = 0; i < (int)strlen(buffer); i++) {
+                /* Only add valid chars, skip control chars.  We want all chars other than those
+                 *  in the range 1..31.  0 is not possible as that would be end of the string.
+                 *  On most platforms, char is signed, but on PowerPC, it is unsigned.  This
+                 *  means that any comparison such as >= 0 will cause a compiler error as that
+                 *  would always be true.
+                 * The logic below is to get the correct behavior in either case assuming no 0. */
+                if ((buffer[i] < 1) || (buffer[i] > 31)) {
+                    property->value[count++] = buffer[i];
+                }
             }
+    
+            /* Crop string to new size */
+            property->value[count] = '\0';
         }
-
-        /* Crop string to new size */
-        property->value[count] = '\0';
     }
 }
 
@@ -480,6 +491,10 @@
 
 Properties* createProperties() {
     Properties *properties = malloc(sizeof(Properties));
+    if (!properties) {
+        outOfMemory("CP", 1);
+        return NULL;
+    }
     properties->first = NULL;
     properties->last = NULL;
     return properties;
@@ -548,9 +563,13 @@
      *  this memory so it is not freed after we set it. We only call this on
      *  startup, so the leak is minor. */
     envBuf = malloc(sizeof(char) * (strlen(name) + strlen(value) + 2));
-    sprintf(envBuf, "%s=%s", name, value);
-    if (putenv(envBuf)) {
-        printf("Unable to set environment variable: %s\n", envBuf);
+    if (!envBuf) {
+        outOfMemory("SE", 1);
+    } else {
+        sprintf(envBuf, "%s=%s", name, value);
+        if (putenv(envBuf)) {
+            printf("Unable to set environment variable: %s\n", envBuf);
+        }
     }
 }
 
@@ -597,8 +616,16 @@
 
     /* It is possible that the propertyName and or properyValue contains extra spaces. */
     propertyNameTrim = malloc(sizeof(char) * (strlen(propertyName) + 1));
+    if (!propertyNameTrim) {
+        outOfMemory("AP", 1);
+        return;
+    }
     trim(propertyName, propertyNameTrim);
     propertyValueTrim = malloc(sizeof(char) * (strlen(propertyValue) + 1));
+    if (!propertyValueTrim) {
+        outOfMemory("AP", 2);
+        return;
+    }
     trim(propertyValue, propertyValueTrim);
 
 #ifdef _DEBUG
@@ -612,9 +639,16 @@
     if (property == NULL) {
         /* This is a new property */
         property = createInnerProperty();
+        if (!property) {
+            return;
+        }
 
         /* Store a copy of the name */
         property->name = malloc(sizeof(char) * (strlen(propertyNameTrim) + 1));
+        if (!property->name) {
+            outOfMemory("AP", 3);
+            return;
+        }
         strcpy(property->name, propertyNameTrim);
 
         /* Insert this property at the correct location. */
@@ -830,6 +864,10 @@
     
     /* Now that we know how much space this will all take up, allocate a buffer. */
     fullBuffer = buffer = malloc(size);
+    if (!fullBuffer) {
+        outOfMemory("LP", 1);
+        return NULL;
+    }
     
     /* Now actually build up the output.  Any separator characters need to be escaped with themselves. */
     property = properties->first;

Modified: trunk/wrapper/src/c/wrapper.c
===================================================================
--- trunk/wrapper/src/c/wrapper.c	2007-03-23 16:32:24 UTC (rev 1315)
+++ trunk/wrapper/src/c/wrapper.c	2007-04-02 07:30:44 UTC (rev 1316)
@@ -173,6 +173,10 @@
             return 1;
         }
         wrapperData->configFile = malloc(sizeof(char) * work);
+        if (!wrapperData->configFile) {
+            outOfMemory("WLCP", 1);
+            return 1;
+        }
         if (!GetFullPathName(wrapperData->argConfFile, work, wrapperData->configFile, &filePart)) {
             log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_FATAL,
                 "Unable to resolve the full path of the configuration file, %s: %s",
@@ -184,6 +188,10 @@
          *  path is provided.  We always need an abosulte path here.  So build up one and
          *  then use realpath to remove any .. or other relative references. */
         wrapperData->configFile = malloc(PATH_MAX);
+        if (!wrapperData->configFile) {
+            outOfMemory("WLCP", 2);
+            return 1;
+        }
         if (realpath(wrapperData->argConfFile, wrapperData->configFile) == NULL) {
             log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_FATAL,
                 "Unable to resolve the full path of the configuration file, %s: %s",
@@ -201,6 +209,10 @@
             return 1;
         }
         wrapperData->originalWorkingDir = malloc(sizeof(char) * work);
+        if (!wrapperData->originalWorkingDir) {
+            outOfMemory("WLCP", 3);
+            return 1;
+        }
         if (!GetFullPathName(".", work, wrapperData->originalWorkingDir, &filePart)) {
             log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_FATAL,
                 "Unable to resolve the original working directory: %s", getLastErrorText());
@@ -211,6 +223,10 @@
          *  path is provided.  We always need an abosulte path here.  So build up one and
          *  then use realpath to remove any .. or other relative references. */
         wrapperData->originalWorkingDir = malloc(PATH_MAX);
+        if (!wrapperData->originalWorkingDir) {
+            outOfMemory("WLCP", 4);
+            return 1;
+        }
         if (realpath(".", wrapperData->originalWorkingDir) == NULL) {
             log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_FATAL,
                 "Unable to resolve the original working directory: %s", getLastErrorText());
@@ -221,6 +237,9 @@
 
     /* Create a Properties structure. */
     properties = createProperties();
+    if (!properties) {
+        return 1;
+    }
     wrapperAddDefaultProperties();
 
     /* The argument prior to the argBase will be the configuration file, followed
@@ -277,6 +296,10 @@
                 return 1;
             }
             wrapperData->workingDir = malloc(sizeof(char) * work);
+            if (!wrapperData->workingDir) {
+                outOfMemory("WLCP", 5);
+                return 1;
+            }
             if (!GetFullPathName(prop, work, wrapperData->workingDir, &filePart)) {
                 log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_FATAL,
                     "Unable to resolve the working directory %s: %s", prop, getLastErrorText());
@@ -287,6 +310,10 @@
              *  path is provided.  We always need an abosulte path here.  So build up one and
              *  then use realpath to remove any .. or other relative references. */
             wrapperData->workingDir = malloc(PATH_MAX);
+            if (!wrapperData->workingDir) {
+                outOfMemory("WLCP", 6);
+                return 1;
+            }
             if (realpath(prop, wrapperData->workingDir) == NULL) {
                 log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_FATAL,
                     "Unable to resolve the working directory %s: %s", prop, getLastErrorText());
@@ -737,6 +764,10 @@
             free(protocolSendBuffer);
         }
         protocolSendBuffer = malloc(len);
+        if (!protocolSendBuffer) {
+            outOfMemory("WPF", 1);
+            return -1;
+        }
     }
 
     if (sd == INVALID_SOCKET) {
@@ -978,6 +1009,10 @@
      *  set below, but this extra step will protect against future changes.  Some
      *  platforms appear to initialize maloc'd memory to 0 while others do not. */
     wrapperData = malloc(sizeof(WrapperConfig));
+    if (!wrapperData) {
+        outOfMemory("WI", 1);
+        return 1;
+    }
     memset(wrapperData, 0, sizeof(WrapperConfig));
     /* Setup the initial values of required properties. */
     wrapperData->configured = FALSE;
@@ -1039,12 +1074,14 @@
 /**
  * Returns the file name base as a newly malloced char *.  The resulting
  *  base file name will have any path and extension stripped.
+ *
+ * baseName should be long enough to always contain the base name.
+ *  (strlen(fileName) + 1) is safe.
  */
-char *wrapperGetFileBase(const char *fileName) {
+void wrapperGetFileBase(const char *fileName, char *baseName) {
     const char *start;
     const char *end;
     const char *c;
-    char *base;
 
     start = fileName;
     end = &fileName[strlen(fileName)];
@@ -1066,26 +1103,32 @@
     }
 
     /* Now create the new base name. */
-    base = malloc((end - start + 1) * sizeof(char));
-    memcpy(base, start, end - start);
-    base[end - start] = '\0';
-
-    return base;
+    memcpy(baseName, start, end - start);
+    baseName[end - start] = '\0';
 }
 
 /**
  * Output the version.
  */
 void wrapperVersionBanner() {
-    printf("Wrapper (Version %s) http://wrapper.tanukisoftware.org\n", wrapperVersion);
+    printf("Wrapper Community Edition (Version %s)\n", wrapperVersion);
+    printf("  Copyright 1999, 2007 Tanuki Software, Inc.  All Rights Reserved.\n");
+    printf("    http://wrapper.tanukisoftware.org\n");
 }
 
 /**
  * Output the application usage.
  */
 void wrapperUsage(char *appName) {
-    char *confFileBase = wrapperGetFileBase(appName);
+    char *confFileBase;
 
+    confFileBase = malloc(strlen(appName) + 1);
+    if (!confFileBase) {
+        outOfMemory("WU", 1);
+        return;
+    }
+    wrapperGetFileBase(appName, confFileBase);
+
     wrapperVersionBanner();
     printf("\n");
     printf("Usage:\n");
@@ -1122,6 +1165,8 @@
     printf("  in wrapper.conf.  For example:\n");
     printf("  wrapper.debug=true\n");
     printf("\n");
+
+    free(confFileBase);
 }
 
 /**
@@ -1152,12 +1197,25 @@
             } else {
                 /* Syntax 3 */
                 /* Only a command was specified.  Assume a default config file name. */
-                argConfFileBase = wrapperGetFileBase(argv[0]);
-                wrapperData->argConfFile = malloc((strlen(argConfFileBase) + 4 + 1) * sizeof(char));
+                argConfFileBase = malloc(strlen(argv[0]) + 1);
+                if (!argConfFileBase) {
+                    outOfMemory("WPA", 1);
+                    return FALSE;
+                }
+                wrapperGetFileBase(argv[0], argConfFileBase);
+
+                /* The following malloc is only called once, but is never freed. */
+                wrapperData->argConfFile = malloc((strlen(argConfFileBase) + 5 + 1) * sizeof(char));
+                if (!wrapperData->argConfFile) {
+                    outOfMemory("WPA", 2);
+                    free(argConfFileBase);
+                    return FALSE;
+                }
                 sprintf(wrapperData->argConfFile, "%s.conf", argConfFileBase);
                 wrapperData->argConfFileDefault = TRUE;
                 wrapperData->argCount = argc - 2;
                 wrapperData->argValues = &argv[2];
+                free(argConfFileBase);
             }
         } else {
             /* Syntax 2 */
@@ -1172,12 +1230,25 @@
         /* A config file was not specified.  Assume a default config file name. */
         wrapperData->argCommand = "c";
 
-        argConfFileBase = wrapperGetFileBase(argv[0]);
-        wrapperData->argConfFile = malloc((strlen(argConfFileBase) + 4 + 1) * sizeof(char));
+        argConfFileBase = malloc(strlen(argv[0]) + 1);
+        if (!argConfFileBase) {
+            outOfMemory("WPA", 3);
+            return FALSE;
+        }
+        wrapperGetFileBase(argv[0], argConfFileBase);
+
+        /* The following malloc is only called once, but is never freed. */
+        wrapperData->argConfFile = malloc((strlen(argConfFileBase) + 5 + 1) * sizeof(char));
+        if (!wrapperData->argConfFile) {
+            outOfMemory("WPA", 4);
+            free(argConfFileBase);
+            return FALSE;
+        }
         sprintf(wrapperData->argConfFile, "%s.conf", argConfFileBase);
         wrapperData->argConfFileDefault = TRUE;
         wrapperData->argCount = argc - 1;
         wrapperData->argValues = &argv[1];
+        free(argConfFileBase);
     }
 
     return TRUE;
@@ -1228,9 +1299,11 @@
     char *buffer;
     
     buffer = linearizeProperties(properties, '\t');
-    wrapperProtocolFunction(FALSE, WRAPPER_MSG_PROPERTIES, buffer);
-    
-    free(buffer);
+    if (buffer) {
+        wrapperProtocolFunction(FALSE, WRAPPER_MSG_PROPERTIES, buffer);
+        
+        free(buffer);
+    }
 }
 
 /**
@@ -1571,7 +1644,7 @@
     char paramBuffer2[128];
     int quotable;
     int i, j;
-    size_t len2;
+    size_t len, len2;
     size_t cpLen, cpLenAlloc;
     char *tmpString;
     struct stat statBuffer;
@@ -1580,7 +1653,6 @@
 #ifdef WIN32
     char cpPath[512];
     intptr_t handle;
-    size_t len;
     int found;
     struct _finddata_t fblock;
 #else
@@ -1652,6 +1724,10 @@
 
         if (found) {
             strings[index] = malloc(sizeof(char) * (strlen(cpPath) + 2 + 1));
+            if (!strings[index]) {
+                outOfMemory("WBJCAI", 1);
+                return -1;
+            }
             if (addQuotes) {
                 sprintf(strings[index], "\"%s\"", cpPath);
             } else {
@@ -1659,6 +1735,10 @@
             }
         } else {
             strings[index] = malloc(sizeof(char) * (strlen(prop) + 2 + 1));
+            if (!strings[index]) {
+                outOfMemory("WBJCAI", 2);
+                return -1;
+            }
             if (addQuotes) {
                 sprintf(strings[index], "\"%s\"", prop);
             } else {
@@ -1673,6 +1753,10 @@
 #else /* UNIX */
 
         strings[index] = malloc(sizeof(char) * (strlen(prop) + 2 + 1));
+        if (!strings[index]) {
+            outOfMemory("WBJCAI", 3);
+            return -1;
+        }
         if (addQuotes) {
             sprintf(strings[index], "\"%s\"", prop);
         } else {
@@ -1708,6 +1792,10 @@
                             "The value of property '%s', '%s' is not a valid argument to the jvm.  Skipping.",
                             paramBuffer, prop );
                         strings[index] = malloc(sizeof(char) * 1);
+                        if (!strings[index]) {
+                            outOfMemory("WBJCAI", 4);
+                            return -1;
+                        }
                         strings[index][0] = '\0';
                     } else {
                         quotable = isQuotableProperty(properties, paramBuffer);
@@ -1719,6 +1807,10 @@
                         }
                         if (stripQuote) {
                             propStripped = malloc(sizeof(char) * (strlen(prop) + 1));
+                            if (!propStripped) {
+                                outOfMemory("WBJCAI", 5);
+                                return -1;
+                            }
                             wrapperStripQuotes(prop, propStripped);
                         } else {
                             propStripped = (char *)prop;
@@ -1727,9 +1819,17 @@
                         if (addQuotes && quotable && strchr(propStripped, ' ')) {
                             len = quoteValue(propStripped, NULL, 0);
                             strings[index] = malloc(len);
+                            if (!strings[index]) {
+                                outOfMemory("WBJCAI", 6);
+                                return -1;
+                            }
                             quoteValue(propStripped, strings[index], len);
                         } else {
                             strings[index] = malloc(sizeof(char) * (strlen(propStripped) + 1));
+                            if (!strings[index]) {
+                                outOfMemory("WBJCAI", 7);
+                                return -1;
+                            }
                             sprintf(strings[index], "%s", propStripped);
                         }
 
@@ -1760,6 +1860,10 @@
         initMemory = __max(initMemory, 1); /* 1 <= n */
         if (strings) {
             strings[index] = malloc(sizeof(char) * (5 + 4 + 1));  /* Allow up to 4 digits. */
+            if (!strings[index]) {
+                outOfMemory("WBJCAI", 8);
+                return -1;
+            }
             sprintf(strings[index], "-Xms%dm", initMemory);
         }
         index++;
@@ -1774,6 +1878,10 @@
         maxMemory = __max(maxMemory, initMemory);  /* initMemory <= n */
         if (strings) {
             strings[index] = malloc(sizeof(char) * (5 + 4 + 1));  /* Allow up to 4 digits. */
+            if (!strings[index]) {
+                outOfMemory("WBJCAI", 9);
+                return -1;
+            }
             sprintf(strings[index], "-Xmx%dm", maxMemory);
         }
         index++;
@@ -1818,6 +1926,10 @@
              *  before the quote. */
             if (systemPath) {
                 strings[index] = malloc(sizeof(char) * (22 + strlen(prop) + 1 + strlen(systemPath) + 1 + 1));
+                if (!strings[index]) {
+                    outOfMemory("WBJCAI", 10);
+                    return -1;
+                }
                 if (addQuotes) {
                     if ((strlen(systemPath) > 1) && (systemPath[strlen(systemPath) - 1] == '\\')) {
                         sprintf(strings[index], "-Djava.library.path=\"%s%c%s\\\"", prop, wrapperClasspathSeparator, systemPath);
@@ -1829,6 +1941,10 @@
                 }
             } else {
                 strings[index] = malloc(sizeof(char) * (22 + strlen(prop) + 1 + 1));
+                if (!strings[index]) {
+                    outOfMemory("WBJCAI", 11);
+                    return -1;
+                }
                 if (addQuotes) {
                     if ((strlen(prop) > 1) && (prop[strlen(prop) - 1] == '\\')) {
                         sprintf(strings[index], "-Djava.library.path=\"%s\\\"", prop);
@@ -1848,6 +1964,10 @@
             cpLen = 0;
             cpLenAlloc = 1024;
             strings[index] = malloc(sizeof(char) * cpLenAlloc);
+            if (!strings[index]) {
+                outOfMemory("WBJCAI", 12);
+                return -1;
+            }
             
             /* Start with the property value. */
             sprintf(&(strings[index][cpLen]), "-Djava.library.path=");
@@ -1874,6 +1994,10 @@
                             tmpString = strings[index];
                             cpLenAlloc += 1024;
                             strings[index] = malloc(sizeof(char) * cpLenAlloc);
+                            if (!strings[index]) {
+                                outOfMemory("WBJCAI", 13);
+                                return -1;
+                            }
                             sprintf(strings[index], "%s", tmpString);
                             free(tmpString);
                             tmpString = NULL;
@@ -1900,6 +2024,10 @@
                         tmpString = strings[index];
                         cpLenAlloc += 1024;
                         strings[index] = malloc(sizeof(char) * cpLenAlloc);
+                        if (!strings[index]) {
+                            outOfMemory("WBJCAI", 14);
+                            return -1;
+                        }
                         sprintf(strings[index], "%s", tmpString);
                         free(tmpString);
                         tmpString = NULL;
@@ -1941,6 +2069,10 @@
     /* Store the classpath */
     if (strings) {
         strings[index] = malloc(sizeof(char) * (10 + 1));
+        if (!strings[index]) {
+            outOfMemory("WBJCAI", 15);
+            return -1;
+        }
         sprintf(strings[index], "-classpath");
     }
     index++;
@@ -1949,6 +2081,10 @@
         cpLen = 0;
         cpLenAlloc = 1024;
         strings[index] = malloc(sizeof(char) * cpLenAlloc);
+        if (!strings[index]) {
+            outOfMemory("WBJCAI", 16);
+            return -1;
+        }
         
         /* Add an open quote the classpath */
         if (addQuotes) {
@@ -1997,6 +2133,10 @@
                                 tmpString = strings[index];
                                 cpLenAlloc += 1024;
                                 strings[index] = malloc(sizeof(char) * cpLenAlloc);
+                                if (!strings[index]) {
+                                    outOfMemory("WBJCAI", 17);
+                                    return -1;
+                                }
                                 sprintf(strings[index], "%s", tmpString);
                                 free(tmpString);
                                 tmpString = NULL;
@@ -2019,6 +2159,10 @@
                                     tmpString = strings[index];
                                     cpLenAlloc += 1024;
                                     strings[index] = malloc(sizeof(char) * cpLenAlloc);
+                                    if (!strings[index]) {
+                                        outOfMemory("WBJCAI", 18);
+                                        return -1;
+                                    }
                                     sprintf(strings[index], "%s", tmpString);
                                     free(tmpString);
                                     tmpString = NULL;
@@ -2049,6 +2193,10 @@
                                     tmpString = strings[index];
                                     cpLenAlloc += 1024;
                                     strings[index] = malloc(sizeof(char) * cpLenAlloc);
+                                    if (!strings[index]) {
+                                        outOfMemory("WBJCAI", 19);
+                                        return -1;
+                                    }
                                     sprintf(strings[index], "%s", tmpString);
                                     free(tmpString);
                                     tmpString = NULL;
@@ -2075,6 +2223,10 @@
                         propStripped = (char *)prop;
                         if ((prop[strlen(prop) - 1] == '/') || (prop[strlen(prop) - 1] == '\\')) {
                             propStripped = malloc(sizeof(char) * strlen(prop));
+                            if (!propStripped) {
+                                outOfMemory("WBJCAI", 20);
+                                return -1;
+                            }
                             memcpy(propStripped, prop, strlen(prop) - 1);
                             propStripped[strlen(prop) - 1] = '\0';
                         }
@@ -2106,6 +2258,10 @@
                             tmpString = strings[index];
                             cpLenAlloc += 1024;
                             strings[index] = malloc(sizeof(char) * cpLenAlloc);
+                            if (!strings[index]) {
+                                outOfMemory("WBJCAI", 21);
+                                return -1;
+                            }
                             sprintf(strings[index], "%s", tmpString);
                             free(tmpString);
                             tmpString = NULL;
@@ -2149,6 +2305,10 @@
     if (strings) {
         wrapperBuildKey();
         strings[index] = malloc(sizeof(char) * (16 + strlen(wrapperData->key) + 1));
+        if (!strings[index]) {
+            outOfMemory("WBJCAI", 22);
+            return -1;
+        }
         if (addQuotes) {
             sprintf(strings[index], "-Dwrapper.key=\"%s\"", wrapperData->key);
         } else {
@@ -2160,6 +2320,10 @@
     /* Store the Wrapper server port */
     if (strings) {
         strings[index] = malloc(sizeof(char) * (15 + 5 + 1));  /* Port up to 5 characters */
+        if (!strings[index]) {
+            outOfMemory("WBJCAI", 23);
+            return -1;
+        }
         sprintf(strings[index], "-Dwrapper.port=%d", (int)wrapperData->actualPort);
     }
     index++;
@@ -2169,17 +2333,29 @@
     {
         if (strings) {
             strings[index] = malloc(sizeof(char) * (19 + 5 + 1));  /* Port up to 5 characters */
+            if (!strings[index]) {
+                outOfMemory("WBJCAI", 24);
+                return -1;
+            }
             sprintf(strings[index], "-Dwrapper.jvm.port=%d", (int)wrapperData->jvmPort);
         }
         index++;
     }
     if (strings) {
         strings[index] = malloc(sizeof(char) * (23 + 5 + 1));  /* Port up to 5 characters */
+        if (!strings[index]) {
+            outOfMemory("WBJCAI", 25);
+            return -1;
+        }
         sprintf(strings[index], "-Dwrapper.jvm.port.min=%d", (int)wrapperData->jvmPortMin);
     }
     index++;
     if (strings) {
         strings[index] = malloc(sizeof(char) * (23 + 5 + 1));  /* Port up to 5 characters */
+        if (!strings[index]) {
+            outOfMemory("WBJCAI", 26);
+            return -1;
+        }
         sprintf(strings[index], "-Dwrapper.jvm.port.max=%d", (int)wrapperData->jvmPortMax);
     }
     index++;
@@ -2188,6 +2364,10 @@
     if (wrapperData->isDebugging) {
         if (strings) {
             strings[index] = malloc(sizeof(char) * (22 + 1));
+            if (!strings[index]) {
+                outOfMemory("WBJCAI", 27);
+                return -1;
+            }
             if (addQuotes) {
                 sprintf(strings[index], "-Dwrapper.debug=\"TRUE\"");
             } else {
@@ -2200,6 +2380,10 @@
     /* Store the Wrapper PID */
     if (strings) {
         strings[index] = malloc(sizeof(char) * (24 + 1)); /* Pid up to 10 characters */
+        if (!strings[index]) {
+            outOfMemory("WBJCAI", 28);
+            return -1;
+        }
         sprintf(strings[index], "-Dwrapper.pid=%d", wrapperGetPID());
     }
     index++;
@@ -2208,6 +2392,10 @@
     if (wrapperData->useSystemTime ) {
         if (strings) {
             strings[index] = malloc(sizeof(char) * (32 + 1));
+            if (!strings[index]) {
+                outOfMemory("WBJCAI", 29);
+                return -1;
+            }
             if (addQuotes) {
                 sprintf(strings[index], "-Dwrapper.use_system_time=\"TRUE\"");
             } else {
@@ -2221,6 +2409,10 @@
         if (wrapperData->timerFastThreshold != WRAPPER_TIMER_FAST_THRESHOLD) {
             if (strings) {
                 strings[index] = malloc(sizeof(char) * (43 + 1)); /* Allow for 10 digits */
+                if (!strings[index]) {
+                    outOfMemory("WBJCAI", 30);
+                    return -1;
+                }
                 if (addQuotes) {
                     sprintf(strings[index], "-Dwrapper.timer_fast_threshold=\"%d\"", wrapperData->timerFastThreshold * WRAPPER_TICK_MS / 1000);
                 } else {
@@ -2232,6 +2424,10 @@
         if (wrapperData->timerSlowThreshold != WRAPPER_TIMER_SLOW_THRESHOLD) {
             if (strings) {
                 strings[index] = malloc(sizeof(char) * (43 + 1)); /* Allow for 10 digits */
+                if (!strings[index]) {
+                    outOfMemory("WBJCAI", 31);
+                    return -1;
+                }
                 if (addQuotes) {
                     sprintf(strings[index], "-Dwrapper.timer_slow_threshold=\"%d\"", wrapperData->timerSlowThreshold * WRAPPER_TICK_MS / 1000);
                 } else {
@@ -2246,6 +2442,10 @@
      *  WrapperManager class uses it to verify that the version matches. */
     if (strings) {
         strings[index] = malloc(sizeof(char) * (20 + strlen(wrapperVersion) + 1));
+        if (!strings[index]) {
+            outOfMemory("WBJCAI", 32);
+            return -1;
+        }
         if (addQuotes) {
             sprintf(strings[index], "-Dwrapper.version=\"%s\"", wrapperVersion);
         } else {
@@ -2257,6 +2457,10 @@
     /* Store the base name of the native library. */
     if (strings) {
         strings[index] = malloc(sizeof(char) * (27 + strlen(wrapperData->nativeLibrary) + 1));
+        if (!strings[index]) {
+            outOfMemory("WBJCAI", 33);
+            return -1;
+        }
         if (addQuotes) {
             sprintf(strings[index], "-Dwrapper.native_library=\"%s\"", wrapperData->nativeLibrary);
         } else {
@@ -2269,6 +2473,10 @@
     if (wrapperData->ignoreSignals) {
         if (strings) {
             strings[index] = malloc(sizeof(char) * (31 + 1));
+            if (!strings[index]) {
+                outOfMemory("WBJCAI", 34);
+                return -1;
+            }
             if (addQuotes) {
                 sprintf(strings[index], "-Dwrapper.ignore_signals=\"TRUE\"");
             } else {
@@ -2286,6 +2494,10 @@
 #endif
         if (strings) {
             strings[index] = malloc(sizeof(char) * (24 + 1));
+            if (!strings[index]) {
+                outOfMemory("WBJCAI", 35);
+                return -1;
+            }
             if (addQuotes) {
                 sprintf(strings[index], "-Dwrapper.service=\"TRUE\"");
             } else {
@@ -2299,6 +2511,10 @@
     if (wrapperData->isShutdownHookDisabled) {
         if (strings) {
             strings[index] = malloc(sizeof(char) * (38 + 1));
+            if (!strings[index]) {
+                outOfMemory("WBJCAI", 36);
+                return -1;
+            }
             if (addQuotes) {
                 sprintf(strings[index], "-Dwrapper.disable_shutdown_hook=\"TRUE\"");
             } else {
@@ -2312,6 +2528,10 @@
     if (strings) {
         /* Just to be safe, allow 20 characters for the timeout value */
         strings[index] = malloc(sizeof(char) * (24 + 20 + 1));
+        if (!strings[index]) {
+            outOfMemory("WBJCAI", 37);
+            return -1;
+        }
         if (addQuotes) {
             sprintf(strings[index], "-Dwrapper.cpu.timeout=\"%d\"", wrapperData->cpuTimeout);
         } else {
@@ -2323,6 +2543,10 @@
     /* Store the Wrapper JVM ID.  (Get here before incremented) */
     if (strings) {
         strings[index] = malloc(sizeof(char) * (16 + 5 + 1));  /* jvmid up to 5 characters */
+        if (!strings[index]) {
+            outOfMemory("WBJCAI", 38);
+            return -1;
+        }
         sprintf(strings[index], "-Dwrapper.jvmid=%d", (wrapperData->jvmRestarts + 1));
     }
     index++;
@@ -2331,6 +2555,10 @@
     if (strings) {
         prop = getStringProperty(properties, "wrapper.java.mainclass", "Main");
         strings[index] = malloc(sizeof(char) * (strlen(prop) + 1));
+        if (!strings[index]) {
+            outOfMemory("WBJCAI", 39);
+            return -1;
+        }
         sprintf(strings[index], "%s", prop);
     }
     index++;
@@ -2352,6 +2580,10 @@
                     }
                     if (stripQuote) {
                         propStripped = malloc(sizeof(char) * (strlen(prop) + 1));
+                        if (!propStripped) {
+                            outOfMemory("WBJCAI", 40);
+                            return -1;
+                        }
                         wrapperStripQuotes(prop, propStripped);
                     } else {
                         propStripped = (char *)prop;
@@ -2360,9 +2592,17 @@
                     if (addQuotes && quotable && strchr(propStripped, ' ')) {
                         len = quoteValue(propStripped, NULL, 0);
                         strings[index] = malloc(len);
+                        if (!strings[index]) {
+                            outOfMemory("WBJCAI", 41);
+                            return -1;
+                        }
                         quoteValue(propStripped, strings[index], len);
                     } else {
                         strings[index] = malloc(sizeof(char) * (strlen(propStripped) + 1));
+                        if (!strings[index]) {
+                            outOfMemory("WBJCAI", 42);
+                            return -1;
+                        }
                         sprintf(strings[index], "%s", propStripped);
                     }
 
@@ -2406,6 +2646,10 @@
 
     /* Allocate the correct amount of memory */
     *stringsPtr = malloc(sizeof(char *) * (*length));
+    if (!stringsPtr) {
+        outOfMemory("WBJCA", 1);
+        return TRUE;
+    }
 
     /* Now actually fill in the strings */
     reqLen = wrapperBuildJavaCommandArrayInner(*stringsPtr, addQuotes);
@@ -2591,7 +2835,12 @@
 
     if (value != NULL) {
         *ptr = malloc(sizeof(char) * (strlen(value) + 1));
-        strcpy(*ptr, value);
+        if (!ptr) {
+            outOfMemory("USV", 1);
+            /* TODO: This is pretty bad.  Not sure how to recover... */
+        } else {
+            strcpy(*ptr, value);
+        }
     }
 }
 
@@ -2605,7 +2854,10 @@
 #define BELOW_NORMAL_PRIORITY_CLASS 0x00004000
 #endif
 
-void wrapperBuildNTServiceInfo() {
+/**
+ * Return FALSE if successful, TRUE if there were problems.
+ */
+int wrapperBuildNTServiceInfo() {
     char dependencyKey[32]; /* Length of "wrapper.ntservice.dependency.nn" + '\0' */
     const char *dependencies[10];
     char *work;
@@ -2650,6 +2902,10 @@
             wrapperData->ntServiceDependencies = NULL;
         }
         work = wrapperData->ntServiceDependencies = malloc(sizeof(char) * len);
+        if (!work) {
+            outOfMemory("WBNTSI", 1);
+            return TRUE;
+        }
         for (i = 0; i < 10; i++) {
             if (dependencies[i] != NULL) {
                 strcpy(work, dependencies[i]);
@@ -2736,6 +2992,8 @@
 
     /* Set the single invocation flag. */
     wrapperData->isSingleInvocation = getBooleanProperty( properties, "wrapper.single_invocation", FALSE );
+
+    return FALSE;
 }
 #endif
 
@@ -2758,7 +3016,10 @@
     }
 }
 
-void wrapperBuildUnixDaemonInfo() {
+/**
+ * Return FALSE if successful, TRUE if there were problems.
+ */
+int wrapperBuildUnixDaemonInfo() {
     if (!wrapperData->configured) {
         /** Get the daemonize flag. */
         wrapperData->daemonize = getBooleanProperty(properties, "wrapper.daemonize", FALSE);
@@ -2772,6 +3033,8 @@
         /** Configure the USR2 signal handler. */
         wrapperData->signalUSR2Mode = getSignalMode(getStringProperty(properties, "wrapper.signal.mode.usr2", NULL), WRAPPER_SIGNAL_MODE_FORWARD);
     }
+
+    return FALSE;
 }
 #endif
 
@@ -2798,6 +3061,9 @@
     }
 }
 
+/**
+ * Return FALSE if successful, TRUE if there were problems.
+ */
 int loadConfiguration() {
     const char* logfilePath;
     int logfileRollMode;
@@ -3097,12 +3363,24 @@
     /* Now that a count is known, allocate memory to hold the filters and actions and load them in. */
     if (wrapperData->outputFilterCount > 0) {
         wrapperData->outputFilters = malloc(sizeof(char *) * wrapperData->outputFilterCount);
+        if (!wrapperData->outputFilters) {
+            outOfMemory("LC", 1);
+            return TRUE;
+        }
         wrapperData->outputFilterActions = malloc(sizeof(int) * wrapperData->outputFilterCount);
+        if (!wrapperData->outputFilterActions) {
+            outOfMemory("LC", 2);
+            return TRUE;
+        }
         for (i = 0; i < wrapperData->outputFilterCount; i++) {
             /* Get the filter */
             sprintf(key, "wrapper.filter.trigger.%d", i + 1);
             val = getStringProperty(properties, key, NULL);
             wrapperData->outputFilters[i] = malloc(sizeof(char) * (strlen(val) + 1));
+            if (!wrapperData->outputFilters[i]) {
+                outOfMemory("LC", 3);
+                return TRUE;
+            }
             strcpy(wrapperData->outputFilters[i], val);
 
             /* Get the action */
@@ -3175,7 +3453,9 @@
 
 #ifdef WIN32
     /* Configure the NT service information */
-    wrapperBuildNTServiceInfo();
+    if (wrapperBuildNTServiceInfo()) {
+        return TRUE;
+    }
 
     if (wrapperData->requestThreadDumpOnFailedJVMExit) {
         if (!wrapperData->ntAllocConsole) {
@@ -3189,12 +3469,14 @@
 
 #else /* UNIX */
     /* Configure the Unix daemon information */
-    wrapperBuildUnixDaemonInfo();
+    if (wrapperBuildUnixDaemonInfo()) {
+        return TRUE;
+    }
 #endif
     
     wrapperData->configured = TRUE;
 
-    return 0;
+    return FALSE;
 }
 
 /**

Modified: trunk/wrapper/src/c/wrapper.h
===================================================================
--- trunk/wrapper/src/c/wrapper.h	2007-03-23 16:32:24 UTC (rev 1315)
+++ trunk/wrapper/src/c/wrapper.h	2007-04-02 07:30:44 UTC (rev 1316)
@@ -338,8 +338,11 @@
 /**
  * Returns the file name base as a newly malloced char *.  The resulting
  *  base file name will have any path and extension stripped.
+ *
+ * baseName should be long enough to always contain the base name.
+ *  (strlen(fileName) + 1) is safe.
  */
-extern char *wrapperGetFileBase(const char *fileName);
+extern void wrapperGetFileBase(const char *fileName, char *baseName);
 
 /**
  * Output the version.

Modified: trunk/wrapper/src/c/wrapper.ico
===================================================================
(Binary files differ)

Modified: trunk/wrapper/src/c/wrapperJNI_VC8.sln
===================================================================
--- trunk/wrapper/src/c/wrapperJNI_VC8.sln	2007-03-23 16:32:24 UTC (rev 1315)
+++ trunk/wrapper/src/c/wrapperJNI_VC8.sln	2007-04-02 07:30:44 UTC (rev 1316)
@@ -1,24 +1,17 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
+?\xBB\xBFMicrosoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "decoderJNI_VC8", "wrapperJNI_VC8.vcproj", "{0BE00FF2-0C30-463A-AF71-84242D234C0D}"
 EndProject
 Global
     GlobalSection(SolutionConfigurationPlatforms) = preSolution
         Debug|Win32 = Debug|Win32
-        Debug|x64 = Debug|x64
         Release|Win32 = Release|Win32
-        Release|x64 = Release|x64
     EndGlobalSection
     GlobalSection(ProjectConfigurationPlatforms) = postSolution
         {0BE00FF2-0C30-463A-AF71-84242D234C0D}.Debug|Win32.ActiveCfg = Debug|Win32
         {0BE00FF2-0C30-463A-AF71-84242D234C0D}.Debug|Win32.Build.0 = Debug|Win32
-        {0BE00FF2-0C30-463A-AF71-84242D234C0D}.Debug|x64.ActiveCfg = Debug|x64
-        {0BE00FF2-0C30-463A-AF71-84242D234C0D}.Debug|x64.Build.0 = Debug|x64
         {0BE00FF2-0C30-463A-AF71-84242D234C0D}.Release|Win32.ActiveCfg = Release|Win32
         {0BE00FF2-0C30-463A-AF71-84242D234C0D}.Release|Win32.Build.0 = Release|Win32
-        {0BE00FF2-0C30-463A-AF71-84242D234C0D}.Release|x64.ActiveCfg = Release|x64
-        {0BE00FF2-0C30-463A-AF71-84242D234C0D}.Release|x64.Build.0 = Release|x64
     EndGlobalSection
     GlobalSection(SolutionProperties) = preSolution
         HideSolutionNode = FALSE

Modified: trunk/wrapper/src/c/wrapperJNI_VC8.vcproj
===================================================================
--- trunk/wrapper/src/c/wrapperJNI_VC8.vcproj	2007-03-23 16:32:24 UTC (rev 1315)
+++ trunk/wrapper/src/c/wrapperJNI_VC8.vcproj	2007-04-02 07:30:44 UTC (rev 1316)
@@ -11,9 +11,6 @@
         <Platform
             Name="Win32"
         />
-        <Platform
-            Name="x64"
-        />
     </Platforms>
     <ToolFiles>
     </ToolFiles>
@@ -182,172 +179,6 @@
                 Name="VCPostBuildEventTool"
             />
         </Configuration>
-        <Configuration
-            Name="Debug|x64"
-            OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-            IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-            ConfigurationType="2"
-            InheritedPropertySheets=".\wrapper.vsprops"
-            UseOfMFC="1"
-            CharacterSet="0"
-            >
-            <Tool
-                Name="VCPreBuildEventTool"
-            />
-            <Tool
-                Name="VCCustomBuildTool"
-            />
-            <Tool
-                Name="VCXMLDataGeneratorTool"
-            />
-            <Tool
-                Name="VCWebServiceProxyGeneratorTool"
-            />
-            <Tool
-                Name="VCMIDLTool"
-                TargetEnvironment="3"
-            />
-            <Tool
-                Name="VCCLCompilerTool"
-                AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot; /D &quot;_CRT_NON_CONFORMING_SWPRINTFS&quot;"
-                Optimization="0"
-                AdditionalIncludeDirectories="..\;&quot;$(ProjectDir)&quot;;&quot;$(javaHome)\include&quot;;&quot;$(javaHome)\include\win32&quot;"
-                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DECODERJNI_VC8_EXPORTS"
-                MinimalRebuild="true"
-                BasicRuntimeChecks="3"
-                RuntimeLibrary="1"
-                StructMemberAlignment="3"
-                UsePrecompiledHeader="0"
-                WarningLevel="3"
-                Detect64BitPortabilityProblems="false"
-                DebugInformationFormat="3"
-            />
-            <Tool
-                Name="VCManagedResourceCompilerTool"
-            />
-            <Tool
-                Name="VCResourceCompilerTool"
-            />
-            <Tool
-                Name="VCPreLinkEventTool"
-            />
-            <Tool
-                Name="VCLinkerTool"
-                AdditionalOptions="advapi32.lib user32.lib"
-                OutputFile="$(InputDir)\..\..\lib\wrapper.dll"
-                LinkIncremental="2"
-                GenerateDebugInformation="true"
-                SubSystem="2"
-                TargetMachine="17"
-            />
-            <Tool
-                Name="VCALinkTool"
-            />
-            <Tool
-                Name="VCManifestTool"
-            />
-            <Tool
-                Name="VCXDCMakeTool"
-            />
-            <Tool
-                Name="VCBscMakeTool"
-            />
-            <Tool
-                Name="VCFxCopTool"
-            />
-            <Tool
-                Name="VCAppVerifierTool"
-            />
-            <Tool
-                Name="VCWebDeploymentTool"
-            />
-            <Tool
-                Name="VCPostBuildEventTool"
-            />
-        </Configuration>
-        <Configuration
-            Name="Release|x64"
-            OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-            IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-            ConfigurationType="2"
-            InheritedPropertySheets=".\wrapper.vsprops"
-            UseOfMFC="1"
-            CharacterSet="0"
-            WholeProgramOptimization="1"
-            >
-            <Tool
-                Name="VCPreBuildEventTool"
-            />
-            <Tool
-                Name="VCCustomBuildTool"
-            />
-            <Tool
-                Name="VCXMLDataGeneratorTool"
-            />
-            <Tool
-                Name="VCWebServiceProxyGeneratorTool"
-            />
-            <Tool
-                Name="VCMIDLTool"
-                TargetEnvironment="3"
-            />
-            <Tool
-                Name="VCCLCompilerTool"
-                AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot; /D &quot;_CRT_NON_CONFORMING_SWPRINTFS&quot;"
-                AdditionalIncludeDirectories="..\;&quot;$(ProjectDir)&quot;;&quot;$(javaHome)\include&quot;;&quot;$(javaHome)\include\win32&quot;"
-                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DECODERJNI_VC8_EXPORTS"
-                RuntimeLibrary="0"
-                StructMemberAlignment="3"
-                UsePrecompiledHeader="0"
-                WarningLevel="3"
-                Detect64BitPortabilityProblems="false"
-                DebugInformationFormat="3"
-            />
-            <Tool
-                Name="VCManagedResourceCompilerTool"
-            />
-            <Tool
-                Name="VCResourceCompilerTool"
-            />
-            <Tool
-                Name="VCPreLinkEventTool"
-            />
-            <Tool
-                Name="VCLinkerTool"
-                AdditionalOptions="advapi32.lib user32.lib"
-                OutputFile="$(InputDir)\..\..\lib\wrapper.dll"
-                LinkIncremental="1"
-                GenerateDebugInformation="true"
-                SubSystem="2"
-                OptimizeReferences="2"
-                EnableCOMDATFolding="2"
-                TargetMachine="17"
-            />
-            <Tool
-                Name="VCALinkTool"
-            />
-            <Tool
-                Name="VCManifestTool"
-            />
-            <Tool
-                Name="VCXDCMakeTool"
-            />
-            <Tool
-                Name="VCBscMakeTool"
-            />
-            <Tool
-                Name="VCFxCopTool"
-            />
-            <Tool
-                Name="VCAppVerifierTool"
-            />
-            <Tool
-                Name="VCWebDeploymentTool"
-            />
-            <Tool
-                Name="VCPostBuildEventTool"
-            />
-        </Configuration>
     </Configurations>
     <References>
     </References>

Modified: trunk/wrapper/src/c/wrapper_VC8.sln
===================================================================
--- trunk/wrapper/src/c/wrapper_VC8.sln	2007-03-23 16:32:24 UTC (rev 1315)
+++ trunk/wrapper/src/c/wrapper_VC8.sln	2007-04-02 07:30:44 UTC (rev 1316)
@@ -5,19 +5,13 @@
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{18A1381E-03E3-486D-B34F-B73D21FBACB3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{18A1381E-03E3-486D-B34F-B73D21FBACB3}.Debug|Win32.Build.0 = Debug|Win32
-		{18A1381E-03E3-486D-B34F-B73D21FBACB3}.Debug|x64.ActiveCfg = Debug|x64
-		{18A1381E-03E3-486D-B34F-B73D21FBACB3}.Debug|x64.Build.0 = Debug|x64
 		{18A1381E-03E3-486D-B34F-B73D21FBACB3}.Release|Win32.ActiveCfg = Release|Win32
 		{18A1381E-03E3-486D-B34F-B73D21FBACB3}.Release|Win32.Build.0 = Release|Win32
-		{18A1381E-03E3-486D-B34F-B73D21FBACB3}.Release|x64.ActiveCfg = Release|x64
-		{18A1381E-03E3-486D-B34F-B73D21FBACB3}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: trunk/wrapper/src/c/wrapper_VC8.vcproj
===================================================================
--- trunk/wrapper/src/c/wrapper_VC8.vcproj	2007-03-23 16:32:24 UTC (rev 1315)
+++ trunk/wrapper/src/c/wrapper_VC8.vcproj	2007-04-02 07:30:44 UTC (rev 1316)
@@ -1,442 +1,270 @@
 <?xml version="1.0" encoding="shift_jis"?>
 <VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="wrapper_VC8"
-	ProjectGUID="{18A1381E-03E3-486D-B34F-B73D21FBACB3}"
-	RootNamespace="wrapper_VC8"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(IntDir)"
-			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				UseUnicodeResponseFiles="false"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="3"
-				BufferSecurityCheck="true"
-				TreatWChar_tAsBuiltInType="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="wsock32.lib shlwapi.lib advapi32.lib user32.lib"
-				OutputFile="$(InputDir)\..\..\bin\wrapper.exe"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames=""
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeForWindows98="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(IntDir)"
-			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				UseUnicodeResponseFiles="false"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				StructMemberAlignment="3"
-				BufferSecurityCheck="true"
-				TreatWChar_tAsBuiltInType="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="wsock32.lib shlwapi.lib advapi32.lib user32.lib"
-				OutputFile="$(InputDir)\..\..\bin\wrapper.exe"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames=""
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeForWindows98="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(IntDir)"
-			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="wsock32.lib shlwapi.lib advapi32.lib user32.lib"
-				OutputFile="$(InputDir)\..\..\bin\wrapper.exe"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames=""
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(IntDir)"
-			IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="0"
-				StructMemberAlignment="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="wsock32.lib shlwapi.lib advapi32.lib user32.lib"
-				OutputFile="$(InputDir)\..\..\bin\wrapper.exe"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames=""
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\logger.c"
-				>
-			</File>
-			<File
-				RelativePath=".\property.c"
-				>
-			</File>
-			<File
-				RelativePath=".\wrapper.c"
-				>
-			</File>
-			<File
-				RelativePath=".\wrapper_unix.c"
-				>
-			</File>
-			<File
-				RelativePath=".\wrapper_win.c"
-				>
-			</File>
-			<File
-				RelativePath=".\wrappereventloop.c"
-				>
-			</File>
-			<File
-				RelativePath=".\wrapperinfo.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\logger.h"
-				>
-			</File>
-			<File
-				RelativePath=".\messages.h"
-				>
-			</File>
-			<File
-				RelativePath=".\property.h"
-				>
-			</File>
-			<File
-				RelativePath=".\resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\wrapper.h"
-				>
-			</File>
-			<File
-				RelativePath=".\wrapperinfo.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath=".\messages.mc"
-				>
-			</File>
-			<File
-				RelativePath=".\Wrapper.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
+    ProjectType="Visual C++"
+    Version="8.00"
+    Name="wrapper_VC8"
+    ProjectGUID="{18A1381E-03E3-486D-B34F-B73D21FBACB3}"
+    RootNamespace="wrapper_VC8"
+    Keyword="Win32Proj"
+    >
+    <Platforms>
+        <Platform
+            Name="Win32"
+        />
+    </Platforms>
+    <ToolFiles>
+    </ToolFiles>
+    <Configurations>
+        <Configuration
+            Name="Debug|Win32"
+            OutputDirectory="$(SolutionDir)$(IntDir)"
+            IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+            ConfigurationType="1"
+            UseOfMFC="1"
+            CharacterSet="0"
+            >
+            <Tool
+                Name="VCPreBuildEventTool"
+            />
+            <Tool
+                Name="VCCustomBuildTool"
+            />
+            <Tool
+                Name="VCXMLDataGeneratorTool"
+            />
+            <Tool
+                Name="VCWebServiceProxyGeneratorTool"
+            />
+            <Tool
+                Name="VCMIDLTool"
+            />
+            <Tool
+                Name="VCCLCompilerTool"
+                UseUnicodeResponseFiles="false"
+                AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
+                Optimization="0"
+                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+                MinimalRebuild="true"
+                BasicRuntimeChecks="3"
+                RuntimeLibrary="1"
+                StructMemberAlignment="3"
+                BufferSecurityCheck="true"
+                TreatWChar_tAsBuiltInType="true"
+                UsePrecompiledHeader="0"
+                WarningLevel="3"
+                Detect64BitPortabilityProblems="true"
+                DebugInformationFormat="4"
+            />
+            <Tool
+                Name="VCManagedResourceCompilerTool"
+            />
+            <Tool
+                Name="VCResourceCompilerTool"
+            />
+            <Tool
+                Name="VCPreLinkEventTool"
+            />
+            <Tool
+                Name="VCLinkerTool"
+                AdditionalOptions="wsock32.lib shlwapi.lib advapi32.lib user32.lib"
+                OutputFile="$(InputDir)\..\..\bin\wrapper.exe"
+                LinkIncremental="2"
+                IgnoreDefaultLibraryNames=""
+                GenerateDebugInformation="true"
+                SubSystem="1"
+                OptimizeForWindows98="2"
+                TargetMachine="1"
+            />
+            <Tool
+                Name="VCALinkTool"
+            />
+            <Tool
+                Name="VCManifestTool"
+            />
+            <Tool
+                Name="VCXDCMakeTool"
+            />
+            <Tool
+                Name="VCBscMakeTool"
+            />
+            <Tool
+                Name="VCFxCopTool"
+            />
+            <Tool
+                Name="VCAppVerifierTool"
+            />
+            <Tool
+                Name="VCWebDeploymentTool"
+            />
+            <Tool
+                Name="VCPostBuildEventTool"
+            />
+        </Configuration>
+        <Configuration
+            Name="Release|Win32"
+            OutputDirectory="$(SolutionDir)$(IntDir)"
+            IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)"
+            ConfigurationType="1"
+            UseOfMFC="1"
+            CharacterSet="0"
+            WholeProgramOptimization="1"
+            >
+            <Tool
+                Name="VCPreBuildEventTool"
+            />
+            <Tool
+                Name="VCCustomBuildTool"
+            />
+            <Tool
+                Name="VCXMLDataGeneratorTool"
+            />
+            <Tool
+                Name="VCWebServiceProxyGeneratorTool"
+            />
+            <Tool
+                Name="VCMIDLTool"
+            />
+            <Tool
+                Name="VCCLCompilerTool"
+                AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
+                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+                RuntimeLibrary="0"
+                StructMemberAlignment="3"
+                UsePrecompiledHeader="0"
+                WarningLevel="3"
+                Detect64BitPortabilityProblems="true"
+                DebugInformationFormat="3"
+            />
+            <Tool
+                Name="VCManagedResourceCompilerTool"
+            />
+            <Tool
+                Name="VCResourceCompilerTool"
+            />
+            <Tool
+                Name="VCPreLinkEventTool"
+            />
+            <Tool
+                Name="VCLinkerTool"
+                AdditionalOptions="wsock32.lib shlwapi.lib advapi32.lib user32.lib"
+                OutputFile="$(InputDir)\..\..\bin\wrapper.exe"
+                LinkIncremental="1"
+                IgnoreDefaultLibraryNames=""
+                GenerateDebugInformation="true"
+                SubSystem="1"
+                OptimizeReferences="2"
+                EnableCOMDATFolding="2"
+                OptimizeForWindows98="2"
+                TargetMachine="1"
+            />
+            <Tool
+                Name="VCALinkTool"
+            />
+            <Tool
+                Name="VCManifestTool"
+            />
+            <Tool
+                Name="VCXDCMakeTool"
+            />
+            <Tool
+                Name="VCBscMakeTool"
+            />
+            <Tool
+                Name="VCFxCopTool"
+            />
+            <Tool
+                Name="VCAppVerifierTool"
+            />
+            <Tool
+                Name="VCWebDeploymentTool"
+            />
+            <Tool
+                Name="VCPostBuildEventTool"
+            />
+        </Configuration>
+    </Configurations>
+    <References>
+    </References>
+    <Files>
+        <Filter
+            Name="Source Files"
+            Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+            UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+            >
+            <File
+                RelativePath=".\logger.c"
+                >
+            </File>
+            <File
+                RelativePath=".\property.c"
+                >
+            </File>
+            <File
+                RelativePath=".\wrapper.c"
+                >
+            </File>
+            <File
+                RelativePath=".\wrapper_unix.c"
+                >
+            </File>
+            <File
+                RelativePath=".\wrapper_win.c"
+                >
+            </File>
+            <File
+                RelativePath=".\wrappereventloop.c"
+                >
+            </File>
+            <File
+                RelativePath=".\wrapperinfo.c"
+                >
+            </File>
+        </Filter>
+        <Filter
+            Name="Header Files"
+            Filter="h;hpp;hxx;hm;inl;inc;xsd"
+            UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+            >
+            <File
+                RelativePath=".\logger.h"
+                >
+            </File>
+            <File
+                RelativePath=".\messages.h"
+                >
+            </File>
+            <File
+                RelativePath=".\property.h"
+                >
+            </File>
+            <File
+                RelativePath=".\resource.h"
+                >
+            </File>
+            <File
+                RelativePath=".\wrapper.h"
+                >
+            </File>
+            <File
+                RelativePath=".\wrapperinfo.h"
+                >
+            </File>
+        </Filter>
+        <Filter
+            Name="Resource Files"
+            Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+            UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+            >
+            <File
+                RelativePath=".\messages.mc"
+                >
+            </File>
+            <File
+                RelativePath=".\Wrapper.rc"
+                >
+            </File>
+        </Filter>
+    </Files>
+    <Globals>
+    </Globals>
 </VisualStudioProject>

Modified: trunk/wrapper/src/c/wrapper_unix.c
===================================================================
--- trunk/wrapper/src/c/wrapper_unix.c	2007-03-23 16:32:24 UTC (rev 1315)
+++ trunk/wrapper/src/c/wrapper_unix.c	2007-04-02 07:30:44 UTC (rev 1316)
@@ -708,11 +708,19 @@
     }
 
     /* Allocate memory to hold array of command strings */
-    wrapperData->jvmCommand = malloc(sizeof(char *) * (length + 1)); 
+    wrapperData->jvmCommand = malloc(sizeof(char *) * (length + 1));
+    if (!wrapperData->jvmCommand) {
+        outOfMemory("WBJC", 1);
+        return TRUE;
+    }
     /*                        number of arguments + 1 for a NULL pointer at the end */
     for (i = 0; i <= length; i++) {
         if (i < length) {
             wrapperData->jvmCommand[i] = malloc(sizeof(char) * (strlen(strings[i]) + 1));
+            if (!wrapperData->jvmCommand[i]) {
+                outOfMemory("WBJC", 2);
+                return TRUE;
+            }
             strcpy(wrapperData->jvmCommand[i], strings[i]);
         } else {
             wrapperData->jvmCommand[i] = NULL;
@@ -990,12 +998,19 @@
 int childOutputBufferSize = 0;
 /**
  * Make sure there is enough space in the outputBuffer.
+ *
+ * return TRUE if there were any problems.
  */
-void ensureSpaceInChildOutputBuffer(int childOutputBufferPos, int requiredSpace) {
+int ensureSpaceInChildOutputBuffer(int childOutputBufferPos, int requiredSpace) {
     char *tempBuf;
     
     if ( childOutputBufferPos >= childOutputBufferSize - requiredSpace ) {
         tempBuf = malloc(sizeof(char) * (childOutputBufferSize + 1024));
+        if (!tempBuf) {
+            outOfMemory("ESICOB", 1);
+            return TRUE;
+        }
+
         if (childOutputBuffer != NULL) {
             /* Copy over the old data */
             memcpy(tempBuf, childOutputBuffer, childOutputBufferSize);
@@ -1006,6 +1021,8 @@
         childOutputBuffer = tempBuf;
         childOutputBufferSize += 1024;
     }
+
+    return FALSE;
 }
 
 /**
@@ -1091,7 +1108,9 @@
 
                 if (childOutputBufferPos > 0) {
                     /* We have a partial line, write it out so it is not lost. */
-                    ensureSpaceInChildOutputBuffer( childOutputBufferPos, 1 );
+                    if (ensureSpaceInChildOutputBuffer( childOutputBufferPos, 1 )) {
+                        return 0;
+                    }
                     childOutputBuffer[childOutputBufferPos] = '\0';
                     wrapperLogChildOutput(childOutputBuffer);
                     childOutputBufferPos = 0;
@@ -1107,7 +1126,9 @@
             for (readBufPos = 0; readBufPos < bytesRead; readBufPos++) {
                 if (readBuf[readBufPos] == (char)0x0a) {
                     /* Line feed; write out buffer and reset it. */
-                    ensureSpaceInChildOutputBuffer( childOutputBufferPos, 1 );
+                    if (ensureSpaceInChildOutputBuffer( childOutputBufferPos, 1 )) {
+                        return 0;
+                    }
                     childOutputBuffer[childOutputBufferPos] = '\0';
                     wrapperLogChildOutput(childOutputBuffer);
                     childOutputBufferPos = 0;
@@ -1117,7 +1138,9 @@
                         return -1;
                     }
                 } else {
-                    ensureSpaceInChildOutputBuffer( childOutputBufferPos, 2 );
+                    if (ensureSpaceInChildOutputBuffer( childOutputBufferPos, 2 )) {
+                        return 0;
+                    }
 
                     /* Add character to write buffer. */
                     childOutputBuffer[childOutputBufferPos++] = readBuf[readBufPos];
@@ -1386,6 +1409,8 @@
         return 1; /* For compiler. */
     }
 
+    wrapperVersionBanner();
+
     /* Change the working directory if configured to do so. */
     if (wrapperData->workingDir && wrapperSetWorkingDir(wrapperData->workingDir)) {
         appExit(1);

Modified: trunk/wrapper/src/c/wrapper_win.c
===================================================================
--- trunk/wrapper/src/c/wrapper_win.c	2007-03-23 16:32:24 UTC (rev 1315)
+++ trunk/wrapper/src/c/wrapper_win.c	2007-04-02 07:30:44 UTC (rev 1316)
@@ -156,7 +156,7 @@
 /**
  * Builds an array in memory of the system path.
  */
-void buildSystemPath() {
+int buildSystemPath() {
     char *envBuffer;
     size_t len, i;
     char *c, *lc;
@@ -164,13 +164,17 @@
     /* Get the length of the PATH environment variable. */
     len = GetEnvironmentVariable("PATH", NULL, 0);
     if (len == 0) {
-        /* PATH not set on this system */
+        /* PATH not set on this system.  Not an error. */
         systemPath[0] = NULL;
-        return;
+        return 0;
     }
 
     /* Allocate the memory to hold the PATH */
     envBuffer = malloc(sizeof(char) * len);
+    if (!envBuffer) {
+        outOfMemory("BSP", 1);
+        return 1;
+    }
     GetEnvironmentVariable("PATH", envBuffer, (DWORD)len);
 
 #ifdef _DEBUG
@@ -187,6 +191,11 @@
     {
         len = (int)(c - lc);
         systemPath[i] = malloc(sizeof(char) * (len + 1));
+        if (!systemPath[i]) {
+            outOfMemory("BSP", 2);
+            return 1;
+        }
+
         memcpy(systemPath[i], lc, len);
         systemPath[i][len] = '\0';
 #ifdef _DEBUG
@@ -198,6 +207,10 @@
     /* There should be one more value after the last ';' */
     len = strlen(lc);
     systemPath[i] = malloc(sizeof(char) * (len + 1));
+    if (!systemPath[i]) {
+        outOfMemory("BSP", 3);
+        return 1;
+    }
     strcpy(systemPath[i], lc);
 #ifdef _DEBUG
     printf("PATH[%d]=%s\n", i, systemPath[i]);
@@ -212,6 +225,8 @@
 
     /* Release the environment variable memory. */
     free(envBuffer);
+
+    return 0;
 }
 char** wrapperGetSystemPath() {
     return systemPath;
@@ -226,6 +241,10 @@
     char *mutexName;
     if (wrapperData->isSingleInvocation) {
         mutexName = malloc(sizeof(char) * (23 + strlen(wrapperData->ntServiceName) + 1));
+        if (!mutexName) {
+            outOfMemory("IIM", 1);
+            return 1;
+        }
         sprintf(mutexName, "Java Service Wrapper - %s", wrapperData->ntServiceName);
         
         if (!(invocationMutexHandle = CreateMutex(NULL, FALSE, mutexName))) {
@@ -634,6 +653,10 @@
 
     /* Build the actual command */
     wrapperData->jvmCommand = malloc(sizeof(char) * commandLen);
+    if (!wrapperData->jvmCommand) {
+        outOfMemory("WBJC", 1);
+        return TRUE;
+    }
     commandLen = 0;
     for (i = 0; i < length; i++) {
         if (i > 0) {
@@ -1036,7 +1059,7 @@
          *  This is so that we can always add a \0 to the end of it. */
         wrapperChildStdoutRdBuffer = malloc(sizeof(CHAR) * (READ_BUFFER_BLOCK_SIZE + 1));
         if (!wrapperChildStdoutRdBuffer) {
-         log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_FATAL, "Out of memory allocating child read buffer.");
+            outOfMemory("WRCO", 1);
             return 0;
         }
         wrapperChildStdoutRdBufferSize = READ_BUFFER_BLOCK_SIZE + 1;
@@ -1077,6 +1100,10 @@
                 wrapperChildStdoutRdBufferSize, wrapperChildStdoutRdBufferSize + READ_BUFFER_BLOCK_SIZE);
             */
             newBuffer = malloc(sizeof(char) * (wrapperChildStdoutRdBufferSize + READ_BUFFER_BLOCK_SIZE));
+            if (!newBuffer) {
+                outOfMemory("WRCO", 2);
+                return 0;
+            }
             strcpy(newBuffer, wrapperChildStdoutRdBuffer);
             bufferP = newBuffer + (bufferP - wrapperChildStdoutRdBuffer);
             free(wrapperChildStdoutRdBuffer);
@@ -1995,6 +2022,11 @@
     int cnt = 0;
     
     buffer = malloc(sizeof(char) * 65);
+    if (!buffer) {
+        outOfMemory("RP", 1);
+        appExit(0);
+        return NULL;
+    }
     buffer[0] = 0;
     
     do {
@@ -2277,7 +2309,9 @@
 #endif
                     /* Found an environment variable in the registry.  Set it to the current environment. */
                     envKeys[dwIndex] = malloc(MAX_PROPERTY_NAME_LENGTH - 1 + MAX_PROPERTY_VALUE_LENGTH - 1 + 2);
-                    if (envKeys[dwIndex] != NULL) {
+                    if (!envKeys[dwIndex]) {
+                        outOfMemory("WLEFRI", 1);
+                    } else {
                         sprintf(envKeys[dwIndex], "%s=%s", name, data);
                         if (_putenv(envKeys[dwIndex])) {
                             log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_FATAL, "Unable to set environment variable from the registry - %s", getLastErrorText());
@@ -2491,6 +2525,11 @@
             return 0;
         }
         value = malloc(valueSize);
+        if (!value) {
+            outOfMemory("WGJFWR", 1);
+            RegCloseKey(openHKey);
+            return 0;
+        }
         if (RegQueryValueEx(openHKey, valueKey, NULL, &valueType, value, &valueSize) != ERROR_SUCCESS) {
             log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_ERROR,
                 "Unable to access configured registry location %s - (%d)", prop, errno);
@@ -2551,6 +2590,11 @@
             return 0;
         }
         value = malloc(valueSize);
+        if (!value) {
+            outOfMemory("WGJFWR", 2);
+            RegCloseKey(openHKey);
+            return 0;
+        }
         if (RegQueryValueEx(openHKey, "JavaHome", NULL, &valueType, value, &valueSize) != ERROR_SUCCESS) {
             RegCloseKey(openHKey);
             return 0;
@@ -3078,6 +3122,11 @@
             /* Get the service configuration. */
             QueryServiceConfig(schService, NULL, 0, &reqSize);
             pQueryServiceConfig = malloc(reqSize);
+            if (!pQueryServiceConfig) {
+                outOfMemory("WSS", 1);
+                CloseServiceHandle(schSCManager);
+                return 0;
+            }
             if (QueryServiceConfig(schService, pQueryServiceConfig, reqSize, &reqSize)) {
                 switch (pQueryServiceConfig->dwStartType) {
                 case SERVICE_BOOT_START:   /* Possible? */
@@ -3239,14 +3288,30 @@
  * Sets the working directory to that of the current executable
  */
 int setWorkingDir() {
-    char szPath[512];
+    int size = 128;
+    char* szPath = NULL;
+    int result;
     char* pos;
-    
-    /* Get the full path and filename of this program */
-    if (GetModuleFileName(NULL, szPath, 512) == 0){
-        log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_FATAL, "Unable to get the path-%s", getLastErrorText());
-        return 1;
-    }
+   
+    /* How large a buffer is needed? The GetModuleFileName function doesn't tell us how much
+     *  is needed, only if it is too short. */
+    do {
+        szPath = malloc(sizeof(TCHAR) * size);
+        if (!szPath) {
+            outOfMemory("SWD", 1);
+            return 1;
+        }
+        result = GetModuleFileName(NULL, szPath, size);
+        if (result <= 0) {
+            log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_FATAL, "Unable to get the path-%s", getLastErrorText());
+            return 1;
+        } else if (result >= size) {
+            /* Too small. */
+            size += 128;
+            free(szPath);
+            szPath = NULL;
+        }
+    } while (!szPath);
 
     /* The wrapperData->isDebugging flag will never be set here, so we can't really use it. */
 #ifdef _DEBUG
@@ -3257,13 +3322,17 @@
     pos = strrchr(szPath, '\\');
     if (pos == NULL) {
         log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_FATAL, "Unable to extract path from: %s", szPath);
+        free(szPath);
         return 1;
     } else {
         /* Clip the path at the position of the last backslash */
         pos[0] = (char)0;
     }
 
-    return wrapperSetWorkingDir(szPath);
+    result = wrapperSetWorkingDir(szPath);
+    free(szPath);
+
+    return result;
 }
 
 /******************************************************************************
@@ -3353,7 +3422,9 @@
     exName = getExceptionName(exCode);
     if (exName == NULL) {
         exName = malloc(sizeof(char) * 64);  /* Let this leak.  It only happens once before shutdown. */
-        sprintf(exName, "Unknown Exception (%ld)", exCode);
+        if (exName) {
+            sprintf(exName, "Unknown Exception (%ld)", exCode);
+        }
     }
 
     log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_FATAL, "  exceptionCode    = %s", exName);
@@ -3363,10 +3434,10 @@
     if (exCode == EXCEPTION_ACCESS_VIOLATION) {
         if (exceptionPointers->ExceptionRecord->ExceptionInformation[0] == 0) {
             log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_FATAL, "  Read access exception from %p", 
-                (int)exceptionPointers->ExceptionRecord->ExceptionInformation[1]);
+                exceptionPointers->ExceptionRecord->ExceptionInformation[1]);
         } else {
             log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_FATAL, "  Write access exception to %p", 
-                (int)exceptionPointers->ExceptionRecord->ExceptionInformation[1]);
+                exceptionPointers->ExceptionRecord->ExceptionInformation[1]);
         }
     } else {
         for (i = 0; i < (int)exceptionPointers->ExceptionRecord->NumberParameters; i++) {
@@ -3391,7 +3462,10 @@
      * the table; */
     SERVICE_TABLE_ENTRY serviceTable[2];
 
-    buildSystemPath();
+    if (buildSystemPath()) {
+        appExit(1);
+        return; /* For clarity. */
+    }
 
     if (wrapperInitialize()) {
         appExit(1);

Modified: trunk/wrapper/src/c/wrapperjni_unix.c
===================================================================
--- trunk/wrapper/src/c/wrapperjni_unix.c	2007-03-23 16:32:24 UTC (rev 1315)
+++ trunk/wrapper/src/c/wrapperjni_unix.c	2007-04-02 07:30:44 UTC (rev 1316)
@@ -90,7 +90,10 @@
 }
 
 int wrapperReleaseControlEventQueue() {
-    pthread_mutex_unlock(&controlEventQueueMutex);
+    if (pthread_mutex_unlock(&controlEventQueueMutex)) {
+        printf("WrapperJNI Error: Failed to unlock the event queue mutex.\n");
+        fflush(NULL);
+    }
     return 0;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1341
          http://svn.sourceforge.net/wrapper/?rev=1341&view=rev
Author:   mortenson
Date:     2007-04-12 03:28:20 -0700 (Thu, 12 Apr 2007)

Log Message:
-----------
Make some functions involving property values more open so they can be used from other locations.

Modified Paths:
--------------
    trunk/wrapper/src/c/wrapper.c
    trunk/wrapper/src/c/wrapper.h

Modified: trunk/wrapper/src/c/wrapper.c
===================================================================
--- trunk/wrapper/src/c/wrapper.c	2007-04-12 06:14:16 UTC (rev 1340)
+++ trunk/wrapper/src/c/wrapper.c	2007-04-12 10:28:20 UTC (rev 1341)
@@ -1552,7 +1552,7 @@
  *  escaped correctly.  If the bufferSize is not large enough then the
  *  required size will be returned.  0 is returned if successful.
  */
-size_t quoteValue(const char* value, char *buffer, size_t bufferSize) {
+size_t wrapperQuoteValue(const char* value, char *buffer, size_t bufferSize) {
     size_t len = strlen(value);
     size_t in = 0;
     size_t out = 0;
@@ -1613,7 +1613,11 @@
     }
 }
 
-int checkQuotes(const char *value, const char *propName) {
+/**
+ * Checks the quotes in the value and displays an error if there are any problems.
+ * This can be useful to help users debug quote problems.
+ */
+int wrapperCheckQuotes(const char *value, const char *propName) {
     size_t len = strlen(value);
     size_t in = 0;
     size_t in2 = 0;
@@ -1773,7 +1777,7 @@
         }
 
         if (addQuotes) {
-            checkQuotes(strings[index], "wrapper.java.command");
+            wrapperCheckQuotes(strings[index], "wrapper.java.command");
         }
 
 #else /* UNIX */
@@ -1843,13 +1847,13 @@
                         }
 
                         if (addQuotes && quotable && strchr(propStripped, ' ')) {
-                            len = quoteValue(propStripped, NULL, 0);
+                            len = wrapperQuoteValue(propStripped, NULL, 0);
                             strings[index] = malloc(len);
                             if (!strings[index]) {
                                 outOfMemory("WBJCAI", 6);
                                 return -1;
                             }
-                            quoteValue(propStripped, strings[index], len);
+                            wrapperQuoteValue(propStripped, strings[index], len);
                         } else {
                             strings[index] = malloc(sizeof(char) * (strlen(propStripped) + 1));
                             if (!strings[index]) {
@@ -1860,7 +1864,7 @@
                         }
 
                         if (addQuotes) {
-                            checkQuotes(strings[index], paramBuffer);
+                            wrapperCheckQuotes(strings[index], paramBuffer);
                         }
 
                         if (stripQuote) {
@@ -1983,7 +1987,7 @@
             }
 
             if (addQuotes) {
-                checkQuotes(strings[index], "wrapper.java.library.path");
+                wrapperCheckQuotes(strings[index], "wrapper.java.library.path");
             }
         } else {
             /* Look for a multiline library path. */
@@ -2086,7 +2090,7 @@
             }
 
             if (addQuotes) {
-                checkQuotes(strings[index], "wrapper.java.library.path.<n>");
+                wrapperCheckQuotes(strings[index], "wrapper.java.library.path.<n>");
             }
         }
     }
@@ -2322,7 +2326,7 @@
         }
 
         if (addQuotes) {
-            checkQuotes(strings[index], "wrapper.java.classpath.<n>");
+            wrapperCheckQuotes(strings[index], "wrapper.java.classpath.<n>");
         }
     }
     index++;
@@ -2616,13 +2620,13 @@
                     }
 
                     if (addQuotes && quotable && strchr(propStripped, ' ')) {
-                        len = quoteValue(propStripped, NULL, 0);
+                        len = wrapperQuoteValue(propStripped, NULL, 0);
                         strings[index] = malloc(len);
                         if (!strings[index]) {
                             outOfMemory("WBJCAI", 41);
                             return -1;
                         }
-                        quoteValue(propStripped, strings[index], len);
+                        wrapperQuoteValue(propStripped, strings[index], len);
                     } else {
                         strings[index] = malloc(sizeof(char) * (strlen(propStripped) + 1));
                         if (!strings[index]) {
@@ -2633,7 +2637,7 @@
                     }
 
                     if (addQuotes) {
-                        checkQuotes(strings[index], paramBuffer);
+                        wrapperCheckQuotes(strings[index], paramBuffer);
                     }
 
                     if (stripQuote) {

Modified: trunk/wrapper/src/c/wrapper.h
===================================================================
--- trunk/wrapper/src/c/wrapper.h	2007-04-12 06:14:16 UTC (rev 1340)
+++ trunk/wrapper/src/c/wrapper.h	2007-04-12 10:28:20 UTC (rev 1341)
@@ -534,6 +534,31 @@
 extern void wrapperRestartProcess(int useLoggerQueue);
 
 /**
+ * Loops over and strips all double quotes from prop and places the
+ *  stripped version into propStripped.
+ *
+ * The exception is double quotes that are preceeded by a backslash
+ *  in this case the backslash is stripped.
+ *
+ * If two backslashes are found in a row, then the first escapes the
+ *  second and the second is removed.
+ */
+extern void wrapperStripQuotes(const char *prop, char *propStripped);
+
+/**
+ * Adds quotes around the specified string in such a way that everything is
+ *  escaped correctly.  If the bufferSize is not large enough then the
+ *  required size will be returned.  0 is returned if successful.
+ */
+extern size_t wrapperQuoteValue(const char* value, char *buffer, size_t bufferSize);
+
+/**
+ * Checks the quotes in the value and displays an error if there are any problems.
+ * This can be useful to help users debug quote problems.
+ */
+extern int wrapperCheckQuotes(const char *value, const char *propName);
+
+/**
  * The main event loop for the wrapper.  Handles all state changes and events.
  */
 extern void wrapperEventLoop();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1342
          http://svn.sourceforge.net/wrapper/?rev=1342&view=rev
Author:   mortenson
Date:     2007-04-12 07:10:45 -0700 (Thu, 12 Apr 2007)

Log Message:
-----------
Move wrapper and java PIDs into the wrapperData structure.

Modified Paths:
--------------
    trunk/wrapper/src/c/wrapper.c
    trunk/wrapper/src/c/wrapper.h
    trunk/wrapper/src/c/wrapper_unix.c
    trunk/wrapper/src/c/wrapper_win.c

Modified: trunk/wrapper/src/c/wrapper.c
===================================================================
--- trunk/wrapper/src/c/wrapper.c	2007-04-12 10:28:20 UTC (rev 1341)
+++ trunk/wrapper/src/c/wrapper.c	2007-04-12 14:10:45 UTC (rev 1342)
@@ -2414,7 +2414,7 @@
             outOfMemory("WBJCAI", 28);
             return -1;
         }
-        sprintf(strings[index], "-Dwrapper.pid=%d", wrapperGetPID());
+        sprintf(strings[index], "-Dwrapper.pid=%d", wrapperData->wrapperPID);
     }
     index++;
 

Modified: trunk/wrapper/src/c/wrapper.h
===================================================================
--- trunk/wrapper/src/c/wrapper.h	2007-04-12 10:28:20 UTC (rev 1341)
+++ trunk/wrapper/src/c/wrapper.h	2007-04-12 14:10:45 UTC (rev 1342)
@@ -177,6 +177,13 @@
     int     shutdownTimeout;        /* Number of seconds the wrapper will wait for a JVM to shutdown */
     int     jvmExitTimeout;         /* Number of seconds the wrapper will wait for a JVM to process to terminate */
 
+#ifdef WIN32
+    DWORD   wrapperPID;             /* PID of the Wrapper process. */
+    DWORD   javaPID;                /* PID of the Java process. */
+#else
+    pid_t   wrapperPID;             /* PID of the Wrapper process. */
+    pid_t   javaPID;                /* PID of the Java process. */
+#endif
     int     wState;                 /* The current state of the wrapper */
     int     jState;                 /* The current state of the jvm */
     DWORD   jStateTimeoutTicks;     /* Tick count until which the current jState is valid */
@@ -482,11 +489,6 @@
 extern DWORD wrapperGetTicks();
 
 /**
- * Returns the PID of the Wrapper process.
- */
-extern int wrapperGetPID();
-
-/**
  * Outputs a log entry at regular intervals to track the memory usage of the
  *  Wrapper and its JVM.
  */

Modified: trunk/wrapper/src/c/wrapper_unix.c
===================================================================
--- trunk/wrapper/src/c/wrapper_unix.c	2007-04-12 10:28:20 UTC (rev 1341)
+++ trunk/wrapper/src/c/wrapper_unix.c	2007-04-12 14:10:45 UTC (rev 1342)
@@ -83,7 +83,6 @@
 #define max(x,y) (((x) > (y)) ? (x) : (y)) 
 #define min(x,y) (((x) < (y)) ? (x) : (y)) 
 
-static pid_t jvmPid = -1;
 int          jvmOut = -1;
 
 /* Define a global pipe descriptor so that we don't have to keep allocating
@@ -180,7 +179,7 @@
 void wrapperRequestDumpJVMState(int useLoggerQueue) {
     log_printf_queue(useLoggerQueue, WRAPPER_SOURCE_WRAPPER, LEVEL_STATUS,
         "Dumping JVM state.");
-    if (kill(jvmPid, SIGQUIT) < 0) {
+    if (kill(wrapperData->javaPID, SIGQUIT) < 0) {
         log_printf_queue(useLoggerQueue, WRAPPER_SOURCE_WRAPPER, LEVEL_ERROR,
                    "Could not dump JVM state: %s", getLastErrorText());
     }
@@ -342,12 +341,12 @@
                 break;
 
             case WRAPPER_SIGNAL_MODE_FORWARD:
-                if (jvmPid > 0) {
+                if (wrapperData->javaPID > 0) {
                     if (wrapperData->isDebugging) {
                         log_printf_queue(TRUE, WRAPPER_SOURCE_WRAPPER, LEVEL_DEBUG,
                             "%s trapped.  Forwarding to JVM process.", sigName);
                     }
-                    if (kill(jvmPid, sigNum)) {
+                    if (kill(wrapperData->javaPID, sigNum)) {
                         log_printf_queue(TRUE, WRAPPER_SOURCE_WRAPPER, LEVEL_WARN,
                             "Unable to forward %s signal to JVM process.  %s", sigName, getLastErrorText());
                     }
@@ -817,7 +816,7 @@
             exit(1);
         } else {
             /* We are the parent side. */
-            jvmPid = proc;
+            wrapperData->javaPID = proc;
             jvmOut = pipedes[STDIN_FILENO];
             
             /* Restore the auto close flag. */
@@ -840,7 +839,7 @@
 
             /* If a java pid filename is specified then write the pid of the java process. */
             if (wrapperData->javaPidFilename) {
-                if (writePidFile(wrapperData->javaPidFilename, jvmPid, wrapperData->javaPidFileUmask)) {
+                if (writePidFile(wrapperData->javaPidFilename, wrapperData->javaPID, wrapperData->javaPidFileUmask)) {
                     log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_WARN,
                         "Unable to write the Java PID file: %s", wrapperData->javaPidFilename);
                 }
@@ -873,13 +872,6 @@
 }
 
 /**
- * Returns the PID of the Wrapper process.
- */
-int wrapperGetPID() {
-    return (int)getpid();
-}
-
-/**
  * Outputs a log entry at regular intervals to track the memory usage of the
  *  Wrapper and its JVM.
  */
@@ -924,7 +916,7 @@
     int exitCode;
     int res;
 
-    retval = waitpid(jvmPid, &status, WNOHANG | WUNTRACED);
+    retval = waitpid(wrapperData->javaPID, &status, WNOHANG | WUNTRACED);
     if (retval == 0) {
         /* Up and running. */
         if (sigChild && wrapperData->jvmStopped) {
@@ -1159,12 +1151,12 @@
  */
 void wrapperKillProcessNow() {
     /* Check to make sure that the JVM process is still running */
-    if (waitpid(jvmPid, NULL, WNOHANG) == 0) {
+    if (waitpid(wrapperData->javaPID, NULL, WNOHANG) == 0) {
         /* JVM is still up when it should have already stopped itself. */
 
         /* The JVM process is not responding so the only choice we have is to
          *  kill it. */
-        if (kill(jvmPid, SIGKILL)) {
+        if (kill(wrapperData->javaPID, SIGKILL)) {
             log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_ERROR, "JVM did not exit on request.");
             log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_ERROR,
                 "  Attempt to terminate process failed: %s", getLastErrorText());
@@ -1180,7 +1172,7 @@
     }
 
     wrapperSetJavaState(FALSE, WRAPPER_JSTATE_DOWN, -1, -1);
-    jvmPid = -1;
+    wrapperData->javaPID = -1;
 
     /* Remove java pid file if it was registered and created by this process. */
     if (wrapperData->javaPidFilename) {
@@ -1201,7 +1193,7 @@
     int delay = 0;
 
     /* Check to make sure that the JVM process is still running */
-    if (waitpid(jvmPid, NULL, WNOHANG) == 0) {
+    if (waitpid(wrapperData->javaPID, NULL, WNOHANG) == 0) {
         /* JVM is still up when it should have already stopped itself. */
         if (wrapperData->requestThreadDumpOnFailedJVMExit) {
             wrapperRequestDumpJVMState(useLoggerQueue);
@@ -1425,6 +1417,9 @@
         if (wrapperData->daemonize) {
             daemonize();
         }
+        
+        /* Get the current process. */
+        wrapperData->wrapperPID = getpid();
 
         /* See if the logs should be rolled on Wrapper startup. */
         if ((getLogfileRollMode() & ROLL_MODE_WRAPPER) ||
@@ -1435,7 +1430,7 @@
         /* Write pid and anchor files as requested.  If they are the same file the file is
          *  simply overwritten. */
         if (wrapperData->anchorFilename) {
-            if (writePidFile(wrapperData->anchorFilename, (int)getpid(), wrapperData->anchorFileUmask)) {
+            if (writePidFile(wrapperData->anchorFilename, wrapperData->wrapperPID, wrapperData->anchorFileUmask)) {
                 log_printf
                     (WRAPPER_SOURCE_WRAPPER, LEVEL_FATAL,
                      "ERROR: Could not write anchor file %s: %s",
@@ -1445,7 +1440,7 @@
             }
         }
         if (wrapperData->pidFilename) {
-            if (writePidFile(wrapperData->pidFilename, (int)getpid(), wrapperData->pidFileUmask)) {
+            if (writePidFile(wrapperData->pidFilename, wrapperData->wrapperPID, wrapperData->pidFileUmask)) {
                 log_printf
                     (WRAPPER_SOURCE_WRAPPER, LEVEL_FATAL,
                      "ERROR: Could not write pid file %s: %s",
@@ -1455,7 +1450,7 @@
             }
         }
         if (wrapperData->lockFilename) {
-            if (writePidFile(wrapperData->lockFilename, (int)getpid(), wrapperData->lockFileUmask)) {
+            if (writePidFile(wrapperData->lockFilename, wrapperData->wrapperPID, wrapperData->lockFileUmask)) {
                 /* This will fail if the user is running as a user without full privileges.
                  *  To make things easier for user configuration, this is ignored if sufficient
                  *  privileges do not exist. */

Modified: trunk/wrapper/src/c/wrapper_win.c
===================================================================
--- trunk/wrapper/src/c/wrapper_win.c	2007-04-12 10:28:20 UTC (rev 1341)
+++ trunk/wrapper/src/c/wrapper_win.c	2007-04-12 14:10:45 UTC (rev 1342)
@@ -78,9 +78,7 @@
 #define SYSTEM_PATH_MAX_LEN 256
 static char *systemPath[SYSTEM_PATH_MAX_LEN];
 static HANDLE wrapperProcess = NULL;
-static DWORD  wrapperProcessId = 0;
 static HANDLE javaProcess = NULL;
-static DWORD  javaProcessId = 0;
 static HANDLE wrapperChildStdoutWr = INVALID_HANDLE_VALUE;
 static HANDLE wrapperChildStdoutRd = INVALID_HANDLE_VALUE;
 
@@ -596,8 +594,8 @@
         log_printf_queue(useLoggerQueue, WRAPPER_SOURCE_WRAPPER, LEVEL_STATUS,
             "Dumping JVM state.");
         log_printf_queue(useLoggerQueue, WRAPPER_SOURCE_WRAPPER, LEVEL_DEBUG,
-            "Sending BREAK event to process group %ld.", javaProcessId);
-        if ( GenerateConsoleCtrlEvent( CTRL_BREAK_EVENT, javaProcessId ) == 0 ) {
+            "Sending BREAK event to process group %ld.", wrapperData->javaPID);
+        if ( GenerateConsoleCtrlEvent( CTRL_BREAK_EVENT, wrapperData->javaPID ) == 0 ) {
             log_printf_queue(useLoggerQueue, WRAPPER_SOURCE_WRAPPER, LEVEL_ERROR,
                 "Unable to send BREAK event to JVM process.  Err(%ld : %s)",
                 GetLastError(), getLastErrorText());
@@ -1283,7 +1281,7 @@
                 "Failed to close the Java process handle: %s", getLastErrorText());
         }
         javaProcess = NULL;
-        javaProcessId = 0;
+        wrapperData->javaPID = 0;
 
         break;
 
@@ -1344,7 +1342,7 @@
             "Failed to close the Java process handle: %s", getLastErrorText());
     }
     javaProcess = NULL;
-    javaProcessId = 0;
+    wrapperData->javaPID = 0;
 
     /* Close any open socket to the JVM */
     wrapperProtocolClose();
@@ -1604,12 +1602,14 @@
         log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_DEBUG, "JVM started (PID=%d)", process_info.dwProcessId);
     }
 
+    /* We keep a reference to the process handle, but need to close the thread handle. */
     javaProcess = process_info.hProcess;
-    javaProcessId = process_info.dwProcessId;
+    wrapperData->javaPID = process_info.dwProcessId;
+    CloseHandle(process_info.hThread);
 
     /* If a java pid filename is specified then write the pid of the java process. */
     if (wrapperData->javaPidFilename) {
-        if (writePidFile(wrapperData->javaPidFilename, javaProcessId, wrapperData->javaPidFileUmask)) {
+        if (writePidFile(wrapperData->javaPidFilename, wrapperData->javaPID, wrapperData->javaPidFileUmask)) {
             log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_WARN,
                 "Unable to write the Java PID file: %s", wrapperData->javaPidFilename);
         }
@@ -1640,13 +1640,6 @@
 }
 
 /**
- * Returns the PID of the Wrapper process.
- */
-int wrapperGetPID() {
-    return GetCurrentProcessId();
-}
-
-/**
  * Outputs a log entry at regular intervals to track the memory usage of the
  *  Wrapper and its JVM.
  */
@@ -1659,7 +1652,7 @@
         if (OptionalGetProcessMemoryInfo(wrapperProcess, &wCounters, sizeof(wCounters)) == 0) {
             log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_ERROR,
                 "Call to GetProcessMemoryInfo failed for Wrapper process %08x: %s",
-                wrapperProcessId, getLastErrorText());
+                wrapperData->wrapperPID, getLastErrorText());
             return;
         }
         
@@ -1668,7 +1661,7 @@
             if (OptionalGetProcessMemoryInfo(javaProcess, &jCounters, sizeof(jCounters)) == 0) {
                 log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_ERROR,
                     "Call to GetProcessMemoryInfo failed for Java process %08x: %s",
-                    javaProcessId, getLastErrorText());
+                    wrapperData->javaPID, getLastErrorText());
                 return;
             }
         } else {
@@ -1757,7 +1750,7 @@
         if (!OptionalGetProcessTimes(wrapperProcess, &creationTime, &exitTime, &wKernelTime, &wUserTime)) {
             log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_ERROR,
                 "Call to GetProcessTimes failed for Wrapper process %08x: %s",
-                wrapperProcessId, getLastErrorText());
+                wrapperData->wrapperPID, getLastErrorText());
             return;
         }
         
@@ -1766,7 +1759,7 @@
             if (!OptionalGetProcessTimes(javaProcess, &creationTime, &exitTime, &jKernelTime, &jUserTime)) {
                 log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_ERROR,
                     "Call to GetProcessTimes failed for Java process %08x: %s",
-                    javaProcessId, getLastErrorText());
+                    wrapperData->javaPID, getLastErrorText());
                 return;
             }
         } else {
@@ -3625,7 +3618,7 @@
             
             /* Get the current process. */
             wrapperProcess = GetCurrentProcess();
-            wrapperProcessId = GetCurrentProcessId();
+            wrapperData->wrapperPID = GetCurrentProcessId();
             
             /* See if the logs should be rolled on Wrapper startup. */
             if ((getLogfileRollMode() & ROLL_MODE_WRAPPER) ||
@@ -3637,7 +3630,7 @@
              *  simply overwritten. */
             cleanUpPIDFilesOnExit = TRUE;
             if (wrapperData->anchorFilename) {
-                if (writePidFile(wrapperData->anchorFilename, wrapperProcessId, wrapperData->anchorFileUmask)) {
+                if (writePidFile(wrapperData->anchorFilename, wrapperData->wrapperPID, wrapperData->anchorFileUmask)) {
                     log_printf
                         (WRAPPER_SOURCE_WRAPPER, LEVEL_FATAL,
                          "ERROR: Could not write anchor file %s: %s",
@@ -3647,7 +3640,7 @@
                 }
             }
             if (wrapperData->pidFilename) {
-                if (writePidFile(wrapperData->pidFilename, wrapperProcessId, wrapperData->pidFileUmask)) {
+                if (writePidFile(wrapperData->pidFilename, wrapperData->wrapperPID, wrapperData->pidFileUmask)) {
                     log_printf
                         (WRAPPER_SOURCE_WRAPPER, LEVEL_FATAL,
                          "ERROR: Could not write pid file %s: %s",
@@ -3657,7 +3650,7 @@
                 }
             }
             if (wrapperData->lockFilename) {
-                if (writePidFile(wrapperData->lockFilename, wrapperProcessId, wrapperData->lockFileUmask)) {
+                if (writePidFile(wrapperData->lockFilename, wrapperData->wrapperPID, wrapperData->lockFileUmask)) {
                     log_printf
                         (WRAPPER_SOURCE_WRAPPER, LEVEL_FATAL,
                          "ERROR: Could not write lock file %s: %s",
@@ -3683,7 +3676,7 @@
             
             /* Get the current process. */
             wrapperProcess = GetCurrentProcess();
-            wrapperProcessId = GetCurrentProcessId();
+            wrapperData->wrapperPID = GetCurrentProcessId();
             
             /* See if the logs should be rolled on Wrapper startup. */
             if ((getLogfileRollMode() & ROLL_MODE_WRAPPER) ||
@@ -3695,7 +3688,7 @@
              *  simply overwritten. */
             cleanUpPIDFilesOnExit = TRUE;
             if (wrapperData->anchorFilename) {
-                if (writePidFile(wrapperData->anchorFilename, wrapperProcessId, wrapperData->anchorFileUmask)) {
+                if (writePidFile(wrapperData->anchorFilename, wrapperData->wrapperPID, wrapperData->anchorFileUmask)) {
                     log_printf
                         (WRAPPER_SOURCE_WRAPPER, LEVEL_FATAL,
                          "ERROR: Could not write anchor file %s: %s",
@@ -3705,7 +3698,7 @@
                 }
             }
             if (wrapperData->pidFilename) {
-                if (writePidFile(wrapperData->pidFilename, wrapperProcessId, wrapperData->pidFileUmask)) {
+                if (writePidFile(wrapperData->pidFilename, wrapperData->wrapperPID, wrapperData->pidFileUmask)) {
                     log_printf
                         (WRAPPER_SOURCE_WRAPPER, LEVEL_FATAL,
                          "ERROR: Could not write pid file %s: %s",


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1343
          http://svn.sourceforge.net/wrapper/?rev=1343&view=rev
Author:   mortenson
Date:     2007-04-12 08:15:57 -0700 (Thu, 12 Apr 2007)

Log Message:
-----------
Set the EOL style property

Modified Paths:
--------------
    trunk/wrapper/src/c/Makefile-solaris-sparc-32.gmake
    trunk/wrapper/src/c/Makefile-solaris-sparc-64.gmake
    trunk/wrapper/src/c/Makefile-solaris-x86-32.gmake
    trunk/wrapper/src/c/Makefile-solaris-x86-64.gmake

Property Changed:
----------------
    trunk/wrapper/src/c/Makefile-solaris-sparc-32.gmake
    trunk/wrapper/src/c/Makefile-solaris-sparc-64.gmake
    trunk/wrapper/src/c/Makefile-solaris-x86-32.gmake
    trunk/wrapper/src/c/Makefile-solaris-x86-64.gmake

Modified: trunk/wrapper/src/c/Makefile-solaris-sparc-32.gmake
===================================================================
--- trunk/wrapper/src/c/Makefile-solaris-sparc-32.gmake	2007-04-12 14:10:45 UTC (rev 1342)
+++ trunk/wrapper/src/c/Makefile-solaris-sparc-32.gmake	2007-04-12 15:15:57 UTC (rev 1343)
@@ -1,56 +1,56 @@
-# Copyright (c) 1999, 2007 Tanuki Software Inc.
-# 
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of the Java Service Wrapper and associated
-# documentation files (the "Software"), to deal in the Software
-# without  restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sub-license,
-# and/or sell copies of the Software, and to permit persons to
-# whom the Software is furnished to do so, subject to the
-# following conditions:
-# 
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
-# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-# NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
-# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
-# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-
-COMPILE = gcc -O3 -Wall --pedantic -DSOLARIS
-
-INCLUDE=$(JAVA_HOME)/include
-
-DEFS = -I$(INCLUDE) -I$(INCLUDE)/solaris
-
-wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c
-
-libwrapper_so_OBJECTS = wrapperjni_unix.o wrapperinfo.o wrapperjni.o
-
-BIN = ../../bin
-LIB = ../../lib
-
-all: init wrapper libwrapper.so
-
-clean:
-	rm -f *.o
-
-cleanall: clean
-	rm -rf *~ .deps
-	rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
-
-init:
-	if test ! -d .deps; then mkdir .deps; fi
-
-wrapper: $(wrapper_SOURCE)
-	$(COMPILE) -lsocket -lpthread -lnsl -lm -lposix4 $(wrapper_SOURCE) -o $(BIN)/wrapper
-
-libwrapper.so: $(libwrapper_so_OBJECTS)
-	${COMPILE} -G -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
-
-%.o: %.c
-	${COMPILE} -c ${DEFS} $<
+# Copyright (c) 1999, 2007 Tanuki Software Inc.
+# 
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of the Java Service Wrapper and associated
+# documentation files (the "Software"), to deal in the Software
+# without  restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sub-license,
+# and/or sell copies of the Software, and to permit persons to
+# whom the Software is furnished to do so, subject to the
+# following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+# NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
+COMPILE = gcc -O3 -Wall --pedantic -DSOLARIS
+
+INCLUDE=$(JAVA_HOME)/include
+
+DEFS = -I$(INCLUDE) -I$(INCLUDE)/solaris
+
+wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c
+
+libwrapper_so_OBJECTS = wrapperjni_unix.o wrapperinfo.o wrapperjni.o
+
+BIN = ../../bin
+LIB = ../../lib
+
+all: init wrapper libwrapper.so
+
+clean:
+	rm -f *.o
+
+cleanall: clean
+	rm -rf *~ .deps
+	rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
+
+init:
+	if test ! -d .deps; then mkdir .deps; fi
+
+wrapper: $(wrapper_SOURCE)
+	$(COMPILE) -lsocket -lpthread -lnsl -lm -lposix4 $(wrapper_SOURCE) -o $(BIN)/wrapper
+
+libwrapper.so: $(libwrapper_so_OBJECTS)
+	${COMPILE} -G -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+
+%.o: %.c
+	${COMPILE} -c ${DEFS} $<


Property changes on: trunk/wrapper/src/c/Makefile-solaris-sparc-32.gmake
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: trunk/wrapper/src/c/Makefile-solaris-sparc-64.gmake
===================================================================
--- trunk/wrapper/src/c/Makefile-solaris-sparc-64.gmake	2007-04-12 14:10:45 UTC (rev 1342)
+++ trunk/wrapper/src/c/Makefile-solaris-sparc-64.gmake	2007-04-12 15:15:57 UTC (rev 1343)
@@ -1,56 +1,56 @@
-# Copyright (c) 1999, 2007 Tanuki Software Inc.
-# 
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of the Java Service Wrapper and associated
-# documentation files (the "Software"), to deal in the Software
-# without  restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sub-license,
-# and/or sell copies of the Software, and to permit persons to
-# whom the Software is furnished to do so, subject to the
-# following conditions:
-# 
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
-# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-# NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
-# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
-# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-
-COMPILE = gcc -m64 -O3 -Wall --pedantic -DSOLARIS
-
-INCLUDE=$(JAVA_HOME)/include
-
-DEFS = -I$(INCLUDE) -I$(INCLUDE)/solaris
-
-wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c
-
-libwrapper_so_OBJECTS = wrapperjni_unix.o wrapperinfo.o wrapperjni.o
-
-BIN = ../../bin
-LIB = ../../lib
-
-all: init wrapper libwrapper.so
-
-clean:
-	rm -f *.o
-
-cleanall: clean
-	rm -rf *~ .deps
-	rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
-
-init:
-	if test ! -d .deps; then mkdir .deps; fi
-
-wrapper: $(wrapper_SOURCE)
-	$(COMPILE) -lsocket -lpthread -lnsl -lm -lposix4 $(wrapper_SOURCE) -o $(BIN)/wrapper
-
-libwrapper.so: $(libwrapper_so_OBJECTS)
-	${COMPILE} -G -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
-
-%.o: %.c
-	${COMPILE} -c ${DEFS} $<
+# Copyright (c) 1999, 2007 Tanuki Software Inc.
+# 
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of the Java Service Wrapper and associated
+# documentation files (the "Software"), to deal in the Software
+# without  restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sub-license,
+# and/or sell copies of the Software, and to permit persons to
+# whom the Software is furnished to do so, subject to the
+# following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+# NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
+COMPILE = gcc -m64 -O3 -Wall --pedantic -DSOLARIS
+
+INCLUDE=$(JAVA_HOME)/include
+
+DEFS = -I$(INCLUDE) -I$(INCLUDE)/solaris
+
+wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c
+
+libwrapper_so_OBJECTS = wrapperjni_unix.o wrapperinfo.o wrapperjni.o
+
+BIN = ../../bin
+LIB = ../../lib
+
+all: init wrapper libwrapper.so
+
+clean:
+	rm -f *.o
+
+cleanall: clean
+	rm -rf *~ .deps
+	rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
+
+init:
+	if test ! -d .deps; then mkdir .deps; fi
+
+wrapper: $(wrapper_SOURCE)
+	$(COMPILE) -lsocket -lpthread -lnsl -lm -lposix4 $(wrapper_SOURCE) -o $(BIN)/wrapper
+
+libwrapper.so: $(libwrapper_so_OBJECTS)
+	${COMPILE} -G -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+
+%.o: %.c
+	${COMPILE} -c ${DEFS} $<


Property changes on: trunk/wrapper/src/c/Makefile-solaris-sparc-64.gmake
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: trunk/wrapper/src/c/Makefile-solaris-x86-32.gmake
===================================================================
--- trunk/wrapper/src/c/Makefile-solaris-x86-32.gmake	2007-04-12 14:10:45 UTC (rev 1342)
+++ trunk/wrapper/src/c/Makefile-solaris-x86-32.gmake	2007-04-12 15:15:57 UTC (rev 1343)
@@ -1,56 +1,56 @@
-# Copyright (c) 1999, 2007 Tanuki Software Inc.
-# 
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of the Java Service Wrapper and associated
-# documentation files (the "Software"), to deal in the Software
-# without  restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sub-license,
-# and/or sell copies of the Software, and to permit persons to
-# whom the Software is furnished to do so, subject to the
-# following conditions:
-# 
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
-# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-# NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
-# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
-# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-
-COMPILE = gcc -O3 -Wall --pedantic -DSOLARIS
-
-INCLUDE=$(JAVA_HOME)/include
-
-DEFS = -I$(INCLUDE) -I$(INCLUDE)/solaris
-
-wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c
-
-libwrapper_so_OBJECTS = wrapperjni_unix.o wrapperinfo.o wrapperjni.o
-
-BIN = ../../bin
-LIB = ../../lib
-
-all: init wrapper libwrapper.so
-
-clean:
-	rm -f *.o
-
-cleanall: clean
-	rm -rf *~ .deps
-	rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
-
-init:
-	if test ! -d .deps; then mkdir .deps; fi
-
-wrapper: $(wrapper_SOURCE)
-	$(COMPILE) -lsocket -lpthread -lnsl -lm -lposix4 $(wrapper_SOURCE) -o $(BIN)/wrapper
-
-libwrapper.so: $(libwrapper_so_OBJECTS)
-	${COMPILE} -G -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
-
-%.o: %.c
-	${COMPILE} -c ${DEFS} $<
+# Copyright (c) 1999, 2007 Tanuki Software Inc.
+# 
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of the Java Service Wrapper and associated
+# documentation files (the "Software"), to deal in the Software
+# without  restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sub-license,
+# and/or sell copies of the Software, and to permit persons to
+# whom the Software is furnished to do so, subject to the
+# following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+# NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
+COMPILE = gcc -O3 -Wall --pedantic -DSOLARIS
+
+INCLUDE=$(JAVA_HOME)/include
+
+DEFS = -I$(INCLUDE) -I$(INCLUDE)/solaris
+
+wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c
+
+libwrapper_so_OBJECTS = wrapperjni_unix.o wrapperinfo.o wrapperjni.o
+
+BIN = ../../bin
+LIB = ../../lib
+
+all: init wrapper libwrapper.so
+
+clean:
+	rm -f *.o
+
+cleanall: clean
+	rm -rf *~ .deps
+	rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
+
+init:
+	if test ! -d .deps; then mkdir .deps; fi
+
+wrapper: $(wrapper_SOURCE)
+	$(COMPILE) -lsocket -lpthread -lnsl -lm -lposix4 $(wrapper_SOURCE) -o $(BIN)/wrapper
+
+libwrapper.so: $(libwrapper_so_OBJECTS)
+	${COMPILE} -G -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+
+%.o: %.c
+	${COMPILE} -c ${DEFS} $<


Property changes on: trunk/wrapper/src/c/Makefile-solaris-x86-32.gmake
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: trunk/wrapper/src/c/Makefile-solaris-x86-64.gmake
===================================================================
--- trunk/wrapper/src/c/Makefile-solaris-x86-64.gmake	2007-04-12 14:10:45 UTC (rev 1342)
+++ trunk/wrapper/src/c/Makefile-solaris-x86-64.gmake	2007-04-12 15:15:57 UTC (rev 1343)
@@ -1,56 +1,56 @@
-# Copyright (c) 1999, 2007 Tanuki Software Inc.
-# 
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of the Java Service Wrapper and associated
-# documentation files (the "Software"), to deal in the Software
-# without  restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sub-license,
-# and/or sell copies of the Software, and to permit persons to
-# whom the Software is furnished to do so, subject to the
-# following conditions:
-# 
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
-# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-# NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
-# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
-# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-
-COMPILE = gcc -m64 -O3 -Wall --pedantic -DSOLARIS
-
-INCLUDE=$(JAVA_HOME)/include
-
-DEFS = -I$(INCLUDE) -I$(INCLUDE)/solaris
-
-wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c
-
-libwrapper_so_OBJECTS = wrapperjni_unix.o wrapperinfo.o wrapperjni.o
-
-BIN = ../../bin
-LIB = ../../lib
-
-all: init wrapper libwrapper.so
-
-clean:
-	rm -f *.o
-
-cleanall: clean
-	rm -rf *~ .deps
-	rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
-
-init:
-	if test ! -d .deps; then mkdir .deps; fi
-
-wrapper: $(wrapper_SOURCE)
-	$(COMPILE) -lsocket -lpthread -lnsl -lm -lposix4 $(wrapper_SOURCE) -o $(BIN)/wrapper
-
-libwrapper.so: $(libwrapper_so_OBJECTS)
-	${COMPILE} -G -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
-
-%.o: %.c
-	${COMPILE} -c ${DEFS} $<
+# Copyright (c) 1999, 2007 Tanuki Software Inc.
+# 
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of the Java Service Wrapper and associated
+# documentation files (the "Software"), to deal in the Software
+# without  restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sub-license,
+# and/or sell copies of the Software, and to permit persons to
+# whom the Software is furnished to do so, subject to the
+# following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
+# NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
+COMPILE = gcc -m64 -O3 -Wall --pedantic -DSOLARIS
+
+INCLUDE=$(JAVA_HOME)/include
+
+DEFS = -I$(INCLUDE) -I$(INCLUDE)/solaris
+
+wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c
+
+libwrapper_so_OBJECTS = wrapperjni_unix.o wrapperinfo.o wrapperjni.o
+
+BIN = ../../bin
+LIB = ../../lib
+
+all: init wrapper libwrapper.so
+
+clean:
+	rm -f *.o
+
+cleanall: clean
+	rm -rf *~ .deps
+	rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
+
+init:
+	if test ! -d .deps; then mkdir .deps; fi
+
+wrapper: $(wrapper_SOURCE)
+	$(COMPILE) -lsocket -lpthread -lnsl -lm -lposix4 $(wrapper_SOURCE) -o $(BIN)/wrapper
+
+libwrapper.so: $(libwrapper_so_OBJECTS)
+	${COMPILE} -G -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+
+%.o: %.c
+	${COMPILE} -c ${DEFS} $<


Property changes on: trunk/wrapper/src/c/Makefile-solaris-x86-64.gmake
___________________________________________________________________
Name: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1354
          http://svn.sourceforge.net/wrapper/?rev=1354&view=rev
Author:   mortenson
Date:     2007-04-24 22:43:19 -0700 (Tue, 24 Apr 2007)

Log Message:
-----------
Fix a problem where calls to lock and unlock mutexes on UNIX versions were not being tested for failure.

Modified Paths:
--------------
    trunk/wrapper/src/c/logger.c
    trunk/wrapper/src/c/wrapper.c

Modified: trunk/wrapper/src/c/logger.c
===================================================================
--- trunk/wrapper/src/c/logger.c	2007-04-25 05:19:14 UTC (rev 1353)
+++ trunk/wrapper/src/c/logger.c	2007-04-25 05:43:19 UTC (rev 1354)
@@ -548,6 +548,7 @@
 #else
     if (pthread_mutex_lock(&log_printfMutex)) {
         printf("Failed to lock the Logging mutex. %s\n", getLastErrorText());
+        return -1;
     }
 #endif
     
@@ -564,6 +565,7 @@
 #else
     if (pthread_mutex_unlock(&log_printfMutex)) {
         printf("Failed to unlock the Logging mutex. %s\n", getLastErrorText());
+        return -1;
     }
 #endif
     return 0;

Modified: trunk/wrapper/src/c/wrapper.c
===================================================================
--- trunk/wrapper/src/c/wrapper.c	2007-04-25 05:19:14 UTC (rev 1353)
+++ trunk/wrapper/src/c/wrapper.c	2007-04-25 05:43:19 UTC (rev 1354)
@@ -716,7 +716,10 @@
         break;
     }
 #else
-    pthread_mutex_lock(&protocolMutex);
+    if (pthread_mutex_lock(&protocolMutex)) {
+        printf("Failed to lock the Protocol mutex. %s\n", getLastErrorText());
+        return -1;
+    }
 #endif
     
     return 0;
@@ -726,12 +729,15 @@
 int releaseProtocolMutex() {
 #ifdef WIN32
     if (!ReleaseMutex(protocolMutexHandle)) {
-        printf( "Failed to release protocol mutex. %s\n", getLastErrorText());
+        printf( "Failed to release Protocol mutex. %s\n", getLastErrorText());
         fflush(NULL);
         return -1;
     }
 #else
-    pthread_mutex_unlock(&protocolMutex);
+    if (pthread_mutex_unlock(&protocolMutex)) {
+        printf("Failed to unlock the Protocol mutex. %s\n", getLastErrorText());
+        return -1;
+    }
 #endif
     return 0;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1358
          http://svn.sourceforge.net/wrapper/?rev=1358&view=rev
Author:   mortenson
Date:     2007-04-27 14:13:33 -0700 (Fri, 27 Apr 2007)

Log Message:
-----------
Lots of work getting the licensing system working correctly for both NODE and DEV licenses.

Modified Paths:
--------------
    trunk/wrapper/src/c/wrapperinfo.c.in
    trunk/wrapper/src/c/wrapperinfo.h

Modified: trunk/wrapper/src/c/wrapperinfo.c.in
===================================================================
--- trunk/wrapper/src/c/wrapperinfo.c.in	2007-04-27 06:35:41 UTC (rev 1357)
+++ trunk/wrapper/src/c/wrapperinfo.c.in	2007-04-27 21:13:33 UTC (rev 1358)
@@ -37,4 +37,6 @@
 char *wrapperBits = "@bits@";
 char *wrapperArch = "@dist.arch@";
 char *wrapperOS = "@dist.os@";
+char *wrapperBuildDate = "@build.date@";
+char *wrapperBuildTime = "@build.time@";
 

Modified: trunk/wrapper/src/c/wrapperinfo.h
===================================================================
--- trunk/wrapper/src/c/wrapperinfo.h	2007-04-27 06:35:41 UTC (rev 1357)
+++ trunk/wrapper/src/c/wrapperinfo.h	2007-04-27 21:13:33 UTC (rev 1358)
@@ -31,5 +31,7 @@
 extern char *wrapperBits;
 extern char *wrapperArch;
 extern char *wrapperOS;
+extern char *wrapperBuildDate;
+extern char *wrapperBuildTime;
 
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1361
          http://svn.sourceforge.net/wrapper/?rev=1361&view=rev
Author:   mortenson
Date:     2007-04-30 18:33:53 -0700 (Mon, 30 Apr 2007)

Log Message:
-----------
Fix a runtime problem loading the JNI library on Solaris platforms.  Needed to link to posix4.

Modified Paths:
--------------
    trunk/wrapper/src/c/Makefile-solaris-sparc-32.gmake
    trunk/wrapper/src/c/Makefile-solaris-sparc-32.make
    trunk/wrapper/src/c/Makefile-solaris-sparc-64.gmake
    trunk/wrapper/src/c/Makefile-solaris-sparc-64.make
    trunk/wrapper/src/c/Makefile-solaris-x86-32.gmake
    trunk/wrapper/src/c/Makefile-solaris-x86-32.make
    trunk/wrapper/src/c/Makefile-solaris-x86-64.gmake
    trunk/wrapper/src/c/Makefile-solaris-x86-64.make

Modified: trunk/wrapper/src/c/Makefile-solaris-sparc-32.gmake
===================================================================
--- trunk/wrapper/src/c/Makefile-solaris-sparc-32.gmake	2007-04-30 22:20:13 UTC (rev 1360)
+++ trunk/wrapper/src/c/Makefile-solaris-sparc-32.gmake	2007-05-01 01:33:53 UTC (rev 1361)
@@ -50,7 +50,7 @@
 	$(COMPILE) -lsocket -lpthread -lnsl -lm -lposix4 $(wrapper_SOURCE) -o $(BIN)/wrapper
 
 libwrapper.so: $(libwrapper_so_OBJECTS)
-	${COMPILE} -G -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+	${COMPILE} -G -fPIC -lposix4 $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
 
 %.o: %.c
 	${COMPILE} -c ${DEFS} $<

Modified: trunk/wrapper/src/c/Makefile-solaris-sparc-32.make
===================================================================
--- trunk/wrapper/src/c/Makefile-solaris-sparc-32.make	2007-04-30 22:20:13 UTC (rev 1360)
+++ trunk/wrapper/src/c/Makefile-solaris-sparc-32.make	2007-05-01 01:33:53 UTC (rev 1361)
@@ -50,7 +50,7 @@
 	$(COMPILE) -lsocket -lpthread -lnsl -lm -lposix4 $(wrapper_SOURCE) -o $(BIN)/wrapper
 
 libwrapper.so: $(libwrapper_so_OBJECTS)
-	${COMPILE} -G -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+	${COMPILE} -G -fPIC -lposix4 $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
 
 %.o: %.c
 	@echo '$(COMPILE) -c $<'; \

Modified: trunk/wrapper/src/c/Makefile-solaris-sparc-64.gmake
===================================================================
--- trunk/wrapper/src/c/Makefile-solaris-sparc-64.gmake	2007-04-30 22:20:13 UTC (rev 1360)
+++ trunk/wrapper/src/c/Makefile-solaris-sparc-64.gmake	2007-05-01 01:33:53 UTC (rev 1361)
@@ -50,7 +50,7 @@
 	$(COMPILE) -lsocket -lpthread -lnsl -lm -lposix4 $(wrapper_SOURCE) -o $(BIN)/wrapper
 
 libwrapper.so: $(libwrapper_so_OBJECTS)
-	${COMPILE} -G -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+	${COMPILE} -G -fPIC -lposix4 $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
 
 %.o: %.c
 	${COMPILE} -c ${DEFS} $<

Modified: trunk/wrapper/src/c/Makefile-solaris-sparc-64.make
===================================================================
--- trunk/wrapper/src/c/Makefile-solaris-sparc-64.make	2007-04-30 22:20:13 UTC (rev 1360)
+++ trunk/wrapper/src/c/Makefile-solaris-sparc-64.make	2007-05-01 01:33:53 UTC (rev 1361)
@@ -50,7 +50,7 @@
 	$(COMPILE) -lsocket -lpthread -lnsl -lm -lposix4 $(wrapper_SOURCE) -o $(BIN)/wrapper
 
 libwrapper.so: $(libwrapper_so_OBJECTS)
-	${COMPILE} -G -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+	${COMPILE} -G -fPIC -lposix4 $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
 
 %.o: %.c
 	@echo '$(COMPILE) -c $<'; \

Modified: trunk/wrapper/src/c/Makefile-solaris-x86-32.gmake
===================================================================
--- trunk/wrapper/src/c/Makefile-solaris-x86-32.gmake	2007-04-30 22:20:13 UTC (rev 1360)
+++ trunk/wrapper/src/c/Makefile-solaris-x86-32.gmake	2007-05-01 01:33:53 UTC (rev 1361)
@@ -50,7 +50,7 @@
 	$(COMPILE) -lsocket -lpthread -lnsl -lm -lposix4 $(wrapper_SOURCE) -o $(BIN)/wrapper
 
 libwrapper.so: $(libwrapper_so_OBJECTS)
-	${COMPILE} -G -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+	${COMPILE} -G -fPIC -lposix4 $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
 
 %.o: %.c
 	${COMPILE} -c ${DEFS} $<

Modified: trunk/wrapper/src/c/Makefile-solaris-x86-32.make
===================================================================
--- trunk/wrapper/src/c/Makefile-solaris-x86-32.make	2007-04-30 22:20:13 UTC (rev 1360)
+++ trunk/wrapper/src/c/Makefile-solaris-x86-32.make	2007-05-01 01:33:53 UTC (rev 1361)
@@ -50,7 +50,7 @@
 	$(COMPILE) -lsocket -lpthread -lnsl -lm -lposix4 $(wrapper_SOURCE) -o $(BIN)/wrapper
 
 libwrapper.so: $(libwrapper_so_OBJECTS)
-	${COMPILE} -G -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+	${COMPILE} -G -fPIC -lposix4 $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
 
 %.o: %.c
 	@echo '$(COMPILE) -c $<'; \

Modified: trunk/wrapper/src/c/Makefile-solaris-x86-64.gmake
===================================================================
--- trunk/wrapper/src/c/Makefile-solaris-x86-64.gmake	2007-04-30 22:20:13 UTC (rev 1360)
+++ trunk/wrapper/src/c/Makefile-solaris-x86-64.gmake	2007-05-01 01:33:53 UTC (rev 1361)
@@ -50,7 +50,7 @@
 	$(COMPILE) -lsocket -lpthread -lnsl -lm -lposix4 $(wrapper_SOURCE) -o $(BIN)/wrapper
 
 libwrapper.so: $(libwrapper_so_OBJECTS)
-	${COMPILE} -G -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+	${COMPILE} -G -fPIC -lposix4 $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
 
 %.o: %.c
 	${COMPILE} -c ${DEFS} $<

Modified: trunk/wrapper/src/c/Makefile-solaris-x86-64.make
===================================================================
--- trunk/wrapper/src/c/Makefile-solaris-x86-64.make	2007-04-30 22:20:13 UTC (rev 1360)
+++ trunk/wrapper/src/c/Makefile-solaris-x86-64.make	2007-05-01 01:33:53 UTC (rev 1361)
@@ -50,7 +50,7 @@
 	$(COMPILE) -lsocket -lpthread -lnsl -lm -lposix4 $(wrapper_SOURCE) -o $(BIN)/wrapper
 
 libwrapper.so: $(libwrapper_so_OBJECTS)
-	${COMPILE} -G -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+	${COMPILE} -G -fPIC -lposix4 $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
 
 %.o: %.c
 	@echo '$(COMPILE) -c $<'; \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1399
          http://wrapper.svn.sourceforge.net/wrapper/?rev=1399&view=rev
Author:   mortenson
Date:     2008-02-26 03:49:19 -0800 (Tue, 26 Feb 2008)

Log Message:
-----------
Add 32-bit Linux PPC support.

Added Paths:
-----------
    trunk/wrapper/src/c/Makefile-linux-ppc-32.make

Property Changed:
----------------
    trunk/wrapper/src/c/Makefile-aix-ppc-32.gmake
    trunk/wrapper/src/c/Makefile-aix-ppc-64.gmake
    trunk/wrapper/src/c/Makefile-freebsd-x86-32.gmake
    trunk/wrapper/src/c/Makefile-hpux-parisc-32.gmake
    trunk/wrapper/src/c/Makefile-hpux-parisc-32.make
    trunk/wrapper/src/c/Makefile-hpux-parisc-64.make
    trunk/wrapper/src/c/Makefile-irix-mips-32.cc
    trunk/wrapper/src/c/Makefile-irix-mips-32.gmake
    trunk/wrapper/src/c/Makefile-linux-ppc-64.make
    trunk/wrapper/src/c/Makefile-linux-x86-32.make
    trunk/wrapper/src/c/Makefile-linux-x86-64.make
    trunk/wrapper/src/c/Makefile-macosx-universal-32.make
    trunk/wrapper/src/c/Makefile-osf1-alpha-64.gmake
    trunk/wrapper/src/c/Makefile-solaris-sparc-32.gmake
    trunk/wrapper/src/c/Makefile-solaris-sparc-32.make
    trunk/wrapper/src/c/Makefile-solaris-sparc-64.gmake
    trunk/wrapper/src/c/Makefile-solaris-sparc-64.make
    trunk/wrapper/src/c/Makefile-solaris-x86-32.gmake
    trunk/wrapper/src/c/Makefile-solaris-x86-32.make
    trunk/wrapper/src/c/Makefile-solaris-x86-64.gmake
    trunk/wrapper/src/c/Makefile-solaris-x86-64.make
    trunk/wrapper/src/c/Makefile-windows-x86-32.nmake


Property changes on: trunk/wrapper/src/c/Makefile-aix-ppc-32.gmake
___________________________________________________________________
Name: svn:mime-type
   + text/plain


Property changes on: trunk/wrapper/src/c/Makefile-aix-ppc-64.gmake
___________________________________________________________________
Name: svn:mime-type
   + text/plain


Property changes on: trunk/wrapper/src/c/Makefile-freebsd-x86-32.gmake
___________________________________________________________________
Name: svn:mime-type
   + text/plain


Property changes on: trunk/wrapper/src/c/Makefile-hpux-parisc-32.gmake
___________________________________________________________________
Name: svn:mime-type
   + text/plain


Property changes on: trunk/wrapper/src/c/Makefile-hpux-parisc-32.make
___________________________________________________________________
Name: svn:mime-type
   + text/plain


Property changes on: trunk/wrapper/src/c/Makefile-hpux-parisc-64.make
___________________________________________________________________
Name: svn:mime-type
   + text/plain


Property changes on: trunk/wrapper/src/c/Makefile-irix-mips-32.cc
___________________________________________________________________
Name: svn:mime-type
   + text/plain


Property changes on: trunk/wrapper/src/c/Makefile-irix-mips-32.gmake
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: trunk/wrapper/src/c/Makefile-linux-ppc-32.make
===================================================================
--- trunk/wrapper/src/c/Makefile-linux-ppc-32.make	                        (rev 0)
+++ trunk/wrapper/src/c/Makefile-linux-ppc-32.make	2008-02-26 11:49:19 UTC (rev 1399)
@@ -0,0 +1,51 @@
+# Copyright (c) 1999, 2008 Tanuki Software, Inc.
+# http://www.tanukisoftware.com
+# All rights reserved.
+#
+# This software is the confidential and proprietary information
+# of Tanuki Software.  ("Confidential Information").  You shall
+# not disclose such Confidential Information and shall use it
+# only in accordance with the terms of the license agreement you
+# entered into with Tanuki Software.
+
+# This makefile is inprogess.  It builds, but the resulting libwrapper.so does not yet work.
+# If you know how to fix it then please help out.
+COMPILE = gcc -O3 -fPIC --pedantic -D_FILE_OFFSET_BITS=64
+
+INCLUDE=$(JAVA_HOME)/include
+
+DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux
+
+wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c
+
+libwrapper_so_OBJECTS = wrapperjni_unix.o wrapperinfo.o wrapperjni.o
+
+BIN = ../../bin
+LIB = ../../lib
+
+all: init wrapper libwrapper.so
+
+clean:
+	rm -f *.o
+
+cleanall: clean
+	rm -rf *~ .deps
+	rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
+
+init:
+	if test ! -d .deps; then mkdir .deps; fi
+
+wrapper: $(wrapper_SOURCE)
+	$(COMPILE) -pthread -lm $(wrapper_SOURCE) -o $(BIN)/wrapper
+
+libwrapper.so: $(libwrapper_so_OBJECTS)
+	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	>> .deps/$(*F).P; \
+	rm .deps/$(*F).pp


Property changes on: trunk/wrapper/src/c/Makefile-linux-ppc-32.make
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native


Property changes on: trunk/wrapper/src/c/Makefile-linux-ppc-64.make
___________________________________________________________________
Name: svn:mime-type
   + text/plain


Property changes on: trunk/wrapper/src/c/Makefile-linux-x86-32.make
___________________________________________________________________
Name: svn:mime-type
   + text/plain


Property changes on: trunk/wrapper/src/c/Makefile-linux-x86-64.make
___________________________________________________________________
Name: svn:mime-type
   + text/plain


Property changes on: trunk/wrapper/src/c/Makefile-macosx-universal-32.make
___________________________________________________________________
Name: svn:mime-type
   + text/plain


Property changes on: trunk/wrapper/src/c/Makefile-osf1-alpha-64.gmake
___________________________________________________________________
Name: svn:mime-type
   + text/plain


Property changes on: trunk/wrapper/src/c/Makefile-solaris-sparc-32.gmake
___________________________________________________________________
Name: svn:mime-type
   + text/plain


Property changes on: trunk/wrapper/src/c/Makefile-solaris-sparc-32.make
___________________________________________________________________
Name: svn:mime-type
   + text/plain


Property changes on: trunk/wrapper/src/c/Makefile-solaris-sparc-64.gmake
___________________________________________________________________
Name: svn:mime-type
   + text/plain


Property changes on: trunk/wrapper/src/c/Makefile-solaris-sparc-64.make
___________________________________________________________________
Name: svn:mime-type
   + text/plain


Property changes on: trunk/wrapper/src/c/Makefile-solaris-x86-32.gmake
___________________________________________________________________
Name: svn:mime-type
   + text/plain


Property changes on: trunk/wrapper/src/c/Makefile-solaris-x86-32.make
___________________________________________________________________
Name: svn:mime-type
   + text/plain


Property changes on: trunk/wrapper/src/c/Makefile-solaris-x86-64.gmake
___________________________________________________________________
Name: svn:mime-type
   + text/plain


Property changes on: trunk/wrapper/src/c/Makefile-solaris-x86-64.make
___________________________________________________________________
Name: svn:mime-type
   + text/plain


Property changes on: trunk/wrapper/src/c/Makefile-windows-x86-32.nmake
___________________________________________________________________
Name: svn:mime-type
   + text/plain


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1403
          http://wrapper.svn.sourceforge.net/wrapper/?rev=1403&view=rev
Author:   mortenson
Date:     2008-02-27 06:04:45 -0800 (Wed, 27 Feb 2008)

Log Message:
-----------
Get AIX to build.

Modified Paths:
--------------
    trunk/wrapper/src/c/Makefile-aix-ppc-32.make
    trunk/wrapper/src/c/Makefile-aix-ppc-64.make
    trunk/wrapper/src/c/Makefile-linux-ppc-32.make
    trunk/wrapper/src/c/Makefile-linux-ppc-64.make
    trunk/wrapper/src/c/wrapper_unix.c

Modified: trunk/wrapper/src/c/Makefile-aix-ppc-32.make
===================================================================
--- trunk/wrapper/src/c/Makefile-aix-ppc-32.make	2008-02-27 06:38:09 UTC (rev 1402)
+++ trunk/wrapper/src/c/Makefile-aix-ppc-32.make	2008-02-27 14:04:45 UTC (rev 1403)
@@ -8,38 +8,36 @@
 # only in accordance with the terms of the license agreement you
 # entered into with Tanuki Software.
 
-# This makefile is inprogess.  It builds, but the resulting libwrapper.so does not yet work.
-# If you know how to fix it then please help out.
 COMPILE = gcc -O3 -fPIC --pedantic -DAIX -D_FILE_OFFSET_BITS=64
 
 INCLUDE=$(JAVA_HOME)/include
 
-DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux
+DEFS = -I$(INCLUDE) -I$(INCLUDE)/aix
 
 wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c
 
-libwrapper_so_OBJECTS = wrapperjni_unix.o wrapperinfo.o wrapperjni.o
+libwrapper_a_SOURCE = wrapperjni_unix.c wrapperinfo.c wrapperjni.c
 
 BIN = ../../bin
 LIB = ../../lib
 
-all: init wrapper libwrapper.so
+all: init wrapper libwrapper.a
 
 clean:
 	rm -f *.o
 
 cleanall: clean
 	rm -rf *~ .deps
-	rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
+	rm -f $(BIN)/wrapper $(LIB)/libwrapper.a
 
 init:
 	if test ! -d .deps; then mkdir .deps; fi
 
 wrapper: $(wrapper_SOURCE)
-	$(COMPILE) -pthread -lm $(wrapper_SOURCE) -o $(BIN)/wrapper
+	$(COMPILE) -lpthread -lnsl -lm $(wrapper_SOURCE) -o $(BIN)/wrapper
 
-libwrapper.so: $(libwrapper_so_OBJECTS)
-	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+libwrapper.a: $(libwrapper_a_SOURCE)
+	${COMPILE} $(DEFS) -shared -lpthread $(libwrapper_a_SOURCE) -o $(LIB)/libwrapper.a
 
 %.o: %.c
 	@echo '$(COMPILE) -c $<'; \

Modified: trunk/wrapper/src/c/Makefile-aix-ppc-64.make
===================================================================
--- trunk/wrapper/src/c/Makefile-aix-ppc-64.make	2008-02-27 06:38:09 UTC (rev 1402)
+++ trunk/wrapper/src/c/Makefile-aix-ppc-64.make	2008-02-27 14:04:45 UTC (rev 1403)
@@ -8,38 +8,36 @@
 # only in accordance with the terms of the license agreement you
 # entered into with Tanuki Software.
 
-# This makefile is inprogess.  It builds, but the resulting libwrapper.so does not yet work.
-# If you know how to fix it then please help out.
 COMPILE = gcc -O3 -fPIC --pedantic -DAIX -maix64 -D_FILE_OFFSET_BITS=64
 
 INCLUDE=$(JAVA_HOME)/include
 
-DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux
+DEFS = -I$(INCLUDE) -I$(INCLUDE)/aix
 
 wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c
 
-libwrapper_so_OBJECTS = wrapperjni_unix.o wrapperinfo.o wrapperjni.o
+libwrapper_a_SOURCE = wrapperjni_unix.c wrapperinfo.c wrapperjni.c
 
 BIN = ../../bin
 LIB = ../../lib
 
-all: init wrapper libwrapper.so
+all: init wrapper libwrapper.a
 
 clean:
 	rm -f *.o
 
 cleanall: clean
 	rm -rf *~ .deps
-	rm -f $(BIN)/wrapper $(LIB)/libwrapper.so
+	rm -f $(BIN)/wrapper $(LIB)/libwrapper.a
 
 init:
 	if test ! -d .deps; then mkdir .deps; fi
 
 wrapper: $(wrapper_SOURCE)
-	$(COMPILE) -pthread -lm $(wrapper_SOURCE) -o $(BIN)/wrapper
+	$(COMPILE) -lpthread -lnsl -lm $(wrapper_SOURCE) -o $(BIN)/wrapper
 
-libwrapper.so: $(libwrapper_so_OBJECTS)
-	${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+libwrapper.a: $(libwrapper_a_SOURCE)
+	${COMPILE} $(DEFS) -shared -lpthread $(libwrapper_a_SOURCE) -o $(LIB)/libwrapper.a
 
 %.o: %.c
 	@echo '$(COMPILE) -c $<'; \

Modified: trunk/wrapper/src/c/Makefile-linux-ppc-32.make
===================================================================
--- trunk/wrapper/src/c/Makefile-linux-ppc-32.make	2008-02-27 06:38:09 UTC (rev 1402)
+++ trunk/wrapper/src/c/Makefile-linux-ppc-32.make	2008-02-27 14:04:45 UTC (rev 1403)
@@ -8,8 +8,6 @@
 # only in accordance with the terms of the license agreement you
 # entered into with Tanuki Software.
 
-# This makefile is inprogess.  It builds, but the resulting libwrapper.so does not yet work.
-# If you know how to fix it then please help out.
 COMPILE = gcc -O3 -fPIC --pedantic -D_FILE_OFFSET_BITS=64
 
 INCLUDE=$(JAVA_HOME)/include

Modified: trunk/wrapper/src/c/Makefile-linux-ppc-64.make
===================================================================
--- trunk/wrapper/src/c/Makefile-linux-ppc-64.make	2008-02-27 06:38:09 UTC (rev 1402)
+++ trunk/wrapper/src/c/Makefile-linux-ppc-64.make	2008-02-27 14:04:45 UTC (rev 1403)
@@ -8,8 +8,6 @@
 # only in accordance with the terms of the license agreement you
 # entered into with Tanuki Software.
 
-# This makefile is inprogess.  It builds, but the resulting libwrapper.so does not yet work.
-# If you know how to fix it then please help out.
 COMPILE = gcc -O3 -m64 -fPIC --pedantic -D_FILE_OFFSET_BITS=64
 
 INCLUDE=$(JAVA_HOME)/include

Modified: trunk/wrapper/src/c/wrapper_unix.c
===================================================================
--- trunk/wrapper/src/c/wrapper_unix.c	2008-02-27 06:38:09 UTC (rev 1402)
+++ trunk/wrapper/src/c/wrapper_unix.c	2008-02-27 14:04:45 UTC (rev 1403)
@@ -690,6 +690,12 @@
                 log_printf_queue(useLoggerQueue, WRAPPER_SOURCE_WRAPPER, LEVEL_STATUS,
                     "    Sleep: nanosleep interrupted");
             }
+        } else if (errno == 11) {
+            /* On 64-bit AIX this happens once on shutdown. */
+            if (wrapperData->isSleepOutputEnabled) {
+                log_printf_queue(useLoggerQueue, WRAPPER_SOURCE_WRAPPER, LEVEL_STATUS,
+                    "    Sleep: nanosleep unavailable");
+            }
         } else {
             log_printf_queue(useLoggerQueue, WRAPPER_SOURCE_WRAPPER, LEVEL_ERROR,
                 "nanosleep(%dms) failed. %s", ms, getLastErrorText());


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1404
          http://wrapper.svn.sourceforge.net/wrapper/?rev=1404&view=rev
Author:   mortenson
Date:     2008-02-27 21:42:22 -0800 (Wed, 27 Feb 2008)

Log Message:
-----------
Work on the AIX verison

Modified Paths:
--------------
    trunk/wrapper/src/c/wrapper.c
    trunk/wrapper/src/c/wrapper_unix.c

Modified: trunk/wrapper/src/c/wrapper.c
===================================================================
--- trunk/wrapper/src/c/wrapper.c	2008-02-27 14:04:45 UTC (rev 1403)
+++ trunk/wrapper/src/c/wrapper.c	2008-02-28 05:42:22 UTC (rev 1404)
@@ -1920,7 +1920,7 @@
     initMemory = getIntProperty(properties, "wrapper.java.initmemory", 0);
     if (initMemory > 0 ) {
         if (strings) {
-           initMemory = __max(initMemory, 1); /* 1 <= n */
+            initMemory = __max(initMemory, 1); /* 1 <= n */
             strings[index] = malloc(sizeof(char) * (5 + 10 + 1));  /* Allow up to 10 digits. */
             if (!strings[index]) {
                 outOfMemory("WBJCAI", 8);
@@ -1938,7 +1938,7 @@
     maxMemory = getIntProperty(properties, "wrapper.java.maxmemory", 0);
     if (maxMemory > 0) {
         if (strings) {
-           maxMemory = __max(maxMemory, initMemory);  /* initMemory <= n */
+            maxMemory = __max(maxMemory, initMemory);  /* initMemory <= n */
             strings[index] = malloc(sizeof(char) * (5 + 4 + 1));  /* Allow up to 4 digits. */
             if (!strings[index]) {
                 outOfMemory("WBJCAI", 10);

Modified: trunk/wrapper/src/c/wrapper_unix.c
===================================================================
--- trunk/wrapper/src/c/wrapper_unix.c	2008-02-27 14:04:45 UTC (rev 1403)
+++ trunk/wrapper/src/c/wrapper_unix.c	2008-02-28 05:42:22 UTC (rev 1404)
@@ -685,12 +685,12 @@
             "    Sleep: nanosleep %dms", ms);
     }
     if (nanosleep(&ts, NULL)) {
-        if (errno == 4) {
+        if (errno == EINTR) {
             if (wrapperData->isSleepOutputEnabled) {
                 log_printf_queue(useLoggerQueue, WRAPPER_SOURCE_WRAPPER, LEVEL_STATUS,
                     "    Sleep: nanosleep interrupted");
             }
-        } else if (errno == 11) {
+        } else if (errno == EAGAIN) {
             /* On 64-bit AIX this happens once on shutdown. */
             if (wrapperData->isSleepOutputEnabled) {
                 log_printf_queue(useLoggerQueue, WRAPPER_SOURCE_WRAPPER, LEVEL_STATUS,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.