diff options
author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-08-20 01:04:02 +0900 |
---|---|---|
committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-08-20 03:57:13 +0900 |
commit | 1ef49de83483e6f78bfe9c795a473ccfb29db150 (patch) | |
tree | f6c48f28801763a95372f143b2cdea5564b96336 /sprintf.c | |
parent | ce384ef5a95b809f248e089c1608e60753dabe45 (diff) |
[Bug #18955] format single character for `%c`
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/6258
Diffstat (limited to 'sprintf.c')
-rw-r--r-- | sprintf.c | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -441,12 +441,10 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt) tmp = rb_check_string_type(val); if (!NIL_P(tmp)) { - rb_encoding *valenc = rb_enc_get(tmp); - if (rb_enc_strlen(RSTRING_PTR(tmp), RSTRING_END(tmp), valenc) != 1) { - rb_raise(rb_eArgError, "%%c requires a character"); - } - c = rb_enc_codepoint_len(RSTRING_PTR(tmp), RSTRING_END(tmp), &n, valenc); - RB_GC_GUARD(tmp); + flags |= FPREC; + prec = 1; + str = tmp; + goto format_s1; } else { c = NUM2INT(val); @@ -488,6 +486,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt) else { str = rb_obj_as_string(arg); } + format_s1: len = RSTRING_LEN(str); rb_str_set_len(result, blen); if (coderange != ENC_CODERANGE_BROKEN && scanned < blen) { |