Re: Bogus age value from Etc

Hi,

At Tue, 6 Sep 2005 00:48:11 +0900,
Daniel Berger wrote in [ruby-core:05719]:
> > |Ruby 1.8.2
> > |Solaris 10
> > |
> > |It looks like the "age" passwd value returned by Etc is bogus.
> > 
> > Hmm, I haven't seen any system with pw_age in passwd struct.
> > I thought it was an integer value, but char* in reality, at least on
> > Solaris 10, right?
> 
> Correct.  AFAIK it's a char* on all flavors of
> Solaris.

I googled pw_age and found only a few platforms of char*, but none of
int.

This patch seemed to work on HP-UX.


Index: ext/etc/etc.c
===================================================================
RCS file: /cvs/ruby/src/ruby/ext/etc/etc.c,v
retrieving revision 1.17
diff -U2 -p -r1.17 etc.c
--- ext/etc/etc.c	4 Mar 2005 06:47:39 -0000	1.17
+++ ext/etc/etc.c	6 Sep 2005 03:49:10 -0000
@@ -85,5 +85,5 @@ setup_passwd(pwd)
 #endif
 #ifdef HAVE_ST_PW_AGE
-			 INT2FIX(pwd->pw_age),
+			 PW_AGE2VAL(pwd->pw_age),
 #endif
 #ifdef HAVE_ST_PW_CLASS
Index: ext/etc/extconf.rb
===================================================================
RCS file: /cvs/ruby/src/ruby/ext/etc/extconf.rb,v
retrieving revision 1.5
diff -U2 -p -r1.5 extconf.rb
--- ext/etc/extconf.rb	24 Nov 2003 10:42:17 -0000	1.5
+++ ext/etc/extconf.rb	6 Sep 2005 04:27:21 -0000
@@ -1,4 +1,51 @@
 require 'mkmf'
 
+def scalar_ptr_type?(type, member = nil, headers = nil, &b)
+  try_compile(<<"SRC", &b)   # pointer
+#{COMMON_HEADERS}
+#{cpp_include(headers)}
+/*top*/
+volatile #{type} conftestval;
+int main() { return 0; }
+int t() {return (int)(1-*(#{type}#{member ? ".#{member}" : ""}));}
+SRC
+end
+
+def scalar_type?(type, member = nil, headers = nil, &b)
+  try_compile(<<"SRC", &b)   # pointer
+#{COMMON_HEADERS}
+#{cpp_include(headers)}
+/*top*/
+volatile #{type} conftestval;
+int main() { return 0; }
+int t() {return (int)(1-(#{type}#{member ? ".#{member}" : ""}));}
+SRC
+end
+
+def member_of(type, member)
+  "(((#{type} *)0)->#{member})"
+end
+
+def check_type(type, member = nil, headers = nil, &b)
+  name = member ? member_of(type, member) : type
+  if scalar_ptr_type?(type, member, headers, &b)
+    if try_static_assert("sizeof(*#{name}) == 1", headers)
+      "string"
+    end
+  elsif scalar_type?(type, member, headers, &b)
+    if try_static_assert("sizeof(#{name}) > sizeof(long)", headers)
+      "long long"
+    elsif try_static_assert("sizeof(#{name}) > sizeof(int)", headers)
+      "long"
+    elsif try_static_assert("sizeof(#{name}) > sizeof(short)", headers)
+      "int"
+    elsif try_static_assert("sizeof(#{name}) > 1", headers)
+      "short"
+    else
+      "char"
+    end
+  end
+end
+
 have_library("sun", "getpwnam")	# NIS (== YP) interface for IRIX 4
 a = have_func("getlogin")
@@ -9,5 +56,14 @@ if  a or b or c
   have_struct_member('struct passwd', 'pw_change', 'pwd.h')
   have_struct_member('struct passwd', 'pw_quota', 'pwd.h')
-  have_struct_member('struct passwd', 'pw_age', 'pwd.h')
+  if have_struct_member('struct passwd', 'pw_age', 'pwd.h')
+    case check_type('struct passwd', 'pw_age', 'pwd.h')
+    when "string"
+      $defs.push("-DPW_AGE2VAL=safe_setup_str")
+    when "long long"
+      $defs.push("-DPW_AGE2VAL=LL2NUM")
+    else
+      $defs.push("-DPW_AGE2VAL=INT2NUM")
+    end
+  end
   have_struct_member('struct passwd', 'pw_class', 'pwd.h')
   have_struct_member('struct passwd', 'pw_comment', 'pwd.h') unless /cygwin/ === RUBY_PLATFORM


-- 
Nobu Nakada