mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-14 10:09:48 +00:00
Fix time printing bug
PR: 14813 Submitted by: idea by netch@lucky.net (Valentin Nechayev)
This commit is contained in:
parent
2a478ba2f9
commit
3973dacdb3
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=53129
@ -1,3 +1,4 @@
|
|||||||
|
/* $FreeBSD$ */
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
#define _POSIX_
|
#define _POSIX_
|
||||||
#endif
|
#endif
|
||||||
@ -3619,7 +3620,9 @@ strftime(fmt, sec, min, hour, mday, mon, year, wday = -1, yday = -1, isdst = -1)
|
|||||||
char tmpbuf[128];
|
char tmpbuf[128];
|
||||||
struct tm mytm;
|
struct tm mytm;
|
||||||
int len;
|
int len;
|
||||||
|
#ifndef __FreeBSD__
|
||||||
init_tm(&mytm); /* XXX workaround - see init_tm() above */
|
init_tm(&mytm); /* XXX workaround - see init_tm() above */
|
||||||
|
#endif
|
||||||
mytm.tm_sec = sec;
|
mytm.tm_sec = sec;
|
||||||
mytm.tm_min = min;
|
mytm.tm_min = min;
|
||||||
mytm.tm_hour = hour;
|
mytm.tm_hour = hour;
|
||||||
@ -3629,7 +3632,12 @@ strftime(fmt, sec, min, hour, mday, mon, year, wday = -1, yday = -1, isdst = -1)
|
|||||||
mytm.tm_wday = wday;
|
mytm.tm_wday = wday;
|
||||||
mytm.tm_yday = yday;
|
mytm.tm_yday = yday;
|
||||||
mytm.tm_isdst = isdst;
|
mytm.tm_isdst = isdst;
|
||||||
|
#ifdef __FreeBSD__
|
||||||
|
mytm.tm_gmtoff = 0;
|
||||||
|
mytm.tm_zone = "???";
|
||||||
|
#else
|
||||||
(void) mktime(&mytm);
|
(void) mktime(&mytm);
|
||||||
|
#endif
|
||||||
len = strftime(tmpbuf, sizeof tmpbuf, fmt, &mytm);
|
len = strftime(tmpbuf, sizeof tmpbuf, fmt, &mytm);
|
||||||
/*
|
/*
|
||||||
** The following is needed to handle to the situation where
|
** The following is needed to handle to the situation where
|
||||||
|
Loading…
Reference in New Issue
Block a user