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

* file.c (rb_file_s_basename): pass baselen to rmext.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28779 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-07-28 20:52:16 +00:00
parent 793af6993f
commit b67ecc80df
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Thu Jul 29 05:52:15 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (rb_file_s_basename): pass baselen to rmext.
Thu Jul 29 02:38:09 2010 NARUSE, Yui <naruse@ruby-lang.org> Thu Jul 29 02:38:09 2010 NARUSE, Yui <naruse@ruby-lang.org>
* configure.in: not [freebsd] but [freebsd*] for AS_CASE. * configure.in: not [freebsd] but [freebsd*] for AS_CASE.

9
file.c
View File

@ -3398,15 +3398,12 @@ rb_file_s_realdirpath(int argc, VALUE *argv, VALUE klass)
} }
static size_t static size_t
rmext(const char *p, long l1, const char *e) rmext(const char *p, long l0, long l1, const char *e)
{ {
long l0, l2; long l2;
if (!e) return 0; if (!e) return 0;
for (l0 = 0; l0 < l1; ++l0) {
if (p[l0] != '.') break;
}
l2 = strlen(e); l2 = strlen(e);
if (l2 == 2 && e[1] == '*') { if (l2 == 2 && e[1] == '*') {
unsigned char c = *e; unsigned char c = *e;
@ -3527,7 +3524,7 @@ rb_file_s_basename(int argc, VALUE *argv)
p = ruby_find_basename(name, &f, &n); p = ruby_find_basename(name, &f, &n);
if (n >= 0) { if (n >= 0) {
if (NIL_P(fext) || !(f = rmext(p, n, StringValueCStr(fext)))) { if (NIL_P(fext) || !(f = rmext(p, f, n, StringValueCStr(fext)))) {
f = n; f = n;
} }
if (f == RSTRING_LEN(fname)) return rb_str_new_shared(fname); if (f == RSTRING_LEN(fname)) return rb_str_new_shared(fname);