ruby-changes:60709
From: Nobuyoshi <ko1@a...>
Date: Thu, 9 Apr 2020 12:23:56 +0900 (JST)
Subject: [ruby-changes:60709] 97f73bd0e2 (master): Ignore upper bits of pw_change on macOS too
https://git.ruby-lang.org/ruby.git/commit/?id=97f73bd0e2 From 97f73bd0e2ace86183956f042f93a0eadd81e515 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Thu, 9 Apr 2020 12:23:15 +0900 Subject: Ignore upper bits of pw_change on macOS too diff --git a/ext/etc/etc.c b/ext/etc/etc.c index 5c08ba8..cbff665 100644 --- a/ext/etc/etc.c +++ b/ext/etc/etc.c @@ -126,9 +126,9 @@ safe_setup_filesystem_str(const char *str) https://github.com/ruby/ruby/blob/trunk/ext/etc/etc.c#L126 #ifdef HAVE_GETPWENT # ifdef __APPLE__ -# define PW_EXPIRE2VAL(t) INT2NUM((int)(t)) +# define PW_TIME2VAL(t) INT2NUM((int)(t)) # else -# define PW_EXPIRE2VAL(t) TIMET2NUM(t) +# define PW_TIME2VAL(t) TIMET2NUM(t) # endif static VALUE @@ -148,7 +148,7 @@ setup_passwd(struct passwd *pwd) https://github.com/ruby/ruby/blob/trunk/ext/etc/etc.c#L148 safe_setup_filesystem_str(pwd->pw_dir), safe_setup_filesystem_str(pwd->pw_shell), #ifdef HAVE_STRUCT_PASSWD_PW_CHANGE - TIMET2NUM(pwd->pw_change), + PW_TIME2VAL(pwd->pw_change), #endif #ifdef HAVE_STRUCT_PASSWD_PW_QUOTA INT2NUM(pwd->pw_quota), @@ -163,7 +163,7 @@ setup_passwd(struct passwd *pwd) https://github.com/ruby/ruby/blob/trunk/ext/etc/etc.c#L163 safe_setup_locale_str(pwd->pw_comment), #endif #ifdef HAVE_STRUCT_PASSWD_PW_EXPIRE - PW_EXPIRE2VAL(pwd->pw_expire), + PW_TIME2VAL(pwd->pw_expire), #endif 0 /*dummy*/ ); -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/