ruby-changes:23172
From: nobu <ko1@a...>
Date: Tue, 3 Apr 2012 18:36:08 +0900 (JST)
Subject: [ruby-changes:23172] nobu:r35221 (trunk): * process.c (setreuid, setregid): suppress warnings.
nobu 2012-04-03 18:33:40 +0900 (Tue, 03 Apr 2012) New Revision: 35221 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35221 Log: * process.c (setreuid, setregid): suppress warnings. [ruby-core:43374][Bug #6169] Modified files: trunk/ChangeLog trunk/process.c Index: ChangeLog =================================================================== --- ChangeLog (revision 35220) +++ ChangeLog (revision 35221) @@ -1,3 +1,8 @@ +Tue Apr 3 18:33:38 2012 Nobuyoshi Nakada <nobu@r...> + + * process.c (setreuid, setregid): suppress warnings. + [ruby-core:43374][Bug #6169] + Tue Apr 3 10:18:27 2012 Nobuyoshi Nakada <nobu@r...> * enumerator.c (inspect_enumerator): suppress uninitialized Index: process.c =================================================================== --- process.c (revision 35220) +++ process.c (revision 35221) @@ -113,9 +113,11 @@ #ifdef BROKEN_SETREUID #define setreuid ruby_setreuid +int setreuid(rb_uid_t ruid, rb_uid_t euid); #endif #ifdef BROKEN_SETREGID #define setregid ruby_setregid +int setregid(rb_gid_t rgid, rb_gid_t egid); #endif #if defined(HAVE_44BSD_SETUID) || defined(__MacOS_X__) @@ -4307,11 +4309,11 @@ int setreuid(rb_uid_t ruid, rb_uid_t euid) { - if (ruid != -1 && ruid != getuid()) { - if (euid == -1) euid = geteuid(); + if (ruid != (rb_uid_t)-1 && ruid != getuid()) { + if (euid == (rb_uid_t)-1) euid = geteuid(); if (setuid(ruid) < 0) return -1; } - if (euid != -1 && euid != geteuid()) { + if (euid != (rb_uid_t)-1 && euid != geteuid()) { if (seteuid(euid) < 0) return -1; } return 0; @@ -5010,11 +5012,11 @@ int setregid(rb_gid_t rgid, rb_gid_t egid) { - if (rgid != -1 && rgid != getgid()) { - if (egid == -1) egid = getegid(); + if (rgid != (rb_gid_t)-1 && rgid != getgid()) { + if (egid == (rb_gid_t)-1) egid = getegid(); if (setgid(rgid) < 0) return -1; } - if (egid != -1 && egid != getegid()) { + if (egid != (rb_gid_t)-1 && egid != getegid()) { if (setegid(egid) < 0) return -1; } return 0; -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/