1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/strscan/strscan.c: should infect also return values of #inspect.

Browse Source 
* ext/strscan/strscan.c: use snprintf() instead of sprintf().


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3610 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
aamine 2003-03-25 01:11:08 +00:00
parent ece972717b
commit 2d505ae6f6
2 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Tue Mar 25 10:18:05 2003 Minero Aoki <aamine@loveruby.net>
* ext/strscan/strscan.c: should infect also return values of
#inspect.
* ext/strscan/strscan.c: use snprintf() instead of sprintf().
Mon Mar 24 16:55:04 2003 Takaaki Tateishi <ttate@ttsky.net> Mon Mar 24 16:55:04 2003 Takaaki Tateishi <ttate@ttsky.net>
* ext/dl/dl.c: added rb_secure(4). (Thanks to Minero Aoki) * ext/dl/dl.c: added rb_secure(4). (Thanks to Minero Aoki)

37
ext/strscan/strscan.c
View File

@ -1,8 +1,8 @@
/* vi:set sw=4: /*
strscan.c strscan.c
Copyright (c) 1999-2002 Minero Aoki <aamine@loveruby.net> Copyright (c) 1999-2003 Minero Aoki <aamine@loveruby.net>
This program is free software. This program is free software.
You can distribute/modify this program under the terms of You can distribute/modify this program under the terms of
@ -644,34 +644,35 @@ strscan_rest_size(self)
#define INSPECT_LENGTH 5 #define INSPECT_LENGTH 5
#define BUFSIZE 256
static VALUE static VALUE
strscan_inspect(self) strscan_inspect(self)
VALUE self; VALUE self;
{ {
struct strscanner *p; struct strscanner *p;
char buf[256]; char buf[BUFSIZE];
char buf_before[16]; char buf_before[16];
char buf_after[16]; char buf_after[16];
long len; long len;
Data_Get_Struct(self, struct strscanner, p); Data_Get_Struct(self, struct strscanner, p);
if (NIL_P(p->str)) { if (NIL_P(p->str)) {
len = sprintf(buf, "#<%s (uninitialized)>", len = snprintf(buf, BUFSIZE, "#<%s (uninitialized)>",
rb_class2name(CLASS_OF(self))); rb_class2name(CLASS_OF(self)));
return rb_str_new(buf, len); return infect(rb_str_new(buf, len), p);
} }
if (EOS_P(p)) { if (EOS_P(p)) {
len = sprintf(buf, "#<%s fin>", len = snprintf(buf, BUFSIZE, "#<%s fin>",
rb_class2name(CLASS_OF(self))); rb_class2name(CLASS_OF(self)));
return rb_str_new(buf, len); return infect(rb_str_new(buf, len), p);
} }
len = sprintf(buf, "#<%s %ld/%ld %s@%s>", len = snprintf(buf, BUFSIZE, "#<%s %ld/%ld %s@%s>",
rb_class2name(CLASS_OF(self)), rb_class2name(CLASS_OF(self)),
p->curr, S_LEN(p), p->curr, S_LEN(p),
inspect_before(p, buf_before), inspect_before(p, buf_before),
inspect_after(p, buf_after)); inspect_after(p, buf_after));
return rb_str_new(buf, len); return infect(rb_str_new(buf, len), p);
} }
static char* static char*
@ -748,10 +749,8 @@ Init_strscan()
rb_const_set(StringScanner, rb_intern("Id"), tmp); rb_const_set(StringScanner, rb_intern("Id"), tmp);
rb_define_alloc_func(StringScanner, strscan_s_allocate); rb_define_alloc_func(StringScanner, strscan_s_allocate);
rb_define_private_method(StringScanner, "initialize", rb_define_private_method(StringScanner, "initialize", strscan_initialize, -1);
strscan_initialize, -1); rb_define_singleton_method(StringScanner, "must_C_version", strscan_s_mustc, 0);
rb_define_singleton_method(StringScanner, "must_C_version",
strscan_s_mustc, 0);
rb_define_method(StringScanner, "reset", strscan_reset, 0); rb_define_method(StringScanner, "reset", strscan_reset, 0);
rb_define_method(StringScanner, "terminate", strscan_terminate, 0); rb_define_method(StringScanner, "terminate", strscan_terminate, 0);
rb_define_method(StringScanner, "clear", strscan_terminate, 0); rb_define_method(StringScanner, "clear", strscan_terminate, 0);