diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1998-07-13 04:38:01 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1998-07-13 04:38:01 +0000 |
commit | 35c6e6af5ba2c405a91dc6b9e4af833d0979ed22 (patch) | |
tree | 7f54dda0bcda0a58eb5229def03ce3015c98a2b5 /file.c | |
parent | 71d408a6c3298b229c0f1d2ff7159ca410a4c612 (diff) |
str2cstr
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@266 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'file.c')
-rw-r--r-- | file.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1250,9 +1250,10 @@ file_s_basename(argc, argv) char *name, *p, *ext; int f; - rb_scan_args(argc, argv, "11", &fname, &fext); + if (rb_scan_args(argc, argv, "11", &fname, &fext) == 2) { + ext = STR2CSTR(fext); + } name = STR2CSTR(fname); - if (!NIL_P(fext)) ext = STR2CSTR(fext); p = strrchr(name, '/'); if (!p) { if (!NIL_P(fext)) { |