[前][次][番号順一覧][スレッド一覧]

ruby-changes:28449

From: akr <ko1@a...>
Date: Sun, 28 Apr 2013 00:38:47 +0900 (JST)
Subject: [ruby-changes:28449] akr:r40501 (trunk): * process.c (obj2gid): Don't call endgrnam() if not exist.

akr	2013-04-28 00:38:36 +0900 (Sun, 28 Apr 2013)

  New Revision: 40501

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40501

  Log:
    * process.c (obj2gid): Don't call endgrnam() if not exist.
      Bionic (Android's libc) don't have endgrnam().
    
    * configure.in: Check endgrnam function.

  Modified files:
    trunk/ChangeLog
    trunk/configure.in
    trunk/process.c

Index: configure.in
===================================================================
--- configure.in	(revision 40500)
+++ configure.in	(revision 40501)
@@ -1700,7 +1700,8 @@ AC_CHECK_FUNCS(fmod killpg wait4 waitpid https://github.com/ruby/ruby/blob/trunk/configure.in#L1700
 	      setitimer setruid seteuid setreuid setresuid socketpair\
 	      setrgid setegid setregid setresgid issetugid pause lchown lchmod\
 	      getpgrp setpgrp getpgid setpgid initgroups getgroups setgroups\
-	      getpriority getrlimit setrlimit sysconf close getpwnam_r getgrnam_r\
+	      getpriority getrlimit setrlimit sysconf close \
+              getpwnam_r getgrnam_r endgrnam \
 	      dlopen sigprocmask sigaction _setjmp _longjmp\
 	      getsid setsid telldir seekdir fchmod cosh sinh tanh log2 round llabs\
 	      setuid setgid daemon select_large_fdset setenv unsetenv\
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 40500)
+++ ChangeLog	(revision 40501)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sun Apr 28 00:35:45 2013  Tanaka Akira  <akr@f...>
+
+	* process.c (obj2gid): Don't call endgrnam() if not exist.
+	  Bionic (Android's libc) don't have endgrnam().
+
+	* configure.in: Check endgrnam function.
+
 Sat Apr 27 23:53:00 2013  Charlie Somerville  <charlie@c...>
 
 	* lib/yaml.rb: add security warning to YAML documentation
Index: process.c
===================================================================
--- process.c	(revision 40500)
+++ process.c	(revision 40501)
@@ -4808,13 +4808,13 @@ obj2gid(VALUE id https://github.com/ruby/ruby/blob/trunk/process.c#L4808
 	grptr = getgrnam(grpname);
 #endif
 	if (!grptr) {
-#ifndef USE_GETGRNAM_R
+#if !defined(USE_GETGRNAM_R) && defined(HAVE_ENDGRENT)
 	    endgrent();
 #endif
 	    rb_raise(rb_eArgError, "can't find group for %s", grpname);
 	}
 	gid = grptr->gr_gid;
-#ifndef USE_GETGRNAM_R
+#if !defined(USE_GETGRNAM_R) && defined(HAVE_ENDGRENT)
 	endgrent();
 #endif
     }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]