nagachika	2013-03-09 21:24:37 +0900 (Sat, 09 Mar 2013)

  New Revision: 39652

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

  Log:
    merge revision(s) 39352,39360:
    
    * file.c (RB_MAX_GROUPS): moved to
    
    * internal.h (RB_MAX_GROUPS): here.
    
    * file.c (rb_group_member): use RB_MAX_GROUPS instead of
      RUBY_GROUP_MAX. They are the same.
    
    * process.c (RB_MAX_GROUPS): moved to

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/file.c
    branches/ruby_2_0_0/internal.h
    branches/ruby_2_0_0/process.c
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39651)
+++ ruby_2_0_0/ChangeLog	(revision 39652)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sat Mar  9 21:23:36 2013  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* process.c (RB_MAX_GROUPS): moved to
+	* internal.h (RB_MAX_GROUPS): here.
+
+	* file.c (rb_group_member): use RB_MAX_GROUPS instead of
+	  RUBY_GROUP_MAX. They are the same.
+
 Sat Mar  9 21:15:39 2013  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	* file.c (access_internal): removed.
Index: ruby_2_0_0/process.c
===================================================================
--- ruby_2_0_0/process.c	(revision 39651)
+++ ruby_2_0_0/process.c	(revision 39652)
@@ -5432,7 +5432,6 @@ proc_setgid(VALUE obj, VALUE id) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/process.c#L5432
  * HP-UX			   20
  * Windows			 1015
  */
-#define RB_MAX_GROUPS (65536)
 static int _maxgroups = -1;
 static int
 get_sc_ngroups_max(void)
Index: ruby_2_0_0/internal.h
===================================================================
--- ruby_2_0_0/internal.h	(revision 39651)
+++ ruby_2_0_0/internal.h	(revision 39652)
@@ -191,6 +191,7 @@ VALUE rb_proc_location(VALUE self); https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/internal.h#L191
 st_index_t rb_hash_proc(st_index_t hash, VALUE proc);
 
 /* process.c */
+#define RB_MAX_GROUPS (65536)
 
 struct rb_execarg {
     int use_shell;
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39651)
+++ ruby_2_0_0/version.h	(revision 39652)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-03-09"
-#define RUBY_PATCHLEVEL 21
+#define RUBY_PATCHLEVEL 22
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_0_0/file.c
===================================================================
--- ruby_2_0_0/file.c	(revision 39651)
+++ ruby_2_0_0/file.c	(revision 39652)
@@ -1013,9 +1013,6 @@ rb_file_lstat(VALUE obj) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/file.c#L1013
 #endif
 }
 
-/* Linux allow 65536 groups and it is maximum value as far as we know. */
-#define RUBY_GROUP_MAX 65536
-
 static int
 rb_group_member(GETGROUPS_T gid)
 {
@@ -1036,7 +1033,7 @@ rb_group_member(GETGROUPS_T gid) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/file.c#L1033
      * accept more larger value.
      * So we don't trunk NGROUPS anymore.
      */
-    while (groups <= RUBY_GROUP_MAX) {
+    while (groups <= RB_MAX_GROUPS) {
 	gary = ALLOCV_N(GETGROUPS_T, v, groups);
 	anum = getgroups(groups, gary);
 	if (anum != groups)

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39352,39360


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