diff options
author | Freddy DISSAUX <dsx@pouet.bsdsx.fr> | 2016-05-05 08:46:52 +0200 |
---|---|---|
committer | Freddy DISSAUX <dsx@pouet.bsdsx.fr> | 2016-05-05 08:46:52 +0200 |
commit | e226bb0ec7a77f84552e858f8b4b0ff68498a3d3 (patch) | |
tree | 6fa252375cff1dc55e1335f8e411c5a02af429c9 /smtpd/to.c | |
parent | Merge remote-tracking branch 'upstream/portable' into solaris_struct_tm (diff) | |
download | OpenSMTPD-e226bb0ec7a77f84552e858f8b4b0ff68498a3d3.tar.xz OpenSMTPD-e226bb0ec7a77f84552e858f8b4b0ff68498a3d3.zip |
Revert "solaris don't have tm_gmtoff/tm_zone"
This reverts commit 1c9d330087741d4ffc6d718e696e11c909edb0b0.
Diffstat (limited to 'smtpd/to.c')
-rw-r--r-- | smtpd/to.c | 20 |
1 files changed, 1 insertions, 19 deletions
@@ -200,39 +200,21 @@ time_to_text(time_t when) char *day[] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; char *month[] = {"Jan","Feb","Mar","Apr","May","Jun", "Jul","Aug","Sep","Oct","Nov","Dec"}; -#ifndef HAVE_STRUCT_TM_TM_GMTOFF - long offset; -#endif lt = localtime(&when); if (lt == NULL || when == 0) fatalx("time_to_text: localtime"); -#if defined HAVE_DECL_ALTZONE && defined HAVE_DECL_TIMEZONE - offset = lt->tm_isdst > 0 ? altzone : timezone; -#endif /* We do not use strftime because it is subject to locale substitution*/ if (!bsnprintf(buf, sizeof(buf), "%s, %d %s %d %02d:%02d:%02d %c%02d%02d (%s)", day[lt->tm_wday], lt->tm_mday, month[lt->tm_mon], lt->tm_year + 1900, lt->tm_hour, lt->tm_min, lt->tm_sec, -#ifdef HAVE_STRUCT_TM_TM_GMTOFF lt->tm_gmtoff >= 0 ? '+' : '-', abs((int)lt->tm_gmtoff / 3600), abs((int)lt->tm_gmtoff % 3600) / 60, -#elif defined HAVE_DECL_ALTZONE && defined HAVE_DECL_TIMEZONE - offset >= 0 ? '+' : '-', - abs((int)offset / 3600), - abs((int)offset % 3600) / 60, -#endif -#ifdef HAVE_STRUCT_TM_TM_ZONE - lt->tm_zone -#elif defined HAVE_DECL_TZNAME - lt->tm_isdst > 0 ? tzname[1] : tzname[0] -#endif - )) - + lt->tm_zone)) fatalx("time_to_text: bsnprintf"); return buf; |