aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/backend/utils/adt/int8.c27
1 files changed, 24 insertions, 3 deletions
diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c
index b689cb764a4..380e0238238 100644
--- a/src/backend/utils/adt/int8.c
+++ b/src/backend/utils/adt/int8.c
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/int8.c,v 1.35 2001/10/25 14:10:06 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/int8.c,v 1.36 2001/11/24 19:57:06 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -26,6 +26,12 @@
#define INT64_FORMAT "%ld"
#endif
+#ifdef HAVE_LL_CONSTANTS
+#define INT64CONST(x) ((int64) x##LL)
+#else
+#define INT64CONST(x) ((int64) x)
+#endif
+
#define MAXINT8LEN 25
#ifndef INT_MAX
@@ -69,8 +75,23 @@ int8in(PG_FUNCTION_ARGS)
*/
while (*ptr && isspace((unsigned char) *ptr)) /* skip leading spaces */
ptr++;
- if (*ptr == '-') /* handle sign */
- sign = -1, ptr++;
+ /* handle sign */
+ if (*ptr == '-')
+ {
+ ptr++;
+ sign = -1;
+ /*
+ * Do an explicit check for INT64_MIN. Ugly though this is, it's
+ * cleaner than trying to get the loop below to handle it portably.
+ */
+#ifndef INT64_IS_BUSTED
+ if (strcmp(ptr, "9223372036854775808") == 0)
+ {
+ result = - INT64CONST(0x7fffffffffffffff) - 1;
+ PG_RETURN_INT64(result);
+ }
+#endif
+ }
else if (*ptr == '+')
ptr++;
if (!isdigit((unsigned char) *ptr)) /* require at least one digit */