archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 18:13:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merges r23661 from trunk into ruby_1_9_1.

Browse source 
--
	* dir.c (dir_s_getwd): directory path's encoding should be filesystem's
	  one.

	* lib/tmpdir.rb: ditto (but not finished yet.)

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23781 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2009-06-21 09:14:14 +00:00
parent db54a65ffc
commit 003486341d
4 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Wed Jun 10 18:15:17 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* dir.c (dir_s_getwd): directory path's encoding should be filesystem's
one.
* lib/tmpdir.rb: ditto (but not finished yet.)
Tue Jun 9 22:38:09 2009 Tadayoshi Funaba <tadf@dotrb.org> Tue Jun 9 22:38:09 2009 Tadayoshi Funaba <tadf@dotrb.org>
* lib/cmath.rb (log10): raised exception when the given number is * lib/cmath.rb (log10): raised exception when the given number is

1
dir.c
View file

@ -802,6 +802,7 @@ dir_s_getwd(VALUE dir)
rb_secure(4); rb_secure(4);
path = my_getcwd(); path = my_getcwd();
cwd = rb_tainted_str_new2(path); cwd = rb_tainted_str_new2(path);
rb_enc_associate(cwd, rb_filesystem_encoding());
xfree(path); xfree(path);
return cwd; return cwd;

1
lib/tmpdir.rb
View file

@ -28,6 +28,7 @@ class Dir
len = getdir.call(windir, windir.size) len = getdir.call(windir, windir.size)
windir = File.expand_path(windir[0, len]) windir = File.expand_path(windir[0, len])
end end
windir.force_encoding(Dir.pwd.encoding)
temp = File.join(windir.untaint, 'temp') temp = File.join(windir.untaint, 'temp')
@@systmpdir = temp if File.directory?(temp) and File.writable?(temp) @@systmpdir = temp if File.directory?(temp) and File.writable?(temp)
rescue LoadError rescue LoadError

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "1.9.1" #define RUBY_VERSION "1.9.1"
#define RUBY_RELEASE_DATE "2009-05-22" #define RUBY_RELEASE_DATE "2009-05-22"
#define RUBY_PATCHLEVEL 171 #define RUBY_PATCHLEVEL 172
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1