From 2046f38aa6e2a28aea582ba84887ccef6fdd31d6 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 15 Sep 2015 06:06:19 +0000 Subject: dir.c: fundamental_encoding_p * dir.c (fundamental_encoding_p, push_glob): compare by encoding index immediately. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51865 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ++++- common.mk | 1 + dir.c | 28 +++++++++++++++++++--------- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 412530dd25..0de6985258 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ -Tue Sep 15 14:49:43 2015 Nobuyoshi Nakada +Tue Sep 15 15:06:16 2015 Nobuyoshi Nakada + + * dir.c (fundamental_encoding_p, push_glob): compare by encoding + index immediately. * enc/{ascii,us_ascii,utf_8}.c: set encoding indexes of fundamental built-in encodings so that usable as well as diff --git a/common.mk b/common.mk index 542e28697e..3e5b219e34 100644 --- a/common.mk +++ b/common.mk @@ -1246,6 +1246,7 @@ dir.$(OBJEXT): $(top_srcdir)/include/ruby.h dir.$(OBJEXT): {$(VPATH)}config.h dir.$(OBJEXT): {$(VPATH)}defines.h dir.$(OBJEXT): {$(VPATH)}dir.c +dir.$(OBJEXT): {$(VPATH)}encindex.h dir.$(OBJEXT): {$(VPATH)}encoding.h dir.$(OBJEXT): {$(VPATH)}intern.h dir.$(OBJEXT): {$(VPATH)}internal.h diff --git a/dir.c b/dir.c index abb5295dc8..aed3ecaa03 100644 --- a/dir.c +++ b/dir.c @@ -12,6 +12,7 @@ **********************************************************************/ #include "internal.h" +#include "encindex.h" #include #include @@ -670,6 +671,18 @@ dir_path(VALUE dir) } #if defined _WIN32 +static int +fundamental_encoding_p(rb_encoding *enc) +{ + switch (rb_enc_to_index(enc)) { + case ENCINDEX_ASCII: + case ENCINDEX_US_ASCII: + case ENCINDEX_UTF_8: + return TRUE; + default: + return FALSE; + } +} # define READDIR(dir, enc) rb_w32_readdir((dir), (enc)) #else # define READDIR(dir, enc) readdir((dir)) @@ -1212,9 +1225,7 @@ do_opendir(const char *path, int flags, rb_encoding *enc) DIR *dirp; #ifdef _WIN32 VALUE tmp = 0; - if (enc != rb_usascii_encoding() && - enc != rb_ascii8bit_encoding() && - enc != rb_utf8_encoding()) { + if (!fundamental_encoding_p(enc)) { tmp = rb_enc_str_new(path, strlen(path), enc); tmp = rb_str_encode_ospath(tmp); path = RSTRING_PTR(tmp); @@ -1525,10 +1536,7 @@ replace_real_basename(char *path, long base, rb_encoding *enc, int norm_p, int f HANDLE h = INVALID_HANDLE_VALUE; long wlen; int e = 0; - if (enc && - enc != rb_usascii_encoding() && - enc != rb_ascii8bit_encoding() && - enc != rb_utf8_encoding()) { + if (!fundamental_encoding_p(enc)) { tmp = rb_enc_str_new_cstr(plainname, enc); tmp = rb_str_encode_ospath(tmp); plainname = RSTRING_PTR(tmp); @@ -2119,8 +2127,10 @@ push_glob(VALUE ary, VALUE str, int flags) #ifdef __APPLE__ str = rb_str_encode_ospath(str); #endif - if (enc == rb_usascii_encoding()) enc = rb_filesystem_encoding(); - if (enc == rb_usascii_encoding()) enc = rb_ascii8bit_encoding(); + if (rb_enc_to_index(enc) == ENCINDEX_US_ASCII) + enc = rb_filesystem_encoding(); + if (rb_enc_to_index(enc) == ENCINDEX_US_ASCII) + enc = rb_ascii8bit_encoding(); flags |= GLOB_VERBOSE; args.glob.func = push_pattern; args.glob.value = ary; -- cgit v1.2.3