harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r481090 - /harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/samsa.c
Date Thu, 30 Nov 2006 21:47:42 GMT
Author: geirm
Date: Thu Nov 30 13:47:41 2006
New Revision: 481090

URL: http://svn.apache.org/viewvc?view=rev&rev=481090
Log:
windows tweaks - compiles to a useless binary

need to go back to lnx to test


Modified:
    harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/samsa.c

Modified: harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/samsa.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/samsa.c?view=diff&rev=481090&r1=481089&r2=481090
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/samsa.c (original)
+++ harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/samsa.c Thu Nov 30
13:47:41 2006
@@ -21,6 +21,10 @@
 #include <string.h>
 #include <limits.h>
 
+#if defined(WIN32)
+#include <windows.h>
+#endif
+
 #define EXE_POSTFIX   "/jre/bin/java"
 #define LIB_POSTFIX   "/lib/"
 #define TOOL_JAR      "tools.jar"
@@ -33,6 +37,13 @@
 char *getExeDir();
 char *getJDKRoot();
 
+#if defined(WIN32)
+int WINAPI
+WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine,
+   int nShowCmd)
+{
+}
+#endif
 
 int main (int argc, char **argv, char **envp)
 {
@@ -41,7 +52,9 @@
     char *toolName = NULL;
     int i;
     int newIndex = 0;
-
+    char *jdkRoot = NULL;
+    char *fullExePath = NULL;
+    
     /* 
      * if we can't figure out what tool we are, just bail
      */    
@@ -57,7 +70,7 @@
      *  and the full paths to jars.  This way, we can be called 
      *  from anywhere
      */    
-    char *jdkRoot = getJDKRoot();
+    jdkRoot = getJDKRoot();
     printf("root = %s\n", jdkRoot);
     
     if (!jdkRoot) { 
@@ -65,7 +78,7 @@
         return 2;
     }
        
-    char *fullExePath = (char *) malloc(strlen(jdkRoot) + strlen(EXE_POSTFIX) + 1);
+    fullExePath = (char *) malloc(strlen(jdkRoot) + strlen(EXE_POSTFIX) + 1);
     
     strcpy(fullExePath, jdkRoot);
     strcat(fullExePath, EXE_POSTFIX);
@@ -80,7 +93,10 @@
      *  if we're not java, put the tools on cp, figure out the tool class to invoke...
      */
     if (strcmp(toolName, "java")) {
-        char *classpath = (char *) malloc(strlen(jdkRoot) * 2 + strlen(LIB_POSTFIX) * 2
+        char *classpath;
+        char *buffer;
+        
+        classpath = (char *) malloc(strlen(jdkRoot) * 2 + strlen(LIB_POSTFIX) * 2
                     + strlen(TOOL_JAR) + strlen(ECJ_JAR) + strlen(CLASSPATH_SEP) + 1);
          
         strcpy(classpath, jdkRoot);
@@ -94,7 +110,7 @@
         myArgv[newIndex++] = "-cp";
         myArgv[newIndex++] = classpath;
 
-        char *buffer = (char *) malloc(strlen(CLASS_PREFIX) + strlen(toolName) + strlen(CLASS_POSTFIX)
+ 1);
+        buffer = (char *) malloc(strlen(CLASS_PREFIX) + strlen(toolName) + strlen(CLASS_POSTFIX)
+ 1);
     
         strcpy(buffer, CLASS_PREFIX);
         strcat(buffer, toolName);
@@ -115,8 +131,14 @@
     
     /*
      * now simply execv() the java app w/ the new params
-     */     
-    execv(fullExePath, myArgv);    
+     */ 
+     
+#if defined(WIN32)
+   // do something
+#else    
+    execv(fullExePath, myArgv);
+#endif
+
 }
 
 /**
@@ -164,7 +186,8 @@
  *  returns directory of running exe
  */
 char *getExeDir() {
-    
+
+#if defined(LINUX)    
     char buffer[PATH_MAX + 1];
     
     int size = readlink ("/proc/self/exe", buffer, sizeof(buffer)-1);
@@ -177,6 +200,8 @@
         *last = '\0';
         return strdup(buffer);
     }
+#else
+#endif
     
     return NULL;
 }



Mime
View raw message