curl_escape 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e245dcbc587665d607975ad25ca806804c28458
-  data.tar.gz: 88e34847057a483229fef9a6887d2065ebc8ef69
+  metadata.gz: 1cc7b71d0852a4742c04075e57c59a9548afab18
+  data.tar.gz: 90d77f2ba82fb50bb2760750a425eccc05f9aaa8
 SHA512:
-  metadata.gz: 414c3cca07d563b8bf429692080f4b5c2b89e3810e2a8bb47c44964400777ec7f64a73c42729f1ce777d364ac87442022d079a9f9b6a68fe5973f9a875e7585f
-  data.tar.gz: 7b503b475257be37c14fe80daf5f0615f0f6bca774dfbb61d70f34ede40605f0dbbc95ad6eb52c5eef2c252f290d0dd828a4b2c7acf7b30ca647571362cc0c33
+  metadata.gz: 644f12380a3198872682c5d4bc0a42449a2e06066beb01909ce13adb749415090954142a9986e30fa2fcb0fe0bde37e3e6af7771ce4ac0a1f121ed2edeb682cc
+  data.tar.gz: 5892f35b9904110e2681994aa724b2248cd331dba4bce1feb3fb173ab484c0d40a60ebdb92d3ba4591c2075b4a9e1b8efb6a992fac4e09aebf7a89377ae2b9e4

data/ext/curl_escape/curl_escape.c

@@ -3,7 +3,7 @@
 #include <ruby.h>
 
 VALUE ruby_curl_escape(VALUE self, VALUE str) {
-  int rest, cnt;
+  int cnt;
   VALUE output;
 
   static CURL *curl;
@@ -14,23 +14,27 @@ VALUE ruby_curl_escape(VALUE self, VALUE str) {
   char *cStr = StringValueCStr(str);
   char *cOutput = curl_easy_escape(curl, cStr, strlen(cStr));
 
+  int pos = 0;
+  char buf[strlen(cOutput) * 3];
+
   if (cOutput) {
     for (cnt = 0; *(cOutput + cnt) != '\0'; cnt++) {
       if (strncmp(cOutput + cnt, "%20", 3) == 0) {
-        *(cOutput + cnt) = '+';
-        rest = strlen(cOutput + cnt + 3);
-        memmove(cOutput + cnt + 1, cOutput + cnt + 3, rest);
-        *(cOutput + cnt + 1 + rest) = '\0';
+        buf[pos] = '+';
+        cnt += 2;
       } else if (*(cOutput + cnt) == '~') {
-        cOutput = realloc(cOutput, strlen(cOutput) + 2);
-        rest = strlen(cOutput + cnt + 1);
-        memmove(cOutput + cnt + 3, cOutput + cnt + 1, rest);
-        *(cOutput + cnt + 3 + rest) = '\0';
-        memcpy(cOutput + cnt, "%7E", 3);
+        buf[pos] = '%';
+        buf[pos+1] = '7';
+        buf[pos+2] = 'E';
+        pos += 2;
+      } else {
+        buf[pos] = *(cOutput + cnt);
       }
+      pos++;
     }
+    buf[pos++] = '\0';
 
-    output = rb_str_new2(cOutput);
+    output = rb_str_new2(buf);
     curl_free(cOutput);
     return output;
   } else {

data/ext/curl_escape/extconf.rb

@@ -1,7 +1,5 @@
 require 'mkmf'
 
-$CFLAGS << ' -Wall'
-
 dir_config('curl').any? || pkg_config('libcurl')
 
 if have_header('curl/curl.h') && have_library('curl', 'curl_easy_init')

data/lib/curl_escape/version.rb

@@ -1,3 +1,3 @@
 module CurlEscape
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: curl_escape
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - joker1007
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-28 00:00:00.000000000 Z
+date: 2016-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler