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

* ext/etc/etc.c (sGroup): getgrent may not be available.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@22381 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-02-17 16:58:12 +00:00
parent 682f161d63
commit 9bc9c63d27
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Wed Feb 18 01:58:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/etc/etc.c (sGroup): getgrent may not be available.
Tue Feb 17 17:02:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Feb 17 17:02:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* version.c, version.h: NO_STRING_LITERAL_CONCATENATION support. * version.c, version.h: NO_STRING_LITERAL_CONCATENATION support.

9
ext/etc/etc.c
View file

@ -27,7 +27,10 @@
#define uid_t int #define uid_t int
#endif #endif
static VALUE sPasswd, sGroup; static VALUE sPasswd;
#ifdef HAVE_GETGRENT
static VALUE sGroup;
#endif
#ifndef _WIN32 #ifndef _WIN32
char *getenv(); char *getenv();
@ -139,7 +142,7 @@ etc_getpwuid(argc, argv, obj)
uid = getuid(); uid = getuid();
} }
pwd = getpwuid(uid); pwd = getpwuid(uid);
if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %d", uid); if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %d", (int)uid);
return setup_passwd(pwd); return setup_passwd(pwd);
#else #else
return Qnil; return Qnil;
@ -341,7 +344,7 @@ etc_getgrgid(obj, id)
rb_secure(4); rb_secure(4);
gid = PW_VAL2GID(id); gid = PW_VAL2GID(id);
grp = getgrgid(gid); grp = getgrgid(gid);
if (grp == 0) rb_raise(rb_eArgError, "can't find group for %d", gid); if (grp == 0) rb_raise(rb_eArgError, "can't find group for %d", (int)gid);
return setup_group(grp); return setup_group(grp);
#else #else
return Qnil; return Qnil;