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

* process.c (SAVED_GROUP_ID, p_gid_switch): should be rb_gid_t.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22960 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-03-14 18:30:00 +00:00
parent f414bd65ae
commit 34877b581d
2 changed files with 10 additions and 4 deletions

View file

@ -1,3 +1,7 @@
Sun Mar 15 03:29:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* process.c (SAVED_GROUP_ID, p_gid_switch): should be rb_gid_t.
Sun Mar 15 02:53:13 2009 Tanaka Akira <akr@fsij.org> Sun Mar 15 02:53:13 2009 Tanaka Akira <akr@fsij.org>
* string.c (rb_str_subpat): accept capture name. * string.c (rb_str_subpat): accept capture name.

View file

@ -4570,7 +4570,7 @@ proc_daemon(int argc, VALUE *argv)
* *
*/ */
static int SAVED_GROUP_ID = -1; static rb_gid_t SAVED_GROUP_ID = -1;
#ifdef BROKEN_SETREGID #ifdef BROKEN_SETREGID
int int
@ -5233,7 +5233,7 @@ p_gid_sw_ensure(rb_gid_t id)
static VALUE static VALUE
p_gid_switch(VALUE obj) p_gid_switch(VALUE obj)
{ {
int gid, egid; rb_gid_t gid, egid;
check_gid_switch(); check_gid_switch();
@ -5248,7 +5248,8 @@ p_gid_switch(VALUE obj)
} else { } else {
return GIDT2NUM(egid); return GIDT2NUM(egid);
} }
} else if (egid != SAVED_GROUP_ID) { }
else if (egid != SAVED_GROUP_ID) {
proc_setegid(obj, GIDT2NUM(SAVED_GROUP_ID)); proc_setegid(obj, GIDT2NUM(SAVED_GROUP_ID));
if (rb_block_given_p()) { if (rb_block_given_p()) {
under_gid_switch = 1; under_gid_switch = 1;
@ -5256,7 +5257,8 @@ p_gid_switch(VALUE obj)
} else { } else {
return GIDT2NUM(gid); return GIDT2NUM(gid);
} }
} else { }
else {
errno = EPERM; errno = EPERM;
rb_sys_fail(0); rb_sys_fail(0);
} }