1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* dir.c (struct dir_data): intenc field removed.

Browse Source 
(dir_s_alloc): intenc initialization removed.
  (dir_initialize): :internal_encoding option removed.  dirname code
  conversion removed.
  (dir_enc_str): code conversion removed.
  [ruby-dev:35661]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18250 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-07-28 17:12:51 +00:00
parent bac3ea1fca
commit 2f1908b1cf
2 changed files with 13 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Tue Jul 29 01:41:15 2008 Tanaka Akira <akr@fsij.org>
* dir.c (struct dir_data): intenc field removed.
(dir_s_alloc): intenc initialization removed.
(dir_initialize): :internal_encoding option removed. dirname code
conversion removed.
(dir_enc_str): code conversion removed.
[ruby-dev:35661]
Mon Jul 28 21:32:17 2008 Kouhei Sutou <kou@cozmixng.org> Mon Jul 28 21:32:17 2008 Kouhei Sutou <kou@cozmixng.org>
* test/rss/: use PNG instead of zlib as binary data. * test/rss/: use PNG instead of zlib as binary data.

42
dir.c
View File

@ -291,7 +291,6 @@ VALUE rb_cDir;
struct dir_data { struct dir_data {
DIR *dir; DIR *dir;
char *path; char *path;
rb_encoding *intenc;
rb_encoding *extenc; rb_encoding *extenc;
}; };
@ -315,7 +314,6 @@ dir_s_alloc(VALUE klass)
dirp->dir = NULL; dirp->dir = NULL;
dirp->path = NULL; dirp->path = NULL;
dirp->intenc = NULL;
dirp->extenc = NULL; dirp->extenc = NULL;
return obj; return obj;
@ -332,66 +330,37 @@ dir_initialize(int argc, VALUE *argv, VALUE dir)
{ {
struct dir_data *dp; struct dir_data *dp;
static rb_encoding *fs_encoding; static rb_encoding *fs_encoding;
rb_encoding *intencoding, *extencoding; rb_encoding *extencoding;
VALUE dirname, opt; VALUE dirname, opt;
static VALUE sym_intenc, sym_extenc; static VALUE sym_extenc;
if (!sym_intenc) { if (!sym_extenc) {
sym_intenc = ID2SYM(rb_intern("internal_encoding"));
sym_extenc = ID2SYM(rb_intern("external_encoding")); sym_extenc = ID2SYM(rb_intern("external_encoding"));
fs_encoding = rb_filesystem_encoding(); fs_encoding = rb_filesystem_encoding();
} }
intencoding = NULL;
extencoding = fs_encoding; extencoding = fs_encoding;
rb_scan_args(argc, argv, "11", &dirname, &opt); rb_scan_args(argc, argv, "11", &dirname, &opt);
if (!NIL_P(opt)) { if (!NIL_P(opt)) {
VALUE v, extenc=Qnil, intenc=Qnil; VALUE v, extenc=Qnil;
opt = rb_convert_type(opt, T_HASH, "Hash", "to_hash"); opt = rb_convert_type(opt, T_HASH, "Hash", "to_hash");
v = rb_hash_aref(opt, sym_intenc);
if (!NIL_P(v)) intenc = v;
v = rb_hash_aref(opt, sym_extenc); v = rb_hash_aref(opt, sym_extenc);
if (!NIL_P(v)) extenc = v; if (!NIL_P(v)) extenc = v;
if (!NIL_P(extenc)) { if (!NIL_P(extenc)) {
extencoding = rb_to_encoding(extenc); extencoding = rb_to_encoding(extenc);
if (!NIL_P(intenc)) {
intencoding = rb_to_encoding(intenc);
if (extencoding == intencoding) {
rb_warn("Ignoring internal encoding '%s': it is identical to external encoding '%s'",
RSTRING_PTR(rb_inspect(intenc)),
RSTRING_PTR(rb_inspect(extenc)));
intencoding = NULL;
}
}
}
else if (!NIL_P(intenc)) {
rb_raise(rb_eArgError, "External encoding must be specified when internal encoding is given");
} }
} }
FilePathValue(dirname); FilePathValue(dirname);
{
rb_encoding *dirname_encoding = rb_enc_get(dirname);
if (rb_usascii_encoding() != dirname_encoding
&& rb_ascii8bit_encoding() != dirname_encoding
#if defined __APPLE__
&& rb_utf8_encoding() != dirname_encoding
#endif
&& extencoding != dirname_encoding) {
if (!intencoding) intencoding = dirname_encoding;
dirname = rb_str_transcode(dirname, rb_enc_from_encoding(extencoding));
}
}
Data_Get_Struct(dir, struct dir_data, dp); Data_Get_Struct(dir, struct dir_data, dp);
if (dp->dir) closedir(dp->dir); if (dp->dir) closedir(dp->dir);
if (dp->path) xfree(dp->path); if (dp->path) xfree(dp->path);
dp->dir = NULL; dp->dir = NULL;
dp->path = NULL; dp->path = NULL;
dp->intenc = intencoding;
dp->extenc = extencoding; dp->extenc = extencoding;
dp->dir = opendir(RSTRING_PTR(dirname)); dp->dir = opendir(RSTRING_PTR(dirname));
if (dp->dir == NULL) { if (dp->dir == NULL) {
@ -457,9 +426,6 @@ static VALUE
dir_enc_str(VALUE str, struct dir_data *dirp) dir_enc_str(VALUE str, struct dir_data *dirp)
{ {
rb_enc_associate(str, dirp->extenc); rb_enc_associate(str, dirp->extenc);
if (dirp->intenc) {
str = rb_str_transcode(str, rb_enc_from_encoding(dirp->intenc));
}
return str; return str;
} }