about summary refs log tree commit diff
path: root/stdio-common
diff options
context:
space:
mode:
Diffstat (limited to 'stdio-common')
-rw-r--r--stdio-common/printf_fphex.c67
-rw-r--r--stdio-common/tstscanf.c12
-rw-r--r--stdio-common/vfscanf.c48
3 files changed, 75 insertions, 52 deletions
diff --git a/stdio-common/printf_fphex.c b/stdio-common/printf_fphex.c
index d442b56099..ac939ec4b4 100644
--- a/stdio-common/printf_fphex.c
+++ b/stdio-common/printf_fphex.c
@@ -217,29 +217,19 @@ __printf_fphex (FILE *fp,
 	 52 bits are representable without rest using hexadecimal
 	 digits we use only the implicit digits for the number before
 	 the decimal point.  */
-      if (sizeof (unsigned long int) > 6)
-	{
-	  unsigned long int num;
+      unsigned long long int num;
 
-	  num = (((unsigned long int) fpnum.dbl.ieee.mantissa0) << 32
-		 | fpnum.dbl.ieee.mantissa1);
+      num = (((unsigned long long int) fpnum.dbl.ieee.mantissa0) << 32
+	     | fpnum.dbl.ieee.mantissa1);
 
-	  zero_mantissa = num == 0;
+      zero_mantissa = num == 0;
 
-	  numstr = _itoa_word (num, numbuf + sizeof numbuf, 16,
-			       info->spec == 'A');
-	}
+      if (sizeof (unsigned long int) > 6)
+	numstr = _itoa_word (num, numbuf + sizeof numbuf, 16,
+			     info->spec == 'A');
       else
-	{
-	  unsigned long long int num;
-
-	  num = (((unsigned long long int) fpnum.dbl.ieee.mantissa0) << 32
-		 | fpnum.dbl.ieee.mantissa1);
-
-	  zero_mantissa = num == 0;
-
-	  numstr = _itoa (num, numbuf + sizeof numbuf, 16, info->spec == 'A');
-	}
+	numstr = _itoa (num, numbuf + sizeof numbuf, 16,
+			info->spec == 'A');
 
       /* Fill with zeroes.  */
       while (numstr > numbuf + (sizeof numbuf - 13))	/* 52 ÷ 4 = 13 */
@@ -249,7 +239,8 @@ __printf_fphex (FILE *fp,
 
       exponent = fpnum.dbl.ieee.exponent;
 
-      if (exponent != 0 && exponent < IEEE754_DOUBLE_BIAS)
+      if ((exponent != 0 && exponent < IEEE754_DOUBLE_BIAS)
+	  || (exponent == 0 && !zero_mantissa))
 	{
 	  expnegative = 1;
 	  exponent = abs (exponent - IEEE754_DOUBLE_BIAS);
@@ -265,31 +256,20 @@ __printf_fphex (FILE *fp,
     {
       /* The "strange" 80 bit format on ix86 and m68k has an explicit
 	 leading digit in the 64 bit mantissa.  */
-      assert (sizeof (long double) == 12);
+      unsigned long long int num;
 
-      if (sizeof (unsigned long int) > 6)
-	{
-	  unsigned long int num;
+      assert (sizeof (long double) == 12);
 
-	  num = (((unsigned long int) fpnum.dbl.ieee.mantissa0) << 32
-		 | fpnum.dbl.ieee.mantissa1);
+      num = (((unsigned long long int) fpnum.ldbl.ieee.mantissa0) << 32
+	     | fpnum.ldbl.ieee.mantissa1);
 
-	  zero_mantissa = num == 0;
+      zero_mantissa = num == 0;
 
-	  numstr = _itoa_word (num, numbuf + sizeof numbuf, 16,
-			       info->spec == 'A');
-	}
+      if (sizeof (unsigned long int) > 6)
+	numstr = _itoa_word (num, numbuf + sizeof numbuf, 16,
+			     info->spec == 'A');
       else
-	{
-	  unsigned long long int num;
-
-	  num = (((unsigned long long int) fpnum.ldbl.ieee.mantissa0) << 32
-		 | fpnum.ldbl.ieee.mantissa1);
-
-	  zero_mantissa = num == 0;
-
-	  numstr = _itoa (num, numbuf + sizeof numbuf, 16, info->spec == 'A');
-	}
+	numstr = _itoa (num, numbuf + sizeof numbuf, 16, info->spec == 'A');
 
       /* We use a full nibble for the leading digit.  */
       leading = *numstr++;
@@ -301,7 +281,8 @@ __printf_fphex (FILE *fp,
       /* We have 3 bits from the mantissa in the leading nibble.  */
       exponent = fpnum.ldbl.ieee.exponent - 3;
 
-      if (exponent != 0 && exponent < IEEE854_LONG_DOUBLE_BIAS)
+      if ((exponent != 0 && exponent < IEEE854_LONG_DOUBLE_BIAS)
+	  || (exponent == 0 && !zero_mantissa))
 	{
 	  expnegative = 1;
 	  exponent = abs (exponent - IEEE854_LONG_DOUBLE_BIAS);
@@ -414,10 +395,10 @@ __printf_fphex (FILE *fp,
   outchar (info->spec == 'A' ? 'X' : 'x');
   outchar (leading);
 
-  if (!zero_mantissa || precision != 0 || info->alt)
+  if (!zero_mantissa || precision > 0 || info->alt)
     outchar (decimal);
 
-  if (!zero_mantissa || precision != 0)
+  if (!zero_mantissa || precision > 0)
     {
       PRINT (numstr, MIN (numend - numstr, precision));
       if (precision > numend - numstr)
diff --git a/stdio-common/tstscanf.c b/stdio-common/tstscanf.c
index 85be441b5b..277d4e1cbf 100644
--- a/stdio-common/tstscanf.c
+++ b/stdio-common/tstscanf.c
@@ -150,5 +150,17 @@ main (int argc, char **argv)
       return 1;
   }
 
+  fputs ("Test 4:\n", out);
+  {
+    double a = 0, b = 0;
+    int res, n;
+
+    res = sscanf ("1234567", "%3lg%3lg%n", &a, &b, &n);
+    printf ("res = %d, a = %g, b = %g, n = %d\n", res, a, b, n);
+
+    if (res != 2 || a != 123 || b != 456 || n != 6)
+      return 1;
+  }
+
   exit(EXIT_SUCCESS);
 }
diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
index 8653088751..106c62b8e0 100644
--- a/stdio-common/vfscanf.c
+++ b/stdio-common/vfscanf.c
@@ -177,10 +177,12 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
   char got_dot, got_e, negative;
   /* If a [...] is a [^...].  */
   char not_in;
+#define exp_char not_in
   /* Base for integral numbers.  */
   int base;
   /* Signedness for integral numbers.  */
   int number_signed;
+#define is_hexa number_signed
   /* Decimal point character.  */
   wchar_t decimal;
   /* The thousands character of the current locale.  */
@@ -889,6 +891,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
 	case 'f':
 	case 'g':
 	case 'G':
+	case 'A':
 	  c = inchar ();
 	  if (c == EOF)
 	    input_error ();
@@ -906,17 +909,39 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
 	  else
 	    negative = 0;
 
+	  if (c == '0' && tolower (c == inchar ()) == 'x')
+	    {
+	      /* It is a number in hexadecimal format.  */
+	      ADDW ('0');
+	      ADDW ('x');
+
+	      is_hexa = 1;
+	      exp_char = 'p';
+
+	      /* Grouping is not allowed.  */
+	      flags &= ~GROUP;
+	      c = inchar ();
+	    }
+	  else
+	    {
+	      /* It not a hexadecimal prefix.  */
+	      is_hexa = 0;
+	      exp_char = 'e';
+	    }
+
 	  got_dot = got_e = 0;
 	  do
 	    {
 	      if (isdigit (c))
 		ADDW (c);
-	      else if (got_e && wp[wpsize - 1] == 'e'
+	      else if (!got_e && is_hexa && isxdigit (c))
+		ADDW (c);
+	      else if (got_e && wp[wpsize - 1] == exp_char
 		       && (c == '-' || c == '+'))
 		ADDW (c);
-	      else if (wpsize > 0 && !got_e && tolower (c) == 'e')
+	      else if (wpsize > 0 && !got_e && tolower (c) == exp_char)
 		{
-		  ADDW ('e');
+		  ADDW (exp_char);
 		  got_e = got_dot = 1;
 		}
 	      else if (c == decimal && !got_dot)
@@ -927,16 +952,21 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
 	      else if ((flags & GROUP) && c == thousands && !got_dot)
 		ADDW (c);
 	      else
-		break;
+		{
+		  /* The last read character is not part of the number
+		     anymore.  */
+		  ungetc (c, s);
+		  break;
+		}
 	      if (width > 0)
 		--width;
 	    }
-	  while (inchar () != EOF && width != 0);
-
-	  /* The last read character is not part of the number anymore.  */
-	  ungetc (c, s);
+	  while (width != 0 && inchar () != EOF);
 
-	  if (wpsize == 0)
+	  /* Have we read any character?  If we try to read a number
+	     in hexadecimal notation and we have read only the `0x'
+	     prefix this is an error.  */
+	  if (wpsize == 0 || (is_hexa && wpsize == 2))
 	    conv_error ();
 
 	  /* Convert the number.  */
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-24 07:36:37 +0000