harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r482608 - /harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/samsa.c
Date Tue, 05 Dec 2006 11:49:24 GMT
Author: geirm
Date: Tue Dec  5 03:49:17 2006
New Revision: 482608

URL: http://svn.apache.org/viewvc?view=rev&rev=482608
Log:
win32 tweaks - doesn't have strcase*() for example :)


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=482608&r1=482607&r2=482608
==============================================================================
--- 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 Tue Dec  5
03:49:17 2006
@@ -182,9 +182,9 @@
     
     myArgv[newIndex] = '\0';
 
-//    for (i=0; i < myArgvCount; i++) { 
-//        printf(" %d = %s\n", i, myArgv[i]);
-//    }
+    for (i=0; i < myArgvCount; i++) { 
+        printf(" %d = %s\n", i, myArgv[i]);
+    }
 
     free(toolName);
         
@@ -261,13 +261,13 @@
         temp = strdup(name);
     }
     
-    char *exe = strcasestr(temp, ".exe");
+    exe = strstr(temp, ".exe");
          
-     if (exe) { 
-        *exe = '\0';
-     }
+    if (exe) { 
+       *exe = '\0';
+    }
          
-     return temp;     
+    return temp;     
  #endif
     
  #if defined(LINUX)
@@ -397,8 +397,13 @@
     if (fp) {
         while (EOF != (count= fscanf(fp, "%s = %s\n", key, value))) {
             // printf("count = %d : %s = %s\n", count, key, value);
-            
+
+#if defined(LINUX)            
             if (count == 2 && !strcasecmp("tooljar", key)) {
+#endif
+#if defined(WIN32)
+            if (count == 2 && !strcmp("tooljar", key)) {
+#endif
                 pToolData->jarList = (char **) realloc(pToolData->jarList, (pToolData->numJars
+ 1) * sizeof(char *));
                 pToolData->jarList[pToolData->numJars++] = strdup(value);
             }



Mime
View raw message