From 031d2e84df58ed54948671931544c41cf32da1ca Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 24 Jun 1999 04:24:09 +0000
Subject: 990624

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_3@490 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/etc/etc.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'ext/etc/etc.c')

diff --git a/ext/etc/etc.c b/ext/etc/etc.c
index 271602a294..e5f69f9285 100644
--- a/ext/etc/etc.c
+++ b/ext/etc/etc.c
@@ -125,7 +125,7 @@ static VALUE
 etc_passwd(obj)
     VALUE obj;
 {
-#if defined(HAVE_GETPWENT)
+#ifdef HAVE_GETPWENT
     struct passwd *pw;
 
     if (rb_iterator_p()) {
@@ -136,12 +136,11 @@ etc_passwd(obj)
 	endpwent();
 	return obj;
     }
-    pw = getpwent();
-    if (pw == 0) rb_raise(rb_eRuntimeError, "can't fetch next -- /etc/passwd");
-    return setup_passwd(pw);
-#else 
-    return Qnil;
+    if (pw = getpwent()) {
+	return setup_passwd(pw);
+    }
 #endif
+    return Qnil;
 }
 
 #ifdef HAVE_GETGRENT
-- 
cgit v1.2.3