# include "vasnprintf.h"
#endif
+#include <locale.h> /* localeconv() */
#include <stdio.h> /* snprintf(), sprintf() */
#include <stdlib.h> /* abort(), malloc(), realloc(), free() */
#include <string.h> /* memcpy(), strlen() */
#include <errno.h> /* errno */
#include <limits.h> /* CHAR_BIT */
#include <float.h> /* DBL_MAX_EXP, LDBL_MAX_EXP */
+#if HAVE_NL_LANGINFO
+# include <langinfo.h>
+#endif
#if WIDE_CHAR_VERSION
# include "wprintf-parse.h"
#else
#include "xsize.h"
#if NEED_PRINTF_DIRECTIVE_A && !defined IN_LIBINTL
+# include <math.h>
# include "isnan.h"
-# include "isnanl.h"
-# if HAVE_LONG_DOUBLE
-# include "printf-frexp.h"
-# include "printf-frexpl.h"
-# endif
+# include "printf-frexp.h"
+# include "isnanl-nolibm.h"
+# include "printf-frexpl.h"
+# include "fpucw.h"
+#endif
+
+/* Some systems, like OSF/1 4.0 and Woe32, don't have EOVERFLOW. */
+#ifndef EOVERFLOW
+# define EOVERFLOW E2BIG
#endif
#if HAVE_WCHAR_T
# else
/* Unix. */
# define SNPRINTF snprintf
+ /* Here we need to call the native snprintf, not rpl_snprintf. */
+# undef snprintf
+# endif
+#endif
+/* Here we need to call the native sprintf, not rpl_sprintf. */
+#undef sprintf
+
+#if NEED_PRINTF_DIRECTIVE_A && !defined IN_LIBINTL
+/* Determine the decimal-point character according to the current locale. */
+# ifndef decimal_point_char_defined
+# define decimal_point_char_defined 1
+static char
+decimal_point_char ()
+{
+ const char *point;
+ /* Determine it in a multithread-safe way. We know nl_langinfo is
+ multithread-safe on glibc systems, but is not required to be multithread-
+ safe by POSIX. sprintf(), however, is multithread-safe. localeconv()
+ is rarely multithread-safe. */
+# if HAVE_NL_LANGINFO && __GLIBC__
+ point = nl_langinfo (RADIXCHAR);
+# elif 1
+ char pointbuf[5];
+ sprintf (pointbuf, "%#.0f", 1.0);
+ point = &pointbuf[1];
+# else
+ point = localeconv () -> decimal_point;
+# endif
+ /* The decimal point is always a single byte: either '.' or ','. */
+ return (point[0] != '\0' ? point[0] : '.');
+}
# endif
#endif
}
/* Allocate a temporary buffer of sufficient size. */
-# if HAVE_LONG_DOUBLE
if (type == TYPE_LONGDOUBLE)
tmp_length =
(unsigned int) ((LDBL_DIG + 1)
)
+ 1; /* turn floor into ceil */
else
-# endif
tmp_length =
(unsigned int) ((DBL_DIG + 1)
* 0.831 /* decimal -> hexadecimal */
pad_ptr = NULL;
p = tmp;
-# if HAVE_LONG_DOUBLE
if (type == TYPE_LONGDOUBLE)
{
long double arg = a.arg[dp->arg_index].a.a_longdouble;
else
{
int sign = 0;
+ DECL_LONG_DOUBLE_ROUNDING
+
+ BEGIN_LONG_DOUBLE_ROUNDING ();
- if (arg < 0.0L)
+ if (signbit (arg)) /* arg < 0.0L or negative zero */
{
sign = -1;
arg = -arg;
}
- else if (arg == 0.0L)
- {
- /* Distinguish 0.0L and -0.0L. */
- static long double plus_zero = 0.0L;
- long double arg_mem = arg;
- if (memcmp (&plus_zero, &arg_mem, sizeof (long double)) != 0)
- {
- sign = -1;
- arg = -arg;
- }
- }
if (sign < 0)
*p++ = '-';
else if (flags & FLAG_SPACE)
*p++ = ' ';
- if (x > 0.0L && x + x == x)
+ if (arg > 0.0L && arg + arg == arg)
{
if (dp->conversion == 'A')
{
int exponent;
long double mantissa;
- if (x > 0.0L)
+ if (arg > 0.0L)
mantissa = printf_frexpl (arg, &exponent);
else
{
&& precision < (unsigned int) ((LDBL_DIG + 1) * 0.831) + 1)
{
/* Round the mantissa. */
- long double tail = arg;
+ long double tail = mantissa;
size_t q;
for (q = precision; ; q--)
if (digit & 1 ? tail >= 0.5L : tail > 0.5L)
tail = 1 - tail;
else
- tail = 0;
+ tail = - tail;
break;
}
tail *= 16.0L;
}
- if (tail > 0.0L)
+ if (tail != 0.0L)
for (q = precision; q > 0; q--)
tail *= 0.0625L;
- arg += tail;
+ mantissa += tail;
}
*p++ = '0';
{
int digit;
- digit = (int) arg;
- arg -= digit;
+ digit = (int) mantissa;
+ mantissa -= digit;
*p++ = '0' + digit;
- if ((flags & FLAG_ALT) || arg > 0.0L)
+ if ((flags & FLAG_ALT)
+ || mantissa > 0.0L || precision > 0)
{
- *p++ = '.';
+ *p++ = decimal_point_char ();
/* This loop terminates because we assume
that FLT_RADIX is a power of 2. */
- while (arg > 0.0L)
+ while (mantissa > 0.0L)
{
- arg *= 16.0L;
- digit = (int) arg;
- arg -= digit;
+ mantissa *= 16.0L;
+ digit = (int) mantissa;
+ mantissa -= digit;
*p++ = digit
+ (digit < 10
? '0'
}
}
*p++ = dp->conversion - 'A' + 'P';
-# if WIDE_CHAR_VERSION
+# if WIDE_CHAR_VERSION
{
static const wchar_t decimal_format[] =
- { '%', 'd', '\0' };
+ { '%', '+', 'd', '\0' };
SNPRINTF (p, 6 + 1, decimal_format, exponent);
}
-# else
- sprintf (p, "%d", exponent);
-# endif
+# else
+ sprintf (p, "%+d", exponent);
+# endif
while (*p != '\0')
p++;
}
+
+ END_LONG_DOUBLE_ROUNDING ();
}
}
else
-# endif
{
double arg = a.arg[dp->arg_index].a.a_double;
{
int sign = 0;
- if (arg < 0.0)
+ if (signbit (arg)) /* arg < 0.0 or negative zero */
{
sign = -1;
arg = -arg;
}
- else if (arg == 0.0)
- {
- /* Distinguish 0.0 and -0.0. */
- static double plus_zero = 0.0;
- double arg_mem = arg;
- if (memcmp (&plus_zero, &arg_mem, sizeof (double)) != 0)
- {
- sign = -1;
- arg = -arg;
- }
- }
if (sign < 0)
*p++ = '-';
else if (flags & FLAG_SPACE)
*p++ = ' ';
- if (x > 0.0 && x + x == x)
+ if (arg > 0.0 && arg + arg == arg)
{
if (dp->conversion == 'A')
{
int exponent;
double mantissa;
- if (x > 0.0)
+ if (arg > 0.0)
mantissa = printf_frexp (arg, &exponent);
else
{
&& precision < (unsigned int) ((DBL_DIG + 1) * 0.831) + 1)
{
/* Round the mantissa. */
- double tail = arg;
+ double tail = mantissa;
size_t q;
for (q = precision; ; q--)
if (digit & 1 ? tail >= 0.5 : tail > 0.5)
tail = 1 - tail;
else
- tail = 0;
+ tail = - tail;
break;
}
tail *= 16.0;
}
- if (tail > 0.0)
+ if (tail != 0.0)
for (q = precision; q > 0; q--)
tail *= 0.0625;
- arg += tail;
+ mantissa += tail;
}
*p++ = '0';
{
int digit;
- digit = (int) arg;
- arg -= digit;
+ digit = (int) mantissa;
+ mantissa -= digit;
*p++ = '0' + digit;
- if ((flags & FLAG_ALT) || arg > 0.0)
+ if ((flags & FLAG_ALT)
+ || mantissa > 0.0 || precision > 0)
{
- *p++ = '.';
+ *p++ = decimal_point_char ();
/* This loop terminates because we assume
that FLT_RADIX is a power of 2. */
- while (arg > 0.0)
+ while (mantissa > 0.0)
{
- arg *= 16.0;
- digit = (int) arg;
- arg -= digit;
+ mantissa *= 16.0;
+ digit = (int) mantissa;
+ mantissa -= digit;
*p++ = digit
+ (digit < 10
? '0'
# if WIDE_CHAR_VERSION
{
static const wchar_t decimal_format[] =
- { '%', 'd', '\0' };
+ { '%', '+', 'd', '\0' };
SNPRINTF (p, 6 + 1, decimal_format, exponent);
}
# else
- sprintf (p, "%d", exponent);
+ sprintf (p, "%+d", exponent);
# endif
while (*p != '\0')
p++;
break;
case 'f': case 'F':
-# if HAVE_LONG_DOUBLE
if (type == TYPE_LONGDOUBLE)
tmp_length =
(unsigned int) (LDBL_MAX_EXP
+ 1 /* turn floor into ceil */
+ 10; /* sign, decimal point etc. */
else
-# endif
tmp_length =
(unsigned int) (DBL_MAX_EXP
* 0.30103 /* binary -> decimal */
break;
case 'a': case 'A':
-# if HAVE_LONG_DOUBLE
if (type == TYPE_LONGDOUBLE)
tmp_length =
(unsigned int) (LDBL_DIG
)
+ 1; /* turn floor into ceil */
else
-# endif
tmp_length =
(unsigned int) (DBL_DIG
* 0.831 /* decimal -> hexadecimal */
#endif
*p++ = 'l';
break;
-#if HAVE_LONG_DOUBLE
case TYPE_LONGDOUBLE:
*p++ = 'L';
break;
-#endif
default:
break;
}
- *p = dp->conversion;
+#if NEED_PRINTF_DIRECTIVE_F
+ if (dp->conversion == 'F')
+ *p = 'f';
+ else
+#endif
+ *p = dp->conversion;
#if USE_SNPRINTF
p[1] = '%';
p[2] = 'n';
retcount = 0;
#if USE_SNPRINTF
+ /* SNPRINTF can fail if maxlen > INT_MAX. */
+ if (maxlen > INT_MAX)
+ goto overflow;
# define SNPRINTF_BUF(arg) \
switch (prefix_count) \
{ \
SNPRINTF_BUF (arg);
}
break;
-#if HAVE_LONG_DOUBLE
case TYPE_LONGDOUBLE:
{
long double arg = a.arg[dp->arg_index].a.a_longdouble;
SNPRINTF_BUF (arg);
}
break;
-#endif
case TYPE_CHAR:
{
int arg = a.arg[dp->arg_index].a.a_char;
free (tmp);
#endif
+#if NEED_PRINTF_DIRECTIVE_F
+ if (dp->conversion == 'F')
+ {
+ /* Convert the %f result to upper case for %F. */
+ CHAR_T *rp = result + length;
+ size_t rc;
+ for (rc = count; rc > 0; rc--, rp++)
+ if (*rp >= 'a' && *rp <= 'z')
+ *rp = *rp - 'a' + 'A';
+ }
+#endif
+
length += count;
break;
}
not have this limitation. */
return result;
+ overflow:
+ if (!(result == resultbuf || result == NULL))
+ free (result);
+ if (buf_malloced != NULL)
+ free (buf_malloced);
+ CLEANUP ();
+ errno = EOVERFLOW;
+ return NULL;
+
out_of_memory:
if (!(result == resultbuf || result == NULL))
free (result);
projects / gnulib.git / blobdiff