rjb 1.2.4 → 1.2.5

data/ChangeLog

@@ -1,3 +1,8 @@
+Wed Jun 9 arton
+ *ext/load.c
+	accept JAVA_HOME having an extra slash at the end
+ *ext/rjb.c
+	RJB_VERSION -> 1.2.5
 Fri Jun 5 arton	
  *ext/rjb.h
 	defin HAVE_LONG_LONG if no HAVE_LONG_LONG but LP64

data/ext/load.c

@@ -148,12 +148,20 @@ static int load_jvm(char* jvmtype)
     }
     else
     {
-        if (strlen(jh) > HOME_NAME_LEN 
-            && strcasecmp(jh + strlen(jh) - HOME_NAME_LEN, HOME_NAME) == 0)
+        if (strlen(jh) > HOME_NAME_LEN)
         {
-            char* p = ALLOCA_N(char, strlen(jh) + 8);
-            sprintf(p, "%s/..", jh);
-            jh = p;
+            int len = strlen(jh);
+            char* p = ALLOCA_N(char, len + 8);
+            jh = strcpy(p, jh);
+            if (*(jh + len - 1) == '/')
+            {
+                --len;
+                *(jh + len) = '\0';
+            }
+            if (strcasecmp(jh + len - HOME_NAME_LEN, HOME_NAME) == 0)
+            {
+                strcpy(p + len, "/..");
+            }
         }
     }
 #endif

data/ext/rjb.c

@@ -15,7 +15,7 @@
  * $Id: rjb.c 122 2010-06-05 03:08:29Z arton $
  */
 
-#define RJB_VERSION "1.2.4"
+#define RJB_VERSION "1.2.5"
 
 #include "ruby.h"
 #include "extconf.h"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rjb
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 2
-  - 4
-  version: 1.2.4
+  - 5
+  version: 1.2.5
 platform: ruby
 authors: 
 - arton
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-05 00:00:00 +09:00
+date: 2010-06-09 00:00:00 +09:00
 default_executable: 
 dependencies: []