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

* dir.c (has_magic): glob names contain alphabets to enable case fold

Browse Source 
search.  [ruby-dev:27735]

* dir.c (Init_Dir): FNM_SYSCASE which is default case fold flag.
  [ruby-dev:23296]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9689 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2005-12-14 14:40:14 +00:00
parent 6e23e595cd
commit 8e4090f4b5
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Wed Dec 14 23:39:53 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dir.c (has_magic): glob names contain alphabets to enable case fold
search. [ruby-dev:27735]
* dir.c (Init_Dir): FNM_SYSCASE which is default case fold flag.
[ruby-dev:23296]
Wed Dec 14 12:01:26 2005 Tanaka Akira <akr@m17n.org> Wed Dec 14 12:01:26 2005 Tanaka Akira <akr@m17n.org>
* marshal.c (r_object0): fix a GC problem for reading a bignum on * marshal.c (r_object0): fix a GC problem for reading a bignum on

27
dir.c
View File

@ -67,10 +67,23 @@ char *strchr(char*,char);
#define lstat stat #define lstat stat
#endif #endif
#ifndef CASEFOLD_FILESYSTEM
# if defined DOSISH || defined __VMS
# define CASEFOLD_FILESYSTEM 1
# else
# define CASEFOLD_FILESYSTEM 0
# endif
#endif
#define FNM_NOESCAPE 0x01 #define FNM_NOESCAPE 0x01
#define FNM_PATHNAME 0x02 #define FNM_PATHNAME 0x02
#define FNM_DOTMATCH 0x04 #define FNM_DOTMATCH 0x04
#define FNM_CASEFOLD 0x08 #define FNM_CASEFOLD 0x08
#if CASEFOLD_FILESYSTEM
#define FNM_SYSCASE FNM_CASEFOLD
#else
#define FNM_SYSCASE 0
#endif
#define FNM_NOMATCH 1 #define FNM_NOMATCH 1
#define FNM_ERROR 2 #define FNM_ERROR 2
@ -931,6 +944,7 @@ static int
has_magic(const char *s, int flags) has_magic(const char *s, int flags)
{ {
const int escape = !(flags & FNM_NOESCAPE); const int escape = !(flags & FNM_NOESCAPE);
const int nocase = flags & FNM_CASEFOLD;
register const char *p = s; register const char *p = s;
register char c; register char c;
@ -946,6 +960,10 @@ has_magic(const char *s, int flags)
if (escape && !(c = *p++)) if (escape && !(c = *p++))
return 0; return 0;
continue; continue;
default:
if (!FNM_SYSCASE && ISALPHA(c) && nocase)
return 1;
} }
p = Next(p-1); p = Next(p-1);
@ -1295,11 +1313,9 @@ ruby_glob0(const char *path, int flags, ruby_glob_func *func, VALUE arg)
int status; int status;
start = root = path; start = root = path;
flags |= FNM_SYSCASE;
#if defined DOSISH #if defined DOSISH
flags |= FNM_CASEFOLD;
root = rb_path_skip_prefix(root); root = rb_path_skip_prefix(root);
#else
flags &= ~FNM_CASEFOLD;
#endif #endif
if (root && *root == '/') root++; if (root && *root == '/') root++;
@ -1342,8 +1358,8 @@ rb_glob2(const char *path, int flags, void (*func)(const char *, VALUE), VALUE a
args.func = func; args.func = func;
args.value = arg; args.value = arg;
if (flags & FNM_CASEFOLD) { if (flags & FNM_SYSCASE) {
rb_warn("Dir.glob() ignores File::FNM_CASEFOLD"); rb_warning("Dir.glob() ignores File::FNM_CASEFOLD");
} }
return ruby_glob0(path, flags | GLOB_VERBOSE, rb_glob_caller, (VALUE)&args); return ruby_glob0(path, flags | GLOB_VERBOSE, rb_glob_caller, (VALUE)&args);
@ -1822,4 +1838,5 @@ Init_Dir(void)
rb_file_const("FNM_PATHNAME", INT2FIX(FNM_PATHNAME)); rb_file_const("FNM_PATHNAME", INT2FIX(FNM_PATHNAME));
rb_file_const("FNM_DOTMATCH", INT2FIX(FNM_DOTMATCH)); rb_file_const("FNM_DOTMATCH", INT2FIX(FNM_DOTMATCH));
rb_file_const("FNM_CASEFOLD", INT2FIX(FNM_CASEFOLD)); rb_file_const("FNM_CASEFOLD", INT2FIX(FNM_CASEFOLD));
rb_file_const("FNM_SYSCASE", INT2FIX(FNM_SYSCASE));
} }