db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2025-09-16 09:26:30 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/REL_2_5' into REL_2_5

Browse Source
This commit is contained in:
Yura Sokolov
2023-02-28 22:58:09 +03:00
parent 297dd2a7eb a2387b5134
commit cbf2bf9dde
1 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/utils/configuration.c
View File

@@ -1294,9 +1294,7 @@ parse_time(const char *value, time_t *result, bool utc_default)
{
/* set timezone to UTC */
pgut_setenv("TZ", "UTC");
#ifdef WIN32
tzset();
#endif
}
/* convert time to utc unix time */
@@ -1308,9 +1306,7 @@ parse_time(const char *value, time_t *result, bool utc_default)
else
pgut_unsetenv("TZ");
#ifdef WIN32
tzset();
#endif
/* adjust time zone */
if (tz_set || utc_default)
@@ -1546,33 +1542,19 @@ time2iso(char *buf, size_t len, time_t time, bool utc)
time_t gmt;
time_t offset;
char *ptr = buf;
char *local_tz = getenv("TZ");
/* set timezone to UTC if requested */
if (utc)
{
pgut_setenv("TZ", "UTC");
#ifdef WIN32
tzset();
#endif
ptm = gmtime(&time);
strftime(ptr, len, "%Y-%m-%d %H:%M:%S+00", ptm);
return;
}
ptm = gmtime(&time);
gmt = mktime(ptm);
ptm = localtime(&time);
if (utc)
{
/* return old timezone back if any */
if (local_tz)
pgut_setenv("TZ", local_tz);
else
pgut_unsetenv("TZ");
#ifdef WIN32
tzset();
#endif
}
/* adjust timezone offset */
offset = time - gmt + (ptm->tm_isdst ? 3600 : 0);