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

r11523@ruby: shyouhei | 2007-01-09 15:57:58 +0900

* ext/etc/etc.c (etc_getpwuid, etc_getgrgid): fix to correctly
   convert uid/gid from VALUE.
 
 * ext/etc/etc.c (etc_getpwuid): ditto.
 


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@11521 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2007-01-09 11:52:26 +00:00
parent b3a7194948
commit 7295523013
4 changed files with 20 additions and 11 deletions

View file

@ -1,3 +1,10 @@
Tue Jan 9 12:29:20 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/etc/etc.c (etc_getpwuid, etc_getgrgid): fix to correctly
convert uid/gid from VALUE.
* ext/etc/etc.c (etc_getpwuid): ditto.
Mon Dec 25 20:08:28 2006 URABE Shyouhei <shyouhei@ruby-lang.org>
* ext/openssl/ossl.h: fixed compilation problem on gcc 3.2.

View file

@ -126,12 +126,12 @@ etc_getpwuid(argc, argv, obj)
{
#if defined(HAVE_GETPWENT)
VALUE id;
int uid;
uid_t uid;
struct passwd *pwd;
rb_secure(4);
if (rb_scan_args(argc, argv, "01", &id) == 1) {
uid = NUM2INT(id);
uid = PW_VAL2UID(id);
}
else {
uid = getuid();
@ -333,11 +333,11 @@ etc_getgrgid(obj, id)
VALUE obj, id;
{
#ifdef HAVE_GETGRENT
int gid;
gid_t gid;
struct group *grp;
rb_secure(4);
gid = NUM2INT(id);
gid = getgid();
grp = getgrgid(gid);
if (grp == 0) rb_raise(rb_eArgError, "can't find group for %d", gid);
return setup_group(grp);

View file

@ -35,7 +35,9 @@ if a or b or c
f = "U#{f}"
end
end
$defs.push("-DPW_#{t.chomp('_t').upcase}2VAL=#{f}")
t = t.chomp('_t').upcase
$defs.push("-DPW_#{t}2VAL=#{f}")
$defs.push("-DPW_VAL2#{t}=#{f.sub(/([A-Z]+)2(NUM)/, '\22\1')}")
end
create_makefile("etc")
end

View file

@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.5"
#define RUBY_RELEASE_DATE "2006-12-25"
#define RUBY_RELEASE_DATE "2007-01-09"
#define RUBY_VERSION_CODE 185
#define RUBY_RELEASE_CODE 20061225
#define RUBY_PATCHLEVEL 13
#define RUBY_RELEASE_CODE 20070109
#define RUBY_PATCHLEVEL 14
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 5
#define RUBY_RELEASE_YEAR 2006
#define RUBY_RELEASE_MONTH 12
#define RUBY_RELEASE_DAY 25
#define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 1
#define RUBY_RELEASE_DAY 9
RUBY_EXTERN const char ruby_version[];
RUBY_EXTERN const char ruby_release_date[];