From 66739f59ac8c45a3716e1b35dc0e059ae75e6aa8 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 1 Dec 2015 08:09:17 +0000
Subject: cstr.c: split bug_str_cstr_unterm

* ext/-test-/string/cstr.c (bug_str_cstr_unterm): split
  unterminating from bug_str_cstr_term.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52832 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/-test-/string/cstr.c       | 30 ++++++++++++++++++++++++++++--
 test/-ext-/string/test_cstr.rb |  6 ++++++
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/ext/-test-/string/cstr.c b/ext/-test-/string/cstr.c
index ba2e46bc55..897793d7ed 100644
--- a/ext/-test-/string/cstr.c
+++ b/ext/-test-/string/cstr.c
@@ -9,9 +9,7 @@ bug_str_cstr_term(VALUE str)
     int c;
     rb_encoding *enc;
 
-    rb_str_modify(str);
     len = RSTRING_LEN(str);
-    RSTRING_PTR(str)[len] = 'x';
     s = StringValueCStr(str);
     rb_gc();
     enc = rb_enc_get(str);
@@ -19,6 +17,17 @@ bug_str_cstr_term(VALUE str)
     return INT2NUM(c);
 }
 
+static VALUE
+bug_str_cstr_unterm(VALUE str, VALUE c)
+{
+    long len;
+
+    rb_str_modify(str);
+    len = RSTRING_LEN(str);
+    RSTRING_PTR(str)[len] = NUM2CHR(c);
+    return str;
+}
+
 static VALUE
 bug_str_cstr_term_char(VALUE str)
 {
@@ -41,6 +50,20 @@ bug_str_cstr_term_char(VALUE str)
     return rb_enc_uint_chr((unsigned int)c, enc);
 }
 
+static VALUE
+bug_str_s_cstr_term(VALUE self, VALUE str)
+{
+    Check_Type(str, T_STRING);
+    return bug_str_cstr_term(str);
+}
+
+static VALUE
+bug_str_s_cstr_unterm(VALUE self, VALUE str, VALUE c)
+{
+    Check_Type(str, T_STRING);
+    return bug_str_cstr_unterm(str, c);
+}
+
 static VALUE
 bug_str_s_cstr_term_char(VALUE self, VALUE str)
 {
@@ -52,6 +75,9 @@ void
 Init_cstr(VALUE klass)
 {
     rb_define_method(klass, "cstr_term", bug_str_cstr_term, 0);
+    rb_define_method(klass, "cstr_unterm", bug_str_cstr_unterm, 1);
     rb_define_method(klass, "cstr_term_char", bug_str_cstr_term_char, 0);
+    rb_define_singleton_method(klass, "cstr_term", bug_str_s_cstr_term, 1);
+    rb_define_singleton_method(klass, "cstr_unterm", bug_str_s_cstr_unterm, 2);
     rb_define_singleton_method(klass, "cstr_term_char", bug_str_s_cstr_term_char, 1);
 }
diff --git a/test/-ext-/string/test_cstr.rb b/test/-ext-/string/test_cstr.rb
index 7e24ec6a70..99c1325bf3 100644
--- a/test/-ext-/string/test_cstr.rb
+++ b/test/-ext-/string/test_cstr.rb
@@ -7,11 +7,13 @@ class Test_StringCStr < Test::Unit::TestCase
   def test_embed
     s = Bug::String.new("abcdef")
     s.set_len(3)
+    s.cstr_unterm('x')
     assert_equal(0, s.cstr_term, Bug4319)
   end
 
   def test_long
     s = Bug::String.new("abcdef")*100000
+    s.cstr_unterm('x')
     assert_equal(0, s.cstr_term, Bug4319)
   end
 
@@ -20,9 +22,11 @@ class Test_StringCStr < Test::Unit::TestCase
   def test_wchar_embed
     WCHARS.each do |enc|
       s = Bug::String.new("\u{4022}a".encode(enc))
+      s.cstr_unterm('x')
       assert_nothing_raised(ArgumentError) {s.cstr_term}
       s.set_len(s.bytesize / 2)
       assert_equal(1, s.size)
+      s.cstr_unterm('x')
       assert_equal(0, s.cstr_term)
     end
   end
@@ -33,9 +37,11 @@ class Test_StringCStr < Test::Unit::TestCase
     len = str.size * n
     WCHARS.each do |enc|
       s = Bug::String.new(str.encode(enc))*n
+      s.cstr_unterm('x')
       assert_nothing_raised(ArgumentError, enc.name) {s.cstr_term}
       s.set_len(s.bytesize / 2)
       assert_equal(len / 2, s.size, enc.name)
+      s.cstr_unterm('x')
       assert_equal(0, s.cstr_term, enc.name)
     end
   end
-- 
cgit v1.2.3