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 (dir_path, dir_each, glob_helper): use readdir_r() if

Browse source 
available.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23241 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-04-21 00:25:43 +00:00
parent 94890f6a9e
commit 143846ad36
3 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Apr 21 09:25:41 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dir.c (dir_path, dir_each, glob_helper): use readdir_r() if
available.
Tue Apr 21 09:20:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Apr 21 09:20:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (init_mkmf): needs default library path even if * lib/mkmf.rb (init_mkmf): needs default library path even if

2
configure.in
View file

@ -1068,7 +1068,7 @@ AC_REPLACE_FUNCS(dup2 memmove strerror\
strlcpy strlcat) strlcpy strlcat)
AC_CHECK_FUNCS(fmod killpg wait4 waitpid fork spawnv syscall chroot fsync getcwd eaccess\ AC_CHECK_FUNCS(fmod killpg wait4 waitpid fork spawnv syscall chroot fsync getcwd eaccess\
truncate ftruncate chsize times utimes utimensat fcntl lockf lstat\ truncate ftruncate chsize times utimes utimensat fcntl lockf lstat\
link symlink readlink\ link symlink readlink readdir_r\
setitimer setruid seteuid setreuid setresuid setproctitle socketpair\ setitimer setruid seteuid setreuid setresuid setproctitle socketpair\
setrgid setegid setregid setresgid issetugid pause lchown lchmod\ setrgid setegid setregid setresgid issetugid pause lchown lchmod\
getpgrp setpgrp getpgid setpgid initgroups getgroups setgroups\ getpgrp setpgrp getpgid setpgid initgroups getgroups setgroups\

29
dir.c
View file

@ -478,6 +478,19 @@ dir_path(VALUE dir)
return rb_str_dup(dirp->path); return rb_str_dup(dirp->path);
} }
#if defined HAVE_READDIR_R
# define READDIR(dir, enc, entry, dp) (readdir_r(dir, entry, &(dp)) == 0 && dp != 0)
#elif defined _WIN32
# define READDIR(dir, enc, entry, dp) ((dp = rb_w32_readdir_with_enc(dir, enc)) != 0)
#else
# define READDIR(dir, enc, entry, dp) ((dp = readdir(dir)) != 0)
#endif
#if defined HAVE_READDIR_R
# define IF_HAVE_READDIR_R(something) something
#else
# define IF_HAVE_READDIR_R(something) /* nothing */
#endif
/* /*
* call-seq: * call-seq:
* dir.read => string or nil * dir.read => string or nil
@ -493,19 +506,13 @@ dir_path(VALUE dir)
static VALUE static VALUE
dir_read(VALUE dir) dir_read(VALUE dir)
{ {
#ifdef _WIN32
# define READDIR(dir, enc) rb_w32_readdir_with_enc(dir, enc)
#else
# define READDIR(dir, enc) readdir(dir)
#endif
struct dir_data *dirp; struct dir_data *dirp;
struct dirent *dp; struct dirent *dp;
IF_HAVE_READDIR_R(struct dirent entry);
GetDIR(dir, dirp); GetDIR(dir, dirp);
errno = 0; errno = 0;
dp = READDIR(dirp->dir, dirp->enc); if (READDIR(dirp->dir, dirp->enc, &entry, dp)) {
if (dp) {
return rb_external_str_new_with_enc(dp->d_name, NAMLEN(dp), dirp->enc); return rb_external_str_new_with_enc(dp->d_name, NAMLEN(dp), dirp->enc);
} }
else if (errno == 0) { /* end of stream */ else if (errno == 0) { /* end of stream */
@ -539,11 +546,12 @@ dir_each(VALUE dir)
{ {
struct dir_data *dirp; struct dir_data *dirp;
struct dirent *dp; struct dirent *dp;
IF_HAVE_READDIR_R(struct dirent entry);
RETURN_ENUMERATOR(dir, 0, 0); RETURN_ENUMERATOR(dir, 0, 0);
GetDIR(dir, dirp); GetDIR(dir, dirp);
rewinddir(dirp->dir); rewinddir(dirp->dir);
for (dp = READDIR(dirp->dir, dirp->enc); dp != NULL; dp = READDIR(dirp->dir, dirp->enc)) { while (READDIR(dirp->dir, dirp->enc, &entry, dp)) {
rb_yield(rb_external_str_new_with_enc(dp->d_name, NAMLEN(dp), dirp->enc)); rb_yield(rb_external_str_new_with_enc(dp->d_name, NAMLEN(dp), dirp->enc));
if (dirp->dir == NULL) dir_closed(); if (dirp->dir == NULL) dir_closed();
} }
@ -1259,10 +1267,11 @@ glob_helper(
if (magical || recursive) { if (magical || recursive) {
struct dirent *dp; struct dirent *dp;
IF_HAVE_READDIR_R(struct dirent entry);
DIR *dirp = do_opendir(*path ? path : ".", flags); DIR *dirp = do_opendir(*path ? path : ".", flags);
if (dirp == NULL) return 0; if (dirp == NULL) return 0;
for (dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) { while (READDIR(dirp, enc, &entry, dp)) {
char *buf = join_path(path, dirsep, dp->d_name); char *buf = join_path(path, dirsep, dp->d_name);
enum answer new_isdir = UNKNOWN; enum answer new_isdir = UNKNOWN;