Skip to content

Commit 8e98403

Browse files
author
Thomas G. Lockhart
committed
Change comparisons of tm->tm_isdst from "nonzero" to "greater than zero".
 Not sure why some were this way, and others were already correct, but it seems to have been like this for several years. This caused problems on a few damaged platforms like AIX and IRIX which do not support DST calculations for years before 1970. Thanks to Andreas Zeugswetter <ZeugswetterA@wien.spardat.at> for finding the problem.
1 parent 9a342d2 commit 8e98403

File tree

4 files changed

+60
-55
lines changed

4 files changed

+60
-55
lines changed

‎src/backend/utils/adt/datetime.c‎

Lines changed: 44 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.57 2000/12/03 20:45:35 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.58 2001/01/17 16:46:56 thomas Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -2229,29 +2229,35 @@ EncodeTimeSpan(struct tm * tm, double fsec, int style, char *str)
22292229
sprintf(cp, "%d year%s",
22302230
tm->tm_year, ((tm->tm_year != 1) ? "s" : ""));
22312231
cp += strlen(cp);
2232+
is_before = (tm->tm_year < 0);
22322233
is_nonzero = TRUE;
22332234
}
22342235

22352236
if (tm->tm_mon != 0)
22362237
{
2237-
sprintf(cp, "%s%d mon%s", (is_nonzero ? " " : ""),
2238+
sprintf(cp, "%s%s%d mon%s", (is_nonzero ? " " : ""),
2239+
((is_before && (tm->tm_mon > 0)) ? "+" : ""),
22382240
tm->tm_mon, ((tm->tm_mon != 1) ? "s" : ""));
22392241
cp += strlen(cp);
2242+
is_before = (tm->tm_mon < 0);
22402243
is_nonzero = TRUE;
22412244
}
22422245

22432246
if (tm->tm_mday != 0)
22442247
{
2245-
sprintf(cp, "%s%d", (is_nonzero ? " " : ""), tm->tm_mday);
2248+
sprintf(cp, "%s%s%d day%s", (is_nonzero ? " " : ""),
2249+
((is_before && (tm->tm_mday > 0)) ? "+" : ""),
2250+
tm->tm_mday, ((tm->tm_mday != 1) ? "s" : ""));
22462251
cp += strlen(cp);
2252+
is_before = (tm->tm_mday < 0);
22472253
is_nonzero = TRUE;
22482254
}
22492255
{
22502256
int minus = ((tm->tm_hour < 0) || (tm->tm_min < 0)
22512257
|| (tm->tm_sec < 0) || (fsec < 0));
22522258

22532259
sprintf(cp, "%s%s%02d:%02d", (is_nonzero ? " " : ""),
2254-
(minus ? "-" : "+"),
2260+
(minus ? "-" : (is_nonzero ? "+" : "")),
22552261
abs(tm->tm_hour), abs(tm->tm_min));
22562262
cp += strlen(cp);
22572263
/* Mark as "non-zero" since the fields are now filled in */
@@ -2283,85 +2289,84 @@ EncodeTimeSpan(struct tm * tm, double fsec, int style, char *str)
22832289

22842290
if (tm->tm_year != 0)
22852291
{
2286-
is_before = (tm->tm_year < 0);
2287-
if (is_before)
2288-
tm->tm_year = -tm->tm_year;
2289-
sprintf(cp, "%d year%s",
2290-
tm->tm_year, ((tm->tm_year != 1) ? "s" : ""));
2292+
int year = ((tm->tm_year < 0) ? -(tm->tm_year) : tm->tm_year);
2293+
2294+
sprintf(cp, "%d year%s", year,
2295+
((year != 1) ? "s" : ""));
22912296
cp += strlen(cp);
2297+
is_before = (tm->tm_year < 0);
22922298
is_nonzero = TRUE;
22932299
}
22942300

22952301
if (tm->tm_mon != 0)
22962302
{
2303+
int mon = ((is_before && (tm->tm_mon > 0)) ? -(tm->tm_mon) : tm->tm_mon);
2304+
2305+
sprintf(cp, "%s%d mon%s", (is_nonzero ? " " : ""), mon,
2306+
((mon != 1) ? "s" : ""));
2307+
cp += strlen(cp);
22972308
if (! is_nonzero)
22982309
is_before = (tm->tm_mon < 0);
2299-
if (is_before)
2300-
tm->tm_mon = -tm->tm_mon;
2301-
sprintf(cp, "%s%d mon%s", (is_nonzero ? " " : ""),
2302-
tm->tm_mon, ((tm->tm_mon != 1) ? "s" : ""));
2303-
cp += strlen(cp);
23042310
is_nonzero = TRUE;
23052311
}
23062312

23072313
if (tm->tm_mday != 0)
23082314
{
2315+
int day = ((is_before && (tm->tm_mday > 0)) ? -(tm->tm_mday) : tm->tm_mday);
2316+
2317+
sprintf(cp, "%s%d day%s", (is_nonzero ? " " : ""), day,
2318+
((day != 1) ? "s" : ""));
2319+
cp += strlen(cp);
23092320
if (! is_nonzero)
23102321
is_before = (tm->tm_mday < 0);
2311-
if (is_before)
2312-
tm->tm_mday = -tm->tm_mday;
2313-
sprintf(cp, "%s%d day%s", (is_nonzero ? " " : ""),
2314-
tm->tm_mday, ((tm->tm_mday != 1) ? "s" : ""));
2315-
cp += strlen(cp);
23162322
is_nonzero = TRUE;
23172323
}
23182324
if (tm->tm_hour != 0)
23192325
{
2326+
int hour = ((is_before && (tm->tm_hour > 0)) ? -(tm->tm_hour) : tm->tm_hour);
2327+
2328+
sprintf(cp, "%s%d hour%s", (is_nonzero ? " " : ""), hour,
2329+
((hour != 1) ? "s" : ""));
2330+
cp += strlen(cp);
23202331
if (! is_nonzero)
23212332
is_before = (tm->tm_hour < 0);
2322-
if (is_before)
2323-
tm->tm_hour = -tm->tm_hour;
2324-
sprintf(cp, "%s%d hour%s", (is_nonzero ? " " : ""),
2325-
tm->tm_hour, ((tm->tm_hour != 1) ? "s" : ""));
2326-
cp += strlen(cp);
23272333
is_nonzero = TRUE;
23282334
}
23292335

23302336
if (tm->tm_min != 0)
23312337
{
2338+
int min = ((is_before && (tm->tm_min > 0)) ? -(tm->tm_min) : tm->tm_min);
2339+
2340+
sprintf(cp, "%s%d min%s", (is_nonzero ? " " : ""), min,
2341+
((min != 1) ? "s" : ""));
2342+
cp += strlen(cp);
23322343
if (! is_nonzero)
23332344
is_before = (tm->tm_min < 0);
2334-
if (is_before)
2335-
tm->tm_min = -tm->tm_min;
2336-
sprintf(cp, "%s%d min%s", (is_nonzero ? " " : ""),
2337-
tm->tm_min, ((tm->tm_min != 1) ? "s" : ""));
2338-
cp += strlen(cp);
23392345
is_nonzero = TRUE;
23402346
}
23412347

23422348
/* fractional seconds? */
23432349
if (fsec != 0)
23442350
{
23452351
fsec += tm->tm_sec;
2352+
sprintf(cp, "%s%.2f secs", (is_nonzero ? " " : ""),
2353+
((is_before && (fsec > 0)) ? -(fsec) : fsec));
2354+
cp += strlen(cp);
23462355
if (! is_nonzero)
23472356
is_before = (fsec < 0);
2348-
if (is_before)
2349-
fsec = -fsec;
2350-
sprintf(cp, "%s%.2f secs", (is_nonzero ? " " : ""), fsec);
2351-
cp += strlen(cp);
23522357
is_nonzero = TRUE;
23532358

23542359
/* otherwise, integer seconds only? */
23552360
}
23562361
else if (tm->tm_sec != 0)
23572362
{
2363+
int sec = ((is_before && (tm->tm_sec > 0)) ? -(tm->tm_sec) : tm->tm_sec);
2364+
2365+
sprintf(cp, "%s%d sec%s", (is_nonzero ? " " : ""), sec,
2366+
((sec != 1) ? "s" : ""));
2367+
cp += strlen(cp);
23582368
if (! is_nonzero)
23592369
is_before = (tm->tm_sec < 0);
2360-
if (is_before)
2361-
tm->tm_sec = -tm->tm_sec;
2362-
sprintf(cp, "%s%d sec%s", (is_nonzero ? " " : ""),
2363-
tm->tm_sec, ((tm->tm_sec != 1) ? "s" : ""));
2364-
cp += strlen(cp);
23652370
is_nonzero = TRUE;
23662371
}
23672372
break;
@@ -2374,7 +2379,7 @@ EncodeTimeSpan(struct tm * tm, double fsec, int style, char *str)
23742379
cp += strlen(cp);
23752380
}
23762381

2377-
if (is_before)
2382+
if (is_before && (style == USE_POSTGRES_DATES))
23782383
{
23792384
strcat(cp, " ago");
23802385
cp += strlen(cp);

‎src/backend/utils/adt/formatting.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* -----------------------------------------------------------------------
22
* formatting.c
33
*
4-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/formatting.c,v 1.28 2000/12/23 04:05:31 tgl Exp $
4+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/formatting.c,v 1.29 2001/01/17 16:46:56 thomas Exp $
55
*
66
*
77
* Portions Copyright (c) 1999-2000, PostgreSQL, Inc
@@ -382,7 +382,7 @@ typedef struct {
382382
elog(DEBUG_elog_output, "TM:\nsec %d\nyear %d\nmin %d\nwday %d\nhour %d\nyday %d\nmday %d\nnisdst %d\nmon %d\n",\
383383
tm->tm_sec, tm->tm_year,\
384384
tm->tm_min, tm->tm_wday, tm->tm_hour, tm->tm_yday,\
385-
tm->tm_mday, tm->tm_isdst,tm->tm_mon)
385+
tm->tm_mday, tm->tm_isdst, tm->tm_mon)
386386
#endif
387387

388388
#define ZERO_tm( _X ) \
@@ -2933,9 +2933,9 @@ to_timestamp(PG_FUNCTION_ARGS)
29332933
# elif defined(HAVE_INT_TIMEZONE)
29342934

29352935
# ifdef __CYGWIN__
2936-
tz = (tm->tm_isdst ? (_timezone - 3600) : _timezone);
2936+
tz = ((tm->tm_isdst > 0) ? (_timezone - 3600) : _timezone);
29372937
# else
2938-
tz = (tm->tm_isdst ? (timezone - 3600) : timezone);
2938+
tz = ((tm->tm_isdst > 0) ? (timezone - 3600) : timezone);
29392939
# endif
29402940

29412941
# endif

‎src/backend/utils/adt/nabstime.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.77 2000/12/09 20:40:57 tgl Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.78 2001/01/17 16:46:56 thomas Exp $
1313
*
1414
* NOTES
1515
*
@@ -162,9 +162,9 @@ GetCurrentAbsoluteTime(void)
162162
CDayLight = tm->tm_isdst;
163163
CTimeZone =
164164
# ifdef __CYGWIN__
165-
(tm->tm_isdst ? (_timezone - 3600) : _timezone);
165+
((tm->tm_isdst > 0) ? (_timezone - 3600) : _timezone);
166166
# else
167-
(tm->tm_isdst ? (timezone - 3600) : timezone);
167+
((tm->tm_isdst > 0) ? (timezone - 3600) : timezone);
168168
# endif
169169
strcpy(CTZName, tzname[tm->tm_isdst]);
170170
#else /* neither HAVE_TM_ZONE nor HAVE_INT_TIMEZONE */
@@ -245,9 +245,9 @@ abstime2tm(AbsoluteTime _time, int *tzp, struct tm * tm, char *tzn)
245245
# elif defined(HAVE_INT_TIMEZONE)
246246
if (tzp != NULL)
247247
# ifdef __CYGWIN__
248-
*tzp = (tm->tm_isdst ? (_timezone - 3600) : _timezone);
248+
*tzp = ((tm->tm_isdst > 0) ? (_timezone - 3600) : _timezone);
249249
# else
250-
*tzp = (tm->tm_isdst ? (timezone - 3600) : timezone);
250+
*tzp = ((tm->tm_isdst > 0) ? (timezone - 3600) : timezone);
251251
# endif
252252
if (tzn != NULL)
253253
{

‎src/backend/utils/adt/timestamp.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/timestamp.c,v 1.41 2001/01/03 16:48:02 thomas Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/timestamp.c,v 1.42 2001/01/17 16:46:56 thomas Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -341,9 +341,9 @@ timestamp2tm(Timestamp dt, int *tzp, struct tm * tm, double *fsec, char **tzn)
341341
*tzn = (char *) tm->tm_zone;
342342
# elif defined(HAVE_INT_TIMEZONE)
343343
# ifdef __CYGWIN__
344-
*tzp = (tm->tm_isdst ? (_timezone - 3600) : _timezone);
344+
*tzp = ((tm->tm_isdst > 0) ? (_timezone - 3600) : _timezone);
345345
# else
346-
*tzp = (tm->tm_isdst ? (timezone - 3600) : timezone);
346+
*tzp = ((tm->tm_isdst > 0) ? (timezone - 3600) : timezone);
347347
# endif
348348
if (tzn != NULL)
349349
*tzn = tzname[(tm->tm_isdst > 0)];
@@ -1086,9 +1086,9 @@ timestamp_pl_span(PG_FUNCTION_ARGS)
10861086
# elif defined(HAVE_INT_TIMEZONE)
10871087

10881088
# ifdef __CYGWIN__
1089-
tz = (tm->tm_isdst ? (_timezone - 3600) : _timezone);
1089+
tz = ((tm->tm_isdst > 0) ? (_timezone - 3600) : _timezone);
10901090
# else
1091-
tz = (tm->tm_isdst ? (timezone - 3600) : timezone);
1091+
tz = ((tm->tm_isdst > 0) ? (timezone - 3600) : timezone);
10921092
# endif
10931093

10941094
# endif
@@ -1735,9 +1735,9 @@ timestamp_trunc(PG_FUNCTION_ARGS)
17351735
# elif defined(HAVE_INT_TIMEZONE)
17361736

17371737
# ifdef __CYGWIN__
1738-
tz = (tm->tm_isdst ? (_timezone - 3600) : _timezone);
1738+
tz = ((tm->tm_isdst > 0) ? (_timezone - 3600) : _timezone);
17391739
# else
1740-
tz = (tm->tm_isdst ? (timezone - 3600) : timezone);
1740+
tz = ((tm->tm_isdst > 0) ? (timezone - 3600) : timezone);
17411741
# endif
17421742

17431743
# endif

0 commit comments

Comments
 (0)