1 files changed, 48 insertions, 19 deletions
@@ -6,7 +6,7 @@
 $Date$
 created at: Fri Oct 15 10:39:26 JST 1993
- Copyright (C) 1993-2003 Yukihiro Matsumoto
 Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
 Copyright (C) 2000 Information-technology Promotion Agency, Japan
@@ -14,7 +14,7 @@
 #include "ruby/ruby.h"
 #include "ruby/re.h"
-#include <ctype.h>
 #include <math.h>
 #include <stdarg.h>
@@ -115,7 +115,7 @@ sign_bits(int base, const char *p)
 ((nth >= argc) ? (rb_raise(rb_eArgError, "too few arguments"), 0) : argv[nth])
 #define GETNUM(n, val) \
- for (; p < end && ISDIGIT(*p); p++) { \
 int next_n = 10 * n + (*p - '0'); \
 if (next_n / 10 != n) {\
 rb_raise(rb_eArgError, #val " too big"); \
@@ -254,6 +254,7 @@ rb_f_sprintf(int argc, const VALUE *argv)
 VALUE
 rb_str_format(int argc, const VALUE *argv, VALUE fmt)
 {
 const char *p, *end;
 char *buf;
 int blen, bsiz;
@@ -286,6 +287,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
 --argv;
 if (OBJ_TAINTED(fmt)) tainted = 1;
 StringValue(fmt);
 fmt = rb_str_new4(fmt);
 p = RSTRING_PTR(fmt);
 end = p + RSTRING_LEN(fmt);
@@ -311,7 +313,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
 retry:
 switch (*p) {
 default:
- if (ISPRINT(*p))
 rb_raise(rb_eArgError, "malformed format string - %%%c", *p);
 else
 rb_raise(rb_eArgError, "malformed format string");
@@ -409,24 +411,38 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
 {
 VALUE val = GETARG();
 VALUE tmp;
- char c;
 tmp = rb_check_string_type(val);
 if (!NIL_P(tmp)) {
- if (RSTRING_LEN(tmp) != 1) {
 rb_raise(rb_eArgError, "%%c requires a character");
 }
- c = RSTRING_PTR(tmp)[0];
 }
 else {
- c = NUM2INT(val) & 0xff;
 }
 if (!(flags & FWIDTH)) {
- PUSH(&c, 1);
 }
 else {
- FILL(' ', width);
- buf[blen - ((flags & FMINUS) ? width : 1)] = c;
 }
 }
 break;
@@ -435,30 +451,42 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
 case 'p':
 {
 VALUE arg = GETARG();
- long len;
 if (*p == 'p') arg = rb_inspect(arg);
 str = rb_obj_as_string(arg);
 if (OBJ_TAINTED(str)) tainted = 1;
 len = RSTRING_LEN(str);
 if (flags&FPREC) {
- if (prec < len) {
- len = prec;
 }
 }
 /* need to adjust multi-byte string pos */
 if (flags&FWIDTH) {
- if (width > len) {
- CHECK(width);
- width -= len;
 if (!(flags&FMINUS)) {
 while (width--) {
 buf[blen++] = ' ';
 }
 }
 memcpy(&buf[blen], RSTRING_PTR(str), len);
 blen += len;
 if (flags&FMINUS) {
 while (width--) {
 buf[blen++] = ' ';
 }
@@ -666,8 +694,9 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
 if (*p == 'X') {
 char *pp = s;
- while (*pp) {
- *pp = toupper(*pp);
 pp++;
 }
 }