[ruby-dev:15463] Re: Time#utcoff

In article <[e-mail]>,
  Tanaka Akira <[e-mail]> writes:

> というわけで疑問は解消したのでパッチをつけときます。

うーがー。なぜメールを送ると問題が見つかるのだ。

> +static time_t
> +make_time_t(tptr, utc_p)
> +    struct tm *tptr;
> +    int utc_p;
> +{
> +    time_t t;
> +    struct tm *tmp, buf;
> +    buf = *tptr;
> +    if (utc_p) {
> +#if defined(HAVE_TIMEGM)
> +	t = timegm(&buf);
> +	if (t == -1)
> +#endif
> +	t = search_time_t(&buf, utc_p);
> +	if (!(tmp = gmtime(&t)))
> +	    rb_raise(rb_eArgError, "gmtime error");
> +    }
> +    else {
> +#if defined(HAVE_MKTIME)
> +	t = mktime(&buf);
> +	if (t == -1)
> +#endif
> +	t = search_time_t(&buf, utc_p);
> +	if (!(tmp = localtime(&t)))
> +	    rb_raise(rb_eArgError, "localtime error");
> +    }
> +    return t;
> +}

search_time_t (以前の make_time_t) は 64bit time_t で常に失敗するので、
これだと 1969-12-31T23:59:59Z をあつかえません。というわけで

static time_t
make_time_t(tptr, utc_p)
    struct tm *tptr;
    int utc_p;
{
    time_t t;
    struct tm *tmp, buf;
    buf = *tptr;
    if (utc_p) {
#if defined(HAVE_TIMEGM)
        t = timegm(&buf);
        if (t == -1) {
            if (!(tmp = gmtime(&t)) ||
                tptr->tm_year != tmp->tm_year ||
                tptr->tm_mon != tmp->tm_mon ||
                tptr->tm_mday != tmp->tm_mday ||
                tptr->tm_hour != tmp->tm_hour ||
                tptr->tm_min != tmp->tm_min ||
                tptr->tm_sec != tmp->tm_sec)
                rb_raise(rb_eArgError, "gmtime error");
        }
#else
        t = search_time_t(&buf, utc_p);
#endif
    }
    else {
#if defined(HAVE_MKTIME)
        t = mktime(&buf);
        if (t == -1) {
            if (!(tmp = localtime(&t)) ||
                tptr->tm_year != tmp->tm_year ||
                tptr->tm_mon != tmp->tm_mon ||
                tptr->tm_mday != tmp->tm_mday ||
                tptr->tm_hour != tmp->tm_hour ||
                tptr->tm_min != tmp->tm_min ||
                tptr->tm_sec != tmp->tm_sec)
                rb_raise(rb_eArgError, "localtime error");
        }
#else
        t = search_time_t(&buf, utc_p);
#endif
    }
    return t;
}

ですかねぇ。
-- 
[田中 哲][たなか あきら][Tanaka Akira]
「ふえろ! わかめちゃん作戦です$(C⊇」(Little Worker, 桂遊生丸)