diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | file.c | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Sat May 17 11:29:11 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * file.c (rb_file_s_extname): first dot is not an extension name. + Sat May 17 10:18:44 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * re.c (rb_reg_search): need to free allocated buffer in re_register. @@ -3023,7 +3023,7 @@ rb_file_s_extname(klass, fname) if (!p) p = name; else - p++; + name = ++p; e = 0; while (*p) { @@ -3053,7 +3053,7 @@ rb_file_s_extname(klass, fname) break; p = CharNext(p); } - if (!e || e+1 == p) /* no dot, or the only dot is first or end? */ + if (!e || e == name || e+1 == p) /* no dot, or the only dot is first or end? */ return rb_str_new(0, 0); extname = rb_str_new(e, p - e); /* keep the dot, too! */ OBJ_INFECT(extname, fname); |