kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* dir.c (CompareImpl): File.fnmatch and Dir.glob get better performance

Browse source 
in Win32. This is achived by calling downcase() for single-byte
  characters. CharLower() is only called for multi-byte characters.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5719 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ocean 2004-02-16 01:33:12 +00:00
parent 86e01c98c7
commit ba60b3f25f
2 changed files with 32 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Mon Feb 16 10:29:52 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* dir.c (CompareImpl): File.fnmatch and Dir.glob get better performance
in Win32. This is achived by calling downcase() for single-byte
characters. CharLower() is only called for multi-byte characters.
Mon Feb 16 02:14:29 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* bcc32/Makefile.sub: should warn suspicious pointer conversion.

62
dir.c
View file

@ -104,7 +104,6 @@ emx_mblen(p)
#else /* multi byte environment */
# define Inc(p) ((p) = Next(p))
# define Compare(p1, p2) (CompareImpl(p1, p2, nocase))
# ifndef _WIN32
static int
CompareImpl(p1, p2, nocase)
const char *p1;
@ -113,14 +112,39 @@ CompareImpl(p1, p2, nocase)
{
const int len1 = Next(p1) - p1;
const int len2 = Next(p2) - p2;
#ifdef _WIN32
char buf1[10], buf2[10]; /* large enough? */
#endif
if (len1 < 0 || len2 < 0) {
rb_fatal("No-win32 CompareImpl: negative len");
rb_fatal("CompareImpl: negative len");
}
if (len1 == 0) return len2;
if (len2 == 0) return -len1;
#ifdef _WIN32
if (nocase) {
if (len1 > 1) {
if (len1 >= sizeof(buf1)) {
rb_fatal("CompareImpl: too large len");
}
memcpy(buf1, p1, len1);
buf1[len1] = '\0';
CharLower(buf1);
p1 = buf1; /* trick */
}
if (len2 > 1) {
if (len2 >= sizeof(buf2)) {
rb_fatal("CompareImpl: too large len");
}
memcpy(buf2, p2, len2);
buf2[len2] = '\0';
CharLower(buf2);
p2 = buf2; /* trick */
}
}
#endif
if (len1 == 1)
if (len2 == 1)
return compare(downcase(*p1), downcase(*p2));
@ -138,40 +162,6 @@ CompareImpl(p1, p2, nocase)
return ret ? ret : len1 - len2;
}
}
# else
static int
CompareImpl(p1, p2, nocase)
const char *p1;
const char *p2;
int nocase;
{
int ret;
const int len1 = Next(p1) - p1;
const int len2 = Next(p2) - p2;
char buf1[10], buf2[10]; /* large enough? */
if (len1 < 0 || len2 < 0) {
rb_fatal("Win32 CompareImpl: negative len");
}
if (len1 >= sizeof(buf1) || len2 >= sizeof(buf2)) {
rb_fatal("Win32 CompareImpl: too large len");
}
memcpy(buf1, p1, len1); buf1[len1] = '\0';
memcpy(buf2, p2, len2); buf2[len2] = '\0';
if (nocase) {
CharLower(buf1);
CharLower(buf2);
}
ret = memcmp(buf1, buf2, len1 < len2 ? len1 : len2);
return ret ? ret : len1 - len2;
}
# endif
#endif /* environment */
#if defined DOSISH