oj 3.9.1 → 3.16.11

data/pages/Rails.md

@@ -1,3 +1,15 @@
+# Rails Quickstart
+
+To universally replace Rails' use of the json gem with Oj, and also
+have Oj "take over" many methods on the JSON constant (`load`, `parse`, etc.) with
+their faster Oj counterparts, add this to an initializer:
+
+```ruby
+Oj.optimize_rails()
+```
+
+For more details and options, read on...
+
 # Oj Rails Compatibility
 
 The `:rails` mode mimics the ActiveSupport version 5 encoder. Rails and
@@ -26,44 +38,44 @@ directly. If Rails mode is also desired then use the `Oj.default_options` to
 change the default mode.
 
 Some of the Oj options are supported as arguments to the encoder if called
-from Oj::Rails.encode() but when using the Oj::Rails::Encoder class the
-encode() method does not support optional arguments as required by the
+from `Oj::Rails.encode()` but when using the `Oj::Rails::Encoder` class the
+`encode()` method does not support optional arguments as required by the
 ActiveSupport compliance guidelines. The general approach Rails takes for
 configuring encoding options is to either set global values or to create a new
 instance of the Encoder class and provide options in the initializer.
 
 The globals that ActiveSupport uses for encoding are:
 
- * ActiveSupport::JSON::Encoding.use_standard_json_time_format
- * ActiveSupport::JSON::Encoding.escape_html_entities_in_json
- * ActiveSupport::JSON::Encoding.time_precision
- * ActiveSupport::JSON::Encoding.json_encoder
+ * `ActiveSupport::JSON::Encoding.use_standard_json_time_format`
+ * `ActiveSupport::JSON::Encoding.escape_html_entities_in_json`
+ * `ActiveSupport::JSON::Encoding.time_precision`
+ * `ActiveSupport::JSON::Encoding.json_encoder`
 
 Those globals are aliased to also be accessed from the ActiveSupport module
-directly so ActiveSupport::JSON::Encoding.time_precision can also be accessed
-from ActiveSupport.time_precision. Oj makes use of these globals in mimicing
-Rails after the Oj::Rails.set_encode() method is called. That also sets the
-ActiveSupport.json_encoder to the Oj::Rails::Encoder class.
+directly so `ActiveSupport::JSON::Encoding.time_precision` can also be accessed
+from `ActiveSupport.time_precision`. Oj makes use of these globals in mimicking
+Rails after the `Oj::Rails.set_encode()` method is called. That also sets the
+`ActiveSupport.json_encoder` to the `Oj::Rails::Encoder` class.
 
-Options passed into a call to to_json() are passed to the as_json()
+Options passed into a call to `to_json()` are passed to the `as_json()`
 methods. These are mostly ignored by Oj and simply passed on without
 modifications as per the guidelines. The exception to this are the options
-specific to Oj such as the :circular option which it used to detect circular
+specific to Oj such as the `:circular` option which it used to detect circular
 references while encoding.
 
 By default Oj acts like the ActiveSupport encoder and honors any changes in
-the as_json() methods. There are some optimized Oj encoders for some
-classes. When the optimized encoder it toggled the as_json() methods will not
+the `as_json()` methods. There are some optimized Oj encoders for some
+classes. When the optimized encoder it toggled the `as_json()` methods will not
 be called for that class but instead the optimized version will be called. The
 optimized version is the same as the ActiveSupport default encoding for a
-given class. The optimized versions are toggled with the optimize() and
-deoptimize() methods. There is a default optimized version for every class
+given class. The optimized versions are toggled with the `optimize()` and
+`deoptimize()` methods. There is a default optimized version for every class
 that takes the visible attributes and encodes them but that may not be the
 same as what Rails uses. Trial and error is the best approach for classes not
 listed here.
 
 The classes that can be put in optimized mode and are optimized when
-Oj::Rails.optimize is called with no arguments are:
+`Oj::Rails.optimize` is called with no arguments are:
 
  * Array
  * BigDecimal
@@ -77,8 +89,47 @@ Oj::Rails.optimize is called with no arguments are:
  * any class inheriting from ActiveRecord::Base
  * any other class where all attributes should be dumped
 
-The ActiveSupport decoder is the JSON.parse() method. Calling the
-Oj::Rails.set_decoder() method replaces that method with the Oj equivalent.
+The ActiveSupport decoder is the `JSON.parse()` method. Calling the
+`Oj::Rails.set_decoder()` method replaces that method with the Oj equivalent.
+
+### Usage in Rails 3
+
+To support Rails 3 you can create a new module mixin to prepend to controllers:
+
+```ruby
+require 'oj'
+
+module OjJsonEncoder
+  def render(options = nil, extra_options = {}, &block)
+    if options && options.is_a?(Hash) && options[:json]
+      obj = options.delete(:json)
+      obj = Oj.dump(obj, :mode => :rails) unless obj.is_a?(String)
+      options[:text] = obj
+      response.content_type ||= Mime::JSON
+    end
+    super
+  end
+end
+```
+
+Usage:
+
+```ruby
+class MyController < ApplicationController
+  prepend OjJsonEncoder
+  def index
+    render :json => { :hello => 'world' }
+  end
+end
+```
+
+### Older Ruby Version Support (Pre 2.3.0)
+
+If you are using an older version of Ruby, you can pin `oj` to an earlier version in your Gemfile:
+
+```ruby
+gem 'oj', '3.7.12'
+```
 
 ### Notes:
 
@@ -86,9 +137,9 @@ Oj::Rails.set_decoder() method replaces that method with the Oj equivalent.
    Ruby which is used by the json gem and by Rails. Ruby varies the
    significant digits which can be either 16 or 17 depending on the value.
 
-2. Optimized Hashs do not collapse keys that become the same in the output. As
-   an example, a non-String object that has a to_s() method will become the
-   return value of the to_s() method in the output without checking to see if
+2. Optimized Hashes do not collapse keys that become the same in the output. As
+   an example, a non-String object that has a `to_s()` method will become the
+   return value of the `to_s()` method in the output without checking to see if
    that has already been used. This could occur is a mix of String and Symbols
    are used as keys or if a other non-String objects such as Numerics are mixed
    with numbers as Strings.

metadata

@@ -1,35 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.9.1
+  version: 3.16.11
 platform: ruby
 authors:
 - Peter Ohler
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-31 00:00:00.000000000 Z
+date: 2025-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: bigdecimal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
+        version: '3.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
-    - - "<"
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -45,33 +52,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: wwtd
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 description: The fastest JSON parser and object serializer.
 email: peter@ohler.com
 executables: []
@@ -79,20 +92,29 @@ extensions:
 - ext/oj/extconf.rb
 extra_rdoc_files:
 - README.md
-- pages/Rails.md
-- pages/JsonGem.md
-- pages/Encoding.md
-- pages/WAB.md
-- pages/Custom.md
+- LICENSE
+- CHANGELOG.md
+- RELEASE_NOTES.md
 - pages/Advanced.md
-- pages/Options.md
 - pages/Compatibility.md
+- pages/Custom.md
+- pages/Encoding.md
+- pages/InstallOptions.md
+- pages/JsonGem.md
 - pages/Modes.md
+- pages/Options.md
+- pages/Parser.md
+- pages/Rails.md
 - pages/Security.md
+- pages/WAB.md
 files:
+- CHANGELOG.md
 - LICENSE
 - README.md
+- RELEASE_NOTES.md
 - ext/oj/buf.h
+- ext/oj/cache.c
+- ext/oj/cache.h
 - ext/oj/cache8.c
 - ext/oj/cache8.h
 - ext/oj/circarray.c
@@ -101,6 +123,7 @@ files:
 - ext/oj/code.h
 - ext/oj/compat.c
 - ext/oj/custom.c
+- ext/oj/debug.c
 - ext/oj/dump.c
 - ext/oj/dump.h
 - ext/oj/dump_compat.c
@@ -108,13 +131,15 @@ files:
 - ext/oj/dump_object.c
 - ext/oj/dump_strict.c
 - ext/oj/encode.h
+- ext/oj/encoder.c
 - ext/oj/err.c
 - ext/oj/err.h
 - ext/oj/extconf.rb
 - ext/oj/fast.c
-- ext/oj/hash.c
-- ext/oj/hash.h
-- ext/oj/hash_test.c
+- ext/oj/intern.c
+- ext/oj/intern.h
+- ext/oj/mem.c
+- ext/oj/mem.h
 - ext/oj/mimic_json.c
 - ext/oj/object.c
 - ext/oj/odd.c
@@ -123,6 +148,8 @@ files:
 - ext/oj/oj.h
 - ext/oj/parse.c
 - ext/oj/parse.h
+- ext/oj/parser.c
+- ext/oj/parser.h
 - ext/oj/rails.c
 - ext/oj/rails.h
 - ext/oj/reader.c
@@ -132,17 +159,23 @@ files:
 - ext/oj/rxclass.c
 - ext/oj/rxclass.h
 - ext/oj/saj.c
+- ext/oj/saj2.c
+- ext/oj/saj2.h
 - ext/oj/scp.c
+- ext/oj/simd.h
 - ext/oj/sparse.c
 - ext/oj/stream_writer.c
 - ext/oj/strict.c
 - ext/oj/string_writer.c
 - ext/oj/trace.c
 - ext/oj/trace.h
+- ext/oj/usual.c
+- ext/oj/usual.h
 - ext/oj/util.c
 - ext/oj/util.h
 - ext/oj/val_stack.c
 - ext/oj/val_stack.h
+- ext/oj/validate.c
 - ext/oj/wab.c
 - lib/oj.rb
 - lib/oj/active_support_helper.rb
@@ -159,91 +192,14 @@ files:
 - pages/Compatibility.md
 - pages/Custom.md
 - pages/Encoding.md
+- pages/InstallOptions.md
 - pages/JsonGem.md
 - pages/Modes.md
 - pages/Options.md
+- pages/Parser.md
 - pages/Rails.md
 - pages/Security.md
 - pages/WAB.md
-- test/_test_active.rb
-- test/_test_active_mimic.rb
-- test/_test_mimic_rails.rb
-- test/activerecord/result_test.rb
-- test/activesupport4/decoding_test.rb
-- test/activesupport4/encoding_test.rb
-- test/activesupport4/test_helper.rb
-- test/activesupport5/decoding_test.rb
-- test/activesupport5/encoding_test.rb
-- test/activesupport5/encoding_test_cases.rb
-- test/activesupport5/test_helper.rb
-- test/activesupport5/time_zone_test_helpers.rb
-- test/bar.rb
-- test/files.rb
-- test/foo.rb
-- test/helper.rb
-- test/isolated/shared.rb
-- test/isolated/test_mimic_after.rb
-- test/isolated/test_mimic_alone.rb
-- test/isolated/test_mimic_as_json.rb
-- test/isolated/test_mimic_before.rb
-- test/isolated/test_mimic_define.rb
-- test/isolated/test_mimic_rails_after.rb
-- test/isolated/test_mimic_rails_before.rb
-- test/isolated/test_mimic_redefine.rb
-- test/json_gem/json_addition_test.rb
-- test/json_gem/json_common_interface_test.rb
-- test/json_gem/json_encoding_test.rb
-- test/json_gem/json_ext_parser_test.rb
-- test/json_gem/json_fixtures_test.rb
-- test/json_gem/json_generator_test.rb
-- test/json_gem/json_generic_object_test.rb
-- test/json_gem/json_parser_test.rb
-- test/json_gem/json_string_matching_test.rb
-- test/json_gem/test_helper.rb
-- test/perf.rb
-- test/perf_compat.rb
-- test/perf_fast.rb
-- test/perf_file.rb
-- test/perf_object.rb
-- test/perf_saj.rb
-- test/perf_scp.rb
-- test/perf_simple.rb
-- test/perf_strict.rb
-- test/perf_wab.rb
-- test/sample.rb
-- test/sample/change.rb
-- test/sample/dir.rb
-- test/sample/doc.rb
-- test/sample/file.rb
-- test/sample/group.rb
-- test/sample/hasprops.rb
-- test/sample/layer.rb
-- test/sample/line.rb
-- test/sample/oval.rb
-- test/sample/rect.rb
-- test/sample/shape.rb
-- test/sample/text.rb
-- test/sample_json.rb
-- test/test_compat.rb
-- test/test_custom.rb
-- test/test_debian.rb
-- test/test_fast.rb
-- test/test_file.rb
-- test/test_gc.rb
-- test/test_hash.rb
-- test/test_integer_range.rb
-- test/test_null.rb
-- test/test_object.rb
-- test/test_saj.rb
-- test/test_scp.rb
-- test/test_strict.rb
-- test/test_various.rb
-- test/test_wab.rb
-- test/test_writer.rb
-- test/tests.rb
-- test/tests_mimic.rb
-- test/tests_mimic_addition.rb
-- test/zoo.rb
 homepage: http://www.ohler.com/oj
 licenses:
 - MIT
@@ -254,7 +210,7 @@ metadata:
   homepage_uri: http://www.ohler.com/oj/
   source_code_uri: https://github.com/ohler55/oj
   wiki_uri: https://github.com/ohler55/oj/wiki
-post_install_message: 
+  rubygems_mfa_required: 'true'
 rdoc_options:
 - "--title"
 - Oj
@@ -266,94 +222,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A fast JSON parser and serializer.
-test_files:
-- test/foo.rb
-- test/test_integer_range.rb
-- test/test_strict.rb
-- test/perf_strict.rb
-- test/tests.rb
-- test/perf_saj.rb
-- test/test_compat.rb
-- test/helper.rb
-- test/perf_file.rb
-- test/test_scp.rb
-- test/perf_compat.rb
-- test/json_gem/json_common_interface_test.rb
-- test/json_gem/json_addition_test.rb
-- test/json_gem/json_fixtures_test.rb
-- test/json_gem/json_ext_parser_test.rb
-- test/json_gem/json_string_matching_test.rb
-- test/json_gem/json_generic_object_test.rb
-- test/json_gem/json_generator_test.rb
-- test/json_gem/test_helper.rb
-- test/json_gem/json_encoding_test.rb
-- test/json_gem/json_parser_test.rb
-- test/perf_wab.rb
-- test/test_file.rb
-- test/test_object.rb
-- test/sample.rb
-- test/perf_object.rb
-- test/test_hash.rb
-- test/test_custom.rb
-- test/bar.rb
-- test/activesupport4/encoding_test.rb
-- test/activesupport4/test_helper.rb
-- test/activesupport4/decoding_test.rb
-- test/sample_json.rb
-- test/activesupport5/encoding_test_cases.rb
-- test/activesupport5/encoding_test.rb
-- test/activesupport5/time_zone_test_helpers.rb
-- test/activesupport5/test_helper.rb
-- test/activesupport5/decoding_test.rb
-- test/test_saj.rb
-- test/perf_scp.rb
-- test/test_wab.rb
-- test/test_null.rb
-- test/_test_active.rb
-- test/_test_mimic_rails.rb
-- test/test_fast.rb
-- test/perf_fast.rb
-- test/sample/change.rb
-- test/sample/text.rb
-- test/sample/doc.rb
-- test/sample/shape.rb
-- test/sample/layer.rb
-- test/sample/group.rb
-- test/sample/file.rb
-- test/sample/rect.rb
-- test/sample/hasprops.rb
-- test/sample/line.rb
-- test/sample/dir.rb
-- test/sample/oval.rb
-- test/tests_mimic.rb
-- test/perf_simple.rb
-- test/zoo.rb
-- test/activerecord/result_test.rb
-- test/_test_active_mimic.rb
-- test/tests_mimic_addition.rb
-- test/test_writer.rb
-- test/perf.rb
-- test/isolated/test_mimic_define.rb
-- test/isolated/test_mimic_after.rb
-- test/isolated/test_mimic_rails_after.rb
-- test/isolated/test_mimic_before.rb
-- test/isolated/test_mimic_rails_before.rb
-- test/isolated/test_mimic_redefine.rb
-- test/isolated/shared.rb
-- test/isolated/test_mimic_alone.rb
-- test/isolated/test_mimic_as_json.rb
-- test/test_debian.rb
-- test/test_gc.rb
-- test/files.rb
-- test/test_various.rb
+test_files: []

data/ext/oj/hash.c

@@ -1,163 +0,0 @@
-/* hash.c
- * Copyright (c) 2011, Peter Ohler
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- *  - Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- * 
- *  - Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 
- *  - Neither the name of Peter Ohler nor the names of its contributors may be
- *    used to endorse or promote products derived from this software without
- *    specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "hash.h"
-#include <stdint.h>
-
-#define HASH_MASK	0x000003FF
-#define  HASH_SLOT_CNT	1024
-
-typedef struct _keyVal {
-    struct _keyVal	*next;
-    const char		*key;
-    size_t		len;
-    VALUE		val;
-} *KeyVal;
-
-struct _hash {
-    struct _keyVal	slots[HASH_SLOT_CNT];
-};
-
-struct _hash	class_hash;
-struct _hash	intern_hash;
-
-// almost the Murmur hash algorithm
-#define M 0x5bd1e995
-#define C1 0xCC9E2D51
-#define C2 0x1B873593
-#define N  0xE6546B64
-
-static uint32_t
-hash_calc(const uint8_t *key, size_t len) {
-    const uint8_t	*end = key + len;
-    const uint8_t	*endless = key + (len / 4 * 4);
-    uint32_t		h = (uint32_t)len;
-    uint32_t		k;
-
-    while (key < endless) {
-	k = (uint32_t)*key++;
-	k |= (uint32_t)*key++ << 8;
-	k |= (uint32_t)*key++ << 16;
-	k |= (uint32_t)*key++ << 24;
-
-        k *= M;
-        k ^= k >> 24;
-        h *= M;
-        h ^= k * M;
-    }
-    if (1 < end - key) {
-	uint16_t	k16 = (uint16_t)*key++;
-
-	k16 |= (uint16_t)*key++ << 8;
-	h ^= k16 << 8;
-    }
-    if (key < end) {
-	h ^= *key;
-    }
-    h *= M;
-    h ^= h >> 13;
-    h *= M;
-    h ^= h >> 15;
-    
-    return h;
-}
-
-void
-oj_hash_init() {
-    memset(class_hash.slots, 0, sizeof(class_hash.slots));
-    memset(intern_hash.slots, 0, sizeof(intern_hash.slots));
-}
-
-// if slotp is 0 then just lookup
-static VALUE
-hash_get(Hash hash, const char *key, size_t len, VALUE **slotp, VALUE def_value) {
-    uint32_t	h = hash_calc((const uint8_t*)key, len) & HASH_MASK;
-    KeyVal	bucket = hash->slots + h;
-
-    if (0 != bucket->key) {
-	KeyVal	b;
-
-	for (b = bucket; 0 != b; b = b->next) {
-	    if (len == b->len && 0 == strncmp(b->key, key, len)) {
-		*slotp = &b->val;
-		return b->val;
-	    }
-	    bucket = b;
-	}
-    }
-    if (0 != slotp) {
-	if (0 != bucket->key) {
-	    KeyVal	b = ALLOC(struct _keyVal);
-	
-	    b->next = 0;
-	    bucket->next = b;
-	    bucket = b;
-	}
-	bucket->key = oj_strndup(key, len);
-	bucket->len = len;
-	bucket->val = def_value;
-	*slotp = &bucket->val;
-    }
-    return def_value;
-}
-
-void
-oj_hash_print() {
-    int		i;
-    KeyVal	b;
-
-    for (i = 0; i < HASH_SLOT_CNT; i++) {
-	printf("%4d:", i);
-	for (b = class_hash.slots + i; 0 != b && 0 != b->key; b = b->next) {
-	    printf(" %s", b->key);
-	}
-	printf("\n");
-    }
-}
-
-VALUE
-oj_class_hash_get(const char *key, size_t len, VALUE **slotp) {
-    return hash_get(&class_hash, key, len, slotp, Qnil);
-}
-
-ID
-oj_attr_hash_get(const char *key, size_t len, ID **slotp) {
-    return (ID)hash_get(&intern_hash, key, len, (VALUE**)slotp, 0);
-}
-
-char*
-oj_strndup(const char *s, size_t len) {
-    char	*d = ALLOC_N(char, len + 1);
-    
-    memcpy(d, s, len);
-    d[len] = '\0';
-
-    return d;
-}