From 4ef1062c6f0b26d8976eba8c8f227e18ba7c6a15 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 12 Feb 2003 15:10:51 +0000 Subject: * file.c (rb_file_s_dirname): append "." if drive only. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3487 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 +++- file.c | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e05c40ece1..4f057bfdf0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Wed Feb 12 23:42:10 2003 Nobuyoshi Nakada +Thu Feb 13 00:09:47 2003 Nobuyoshi Nakada * file.c (strrdirsep): ignore trailing directory separators. @@ -10,6 +10,8 @@ Wed Feb 12 23:42:10 2003 Nobuyoshi Nakada * file.c (rb_file_s_dirname, rb_file_s_extname): ditto. + * file.c (rb_file_s_dirname): append "." if drive only. + * file.c (rb_file_s_split): get rid of converting twice. Mon Feb 10 20:55:15 2003 WATANABE Hirofumi diff --git a/file.c b/file.c index 488b751101..9996423dd3 100644 --- a/file.c +++ b/file.c @@ -1784,6 +1784,10 @@ rb_file_s_dirname(klass, fname) if (p == name) return rb_str_new2("."); dirname = rb_str_new(name, p - name); +#ifdef DOSISH_DRIVE_LETTER + if (root == name + 2 && name[1] == ':') + rb_str_cat(dirname, ".", 1); +#endif OBJ_INFECT(dirname, fname); return dirname; } -- cgit v1.2.3