summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-09-06 23:35:31 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-09-06 23:35:31 +0000
commit757c6fa4c95a3a8b15878bf5932d81b5608a700a (patch)
treeb0cd5bb1df45ef302723fcec6881208d6ee9d839
parentf6892cba239b44f37171b3cbf1296943b767d090 (diff)
* lib/mkmf.rb (what_type?): guesstimate type.
* ext/etc/etc.c (setup_passwd), ext/etc/extconf.rb: pw_age might be char*. fixed: [ruby-core:05470] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9090 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--ext/etc/etc.c6
-rw-r--r--ext/etc/extconf.rb13
-rw-r--r--lib/mkmf.rb55
4 files changed, 78 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 44f20907c2..13857346b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Wed Sep 7 08:22:23 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Sep 7 08:35:04 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* Makefile.in, configure.in (MINIOBJS): miniruby on HP-UX can not load
extension libraries.
@@ -11,6 +11,11 @@ Wed Sep 7 08:22:23 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/digest/sha2/extconf.rb: reject platforms which has inttypes.h
but no 64bit integer.
+ * lib/mkmf.rb (what_type?): guesstimate type.
+
+ * ext/etc/etc.c (setup_passwd), ext/etc/extconf.rb: pw_age might be
+ char*. fixed: [ruby-core:05470]
+
Mon Sep 5 22:28:46 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (stmt, mlhs_node, lhs, arg, method_call): aref_args might be
diff --git a/ext/etc/etc.c b/ext/etc/etc.c
index 6f677a6893..3b788d72d7 100644
--- a/ext/etc/etc.c
+++ b/ext/etc/etc.c
@@ -23,6 +23,10 @@
#include <grp.h>
#endif
+#ifndef HAVE_TYPE_UID_T
+#define uid_t int
+#endif
+
static VALUE sPasswd, sGroup;
#ifndef _WIN32
@@ -84,7 +88,7 @@ setup_passwd(pwd)
INT2FIX(pwd->pw_quota),
#endif
#ifdef HAVE_ST_PW_AGE
- INT2FIX(pwd->pw_age),
+ PW_AGE2VAL(pwd->pw_age),
#endif
#ifdef HAVE_ST_PW_CLASS
safe_setup_str(pwd->pw_class),
diff --git a/ext/etc/extconf.rb b/ext/etc/extconf.rb
index 16f2da352b..0dc8e7ddac 100644
--- a/ext/etc/extconf.rb
+++ b/ext/etc/extconf.rb
@@ -8,11 +8,22 @@ if a or b or c
have_struct_member('struct passwd', 'pw_gecos', 'pwd.h')
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 what_type?('struct passwd', 'pw_age', 'pwd.h')
+ when "string"
+ f = "safe_setup_str"
+ when "long long"
+ f = "LL2NUM"
+ else
+ f = "INT2NUM"
+ end
+ $defs.push("-DPW_AGE2VAL="+f)
+ end
have_struct_member('struct passwd', 'pw_class', 'pwd.h')
have_struct_member('struct passwd', 'pw_comment', 'pwd.h') unless /cygwin/ === RUBY_PLATFORM
have_struct_member('struct passwd', 'pw_expire', 'pwd.h')
have_struct_member('struct passwd', 'pw_passwd', 'pwd.h')
have_struct_member('struct group', 'gr_passwd', 'grp.h')
+ have_type("uid_t");
create_makefile("etc")
end
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 309ab47b4c..2784b2a074 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -706,6 +706,61 @@ def check_sizeof(type, header = nil, &b)
size
end
+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-*(conftestval#{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-(conftestval#{member ? ".#{member}" : ""}));}
+SRC
+end
+
+def what_type?(type, member = nil, headers = nil, &b)
+ m = "#{type}"
+ name = type
+ if member
+ m << "." << member
+ name = "(((#{type} *)0)->#{member})"
+ end
+ m << " in #{headers.inspect}" if headers
+ fmt = "seems %s"
+ def fmt.%(x)
+ x ? super : "unknown"
+ end
+ checking_for m, fmt do
+ 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
+end
+
def find_executable0(bin, path = nil)
path = (path || ENV['PATH']).split(File::PATH_SEPARATOR)
ext = config_string('EXEEXT')