From c35290824a75b8edfffc6d809873d4f2cbd38bd1 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 21 Sep 2006 05:12:57 +0000
Subject: [PATCH] * ext/etc/etc.c (etc_getpwuid): uid integer should be wraped
 in   uid_t value.  [ruby-core:08897]

* ext/etc/etc.c (etc_getpwuid): uid_t may be bigger than plain
  'int' type.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10980 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog     |  8 ++++++++
 ext/etc/etc.c | 13 +++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bbaf80991f..b1d38bf52e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Sep 21 13:55:07 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/etc/etc.c (etc_getpwuid): uid integer should be wraped in
+	  uid_t value.  [ruby-core:08897]
+
+	* ext/etc/etc.c (etc_getpwuid): uid_t may be bigger than plain
+	  'int' type.
+
 Thu Sep 21 10:07:09 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_partition): RDoc typo fixed.  [ruby-core:08898]
diff --git a/ext/etc/etc.c b/ext/etc/etc.c
index 65a2963e74..1bd767d09c 100644
--- a/ext/etc/etc.c
+++ b/ext/etc/etc.c
@@ -120,12 +120,21 @@ etc_getpwuid(int argc, VALUE *argv, VALUE 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);
+#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
     }
     else {
 	uid = getuid();