summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-02-12 15:10:51 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-02-12 15:10:51 +0000
commit68f70d901f033dc08f985550cc40abbcc0286ca7 (patch)
treedbf703ff9f6a71269aff871ff48bf0e095b9545f
parent59184591056a214fb5da084ef741bef0aaf59d5b (diff)
downloadruby-68f70d901f033dc08f985550cc40abbcc0286ca7.tar.gz
ruby-68f70d901f033dc08f985550cc40abbcc0286ca7.tar.xz
ruby-68f70d901f033dc08f985550cc40abbcc0286ca7.zip
* file.c (rb_file_s_dirname): append "." if drive only.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3487 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--file.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e05c40ece..4f057bfdf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Wed Feb 12 23:42:10 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
+Thu Feb 13 00:09:47 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* file.c (strrdirsep): ignore trailing directory separators.
@@ -10,6 +10,8 @@ Wed Feb 12 23:42:10 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* 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 <eban@ruby-lang.org>
diff --git a/file.c b/file.c
index 488b75110..9996423dd 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;
}