diff options
Diffstat (limited to 'ext/etc/etc.c')
-rw-r--r-- | ext/etc/etc.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/ext/etc/etc.c b/ext/etc/etc.c index c9ed3d5293..447d833bc7 100644 --- a/ext/etc/etc.c +++ b/ext/etc/etc.c @@ -131,16 +131,7 @@ etc_getpwuid(argc, argv, obj) rb_secure(4); if (rb_scan_args(argc, argv, "01", &id) == 1) { -#if HAVE_LONG_LONG && HAVE_TYPE_UID_T - if (sizeof(uid_t) > sizeof(int)) { - uid = NUM2ULL(id); - } - else { - uid = NUM2UINT(id); - } -#else - uid = NUM2UINT(id); -#endif + uid = PW_VAL2UID(id); } else { uid = getuid(); @@ -342,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); |