[ruby-dev:39132] Re: [Bug #1919] sparc-solaris-2.10 で 1.9.2-preview1 がビルドできない

後藤といいます。自己レスです。

On Tue, 11 Aug 2009 12:49:55 +0900
Naohisa Goto wrote:

> Solaris の readdir_r について調べてみたところ、
> "readdir_r considered harmful"
> http://womble.decadentplace.org.uk/readdir_r-advisory.html
> という文章を見つけました。これによると、
> 
> > On Linux (with glibc) and most versions of Unix, struct dirent
> > is large enough to hold maximum-length names from most filesystems,
> > so this is safe (though > wasteful). This is not true of Solaris
> > and BeOS, where the d_name member is an array of length 1. 
> 
> とのことでした。どうやら Solaris では、struct dirent entry のメモリを
> 確保する際、ファイル名の長さを考慮に入れた十分な長さを自前で確保する
> 必要があるようです。

とりあえずは、共用体にして無理矢理メモリを確保すると、make は通り、
make install できました。以下にパッチを添付します。

より正しくは、上記文章のように毎回 fpathconf を呼び出して
ファイル名の最大長を取得し、それを元にメモリを確保する必要が
あるのだとは思いますが、とりあえずのパッチです。

相変わらずdlのテストは失敗しますが、dlについては、別チケットを
作りたいと思います。


Index: dir.c
===================================================================
--- dir.c	(revision 24578)
+++ dir.c	(working copy)
@@ -491,6 +491,39 @@
 # define IF_HAVE_READDIR_R(something) /* nothing */
 #endif
 
+#if defined SIZEOF_STRUCT_DIRENT_TOO_SMALL
+# include <limits.h>
+# define NAME_MAX_FOR_STRUCT_DIRENT 255
+# if defined NAME_MAX
+#  if NAME_MAX_FOR_STRUCT_DIRENT < NAME_MAX
+#   undef  NAME_MAX_FOR_STRUCT_DIRENT
+#   define NAME_MAX_FOR_STRUCT_DIRENT NAME_MAX
+#  endif
+# endif
+# if defined _POSIX_NAME_MAX
+#  if NAME_MAX_FOR_STRUCT_DIRENT < _POSIX_NAME_MAX
+#   undef  NAME_MAX_FOR_STRUCT_DIRENT
+#   define NAME_MAX_FOR_STRUCT_DIRENT _POSIX_NAME_MAX
+#  endif
+# endif
+# if defined _XOPEN_NAME_MAX
+#  if NAME_MAX_FOR_STRUCT_DIRENT < _XOPEN_NAME_MAX
+#   undef  NAME_MAX_FOR_STRUCT_DIRENT
+#   define NAME_MAX_FOR_STRUCT_DIRENT _XOPEN_NAME_MAX
+#  endif
+# endif
+# define DEFINE_STRUCT_DIRENT \
+  union { \
+    struct dirent dirent; \
+    char dummy[offsetof(struct dirent, d_name) + \
+	       NAME_MAX_FOR_STRUCT_DIRENT + 1]; \
+  }
+# define STRUCT_DIRENT(entry) ((entry).dirent)
+#else
+# define DEFINE_STRUCT_DIRENT struct dirent
+# define STRUCT_DIRENT(entry) (entry)
+#endif
+
 /*
  *  call-seq:
  *     dir.read => string or nil
@@ -508,11 +541,11 @@
 {
     struct dir_data *dirp;
     struct dirent *dp;
-    IF_HAVE_READDIR_R(struct dirent entry);
+    IF_HAVE_READDIR_R(DEFINE_STRUCT_DIRENT entry);
 
     GetDIR(dir, dirp);
     errno = 0;
-    if (READDIR(dirp->dir, dirp->enc, &entry, dp)) {
+    if (READDIR(dirp->dir, dirp->enc, &STRUCT_DIRENT(entry), dp)) {
 	return rb_external_str_new_with_enc(dp->d_name, NAMLEN(dp), dirp->enc);
     }
     else if (errno == 0) {	/* end of stream */
@@ -546,12 +579,12 @@
 {
     struct dir_data *dirp;
     struct dirent *dp;
-    IF_HAVE_READDIR_R(struct dirent entry);
+    IF_HAVE_READDIR_R(DEFINE_STRUCT_DIRENT entry);
 
     RETURN_ENUMERATOR(dir, 0, 0);
     GetDIR(dir, dirp);
     rewinddir(dirp->dir);
-    while (READDIR(dirp->dir, dirp->enc, &entry, dp)) {
+    while (READDIR(dirp->dir, dirp->enc, &STRUCT_DIRENT(entry), dp)) {
 	rb_yield(rb_external_str_new_with_enc(dp->d_name, NAMLEN(dp), dirp->enc));
 	if (dirp->dir == NULL) dir_closed();
     }
@@ -1270,11 +1303,11 @@
     if (magical || recursive) {
 	struct dirent *dp;
 	DIR *dirp;
-	IF_HAVE_READDIR_R(struct dirent entry);
+	IF_HAVE_READDIR_R(DEFINE_STRUCT_DIRENT entry);
 	dirp = do_opendir(*path ? path : ".", flags);
 	if (dirp == NULL) return 0;
 
-	while (READDIR(dirp, enc, &entry, dp)) {
+	while (READDIR(dirp, enc, &STRUCT_DIRENT(entry), dp)) {
 	    char *buf = join_path(path, dirsep, dp->d_name);
 	    enum answer new_isdir = UNKNOWN;
 
Index: configure.in
===================================================================
--- configure.in	(revision 24578)
+++ configure.in	(working copy)
@@ -750,6 +750,10 @@
 esac
 
 case "$target_os" in
+when(solaris*)
+		AC_DEFINE(SIZEOF_STRUCT_DIRENT_TOO_SMALL, 1)
+		LIBS="-lm $LIBS"
+		;;
 when(nextstep*)	;;
 when(openstep*)	;;
 when(rhapsody*)	;;


-- 
後藤 直久  [e-mail]