* file.c (file_expand_path): associate the input encoding when
copying an absolute path. [ruby-dev:38594] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23670 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
7915aed875
commit
a860431e3b
@ -1,3 +1,8 @@
|
|||||||
|
Fri Jun 12 14:56:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* file.c (file_expand_path): associate the input encoding when
|
||||||
|
copying an absolute path. [ruby-dev:38594]
|
||||||
|
|
||||||
Fri Jun 12 02:41:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Fri Jun 12 02:41:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* string.c (str_replace_shared): shared target must be frozen.
|
* string.c (str_replace_shared): shared target must be frozen.
|
||||||
|
1
file.c
1
file.c
@ -2793,6 +2793,7 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
|
|||||||
p = buf + (s - b);
|
p = buf + (s - b);
|
||||||
BUFCHECK(bdiff >= buflen);
|
BUFCHECK(bdiff >= buflen);
|
||||||
memset(buf, '/', p - buf);
|
memset(buf, '/', p - buf);
|
||||||
|
rb_enc_copy(result, fname);
|
||||||
}
|
}
|
||||||
if (p > buf && p[-1] == '/')
|
if (p > buf && p[-1] == '/')
|
||||||
--p;
|
--p;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user