summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-08-01 16:49:11 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-08-01 16:49:11 +0000
commit439b453e3aa244e7b824a55aa11768dca3d4a6f4 (patch)
treea6fb746854a9b77c8360dcbb2af2773af912efaa
parentcc6d8c466ce623afed92b63db8d55ebc707c4c5e (diff)
* file.c (strrdirsep): removed meaningless code.
* file.c (rb_file_s_expand_path): return to 1.66. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1665 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--file.c9
2 files changed, 6 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index ee1a5ff95c7..76e476d067a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Aug 2 01:29:42 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
+
+ * file.c (strrdirsep): removed meaningless code.
+
+ * file.c (rb_file_s_expand_path): reverted to 1.66.
+
Wed Aug 1 15:42:16 2001 Usaku Nakamura <usa@ruby-lang.org>
* eval.c (ruby_run): avoid VC++ warning.
diff --git a/file.c b/file.c
index 2241efa19d4..5357163fe80 100644
--- a/file.c
+++ b/file.c
@@ -1312,9 +1312,6 @@ strrdirsep(path)
char *path;
{
char *last = NULL;
-#ifdef DOSISH
- if (ISALPHA(path[0]) && path[1] == ':') path += 2;
-#endif
while (*path) {
if (isdirsep(*path)) {
last = path++;
@@ -1438,12 +1435,6 @@ rb_file_s_expand_path(argc, argv)
}
b = ++s;
}
- else {
- p = CharNext(p);
- *p++ = '.';
- *p = '.';
- if (p >= bend) goto toolong;
- }
break;
case '/':
#if defined DOSISH