qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

2000-09-24  Ulrich Drepper  <drepper@redhat.com>

	* stdio-common/vfprintf.c (process_arg): Handle %hhn.
	Add missing case in va_arg handling for numbers.
	* stdio-common/tst-printf.c (main): Add tests for %hhu and %hhn
	handling.  Reported by Joseph S. Myers <jsm28@cam.ac.uk>.
This commit is contained in:
Ulrich Drepper 2000-09-24 20:54:13 +00:00
parent d2a99fa303
commit b3f7c6654e
3 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2000-09-24 Ulrich Drepper <drepper@redhat.com>
* stdio-common/vfprintf.c (process_arg): Handle %hhn.
Add missing case in va_arg handling for numbers.
* stdio-common/tst-printf.c (main): Add tests for %hhu and %hhn
handling. Reported by Joseph S. Myers <jsm28@cam.ac.uk>.
2000-09-20 Bruno Haible <haible@clisp.cons.org> 2000-09-20 Bruno Haible <haible@clisp.cons.org>
* iconvdata/iso-2022-jp.c (BODY for FROM_LOOP): Reject 0x80. * iconvdata/iso-2022-jp.c (BODY for FROM_LOOP): Reject 0x80.

23
stdio-common/tst-printf.c
View File

@ -20,6 +20,7 @@
#include </usr/include/stdio.h> #include </usr/include/stdio.h>
#define EXIT_SUCCESS 0 #define EXIT_SUCCESS 0
#else #else
#include <limits.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -262,10 +263,32 @@ I am ready for my first lesson today.";
puts (""); puts ("");
} }
printf ("printf (\"%%hhu\", %u) = %hhu\n", UCHAR_MAX + 2, UCHAR_MAX + 2);
printf ("printf (\"%%hu\", %u) = %hu\n", USHRT_MAX + 2, USHRT_MAX + 2);
puts ("--- Should be no further output. ---"); puts ("--- Should be no further output. ---");
rfg1 (); rfg1 ();
rfg2 (); rfg2 ();
{
char bytes[7];
char buf[20];
memset (bytes, '\xff', sizeof bytes);
sprintf (buf, "foo%hhn\n", &bytes[3]);
if (bytes[0] != '\xff' || bytes[1] != '\xff' || bytes[2] != '\xff'
|| bytes[4] != '\xff' || bytes[5] != '\xff' || bytes[6] != '\xff')
{
puts ("%hhn overwrite more bytes");
result = 1;
}
if (bytes[3] != 3)
{
puts ("%hhn wrote incorrect value");
result = 1;
}
}
return result != 0; return result != 0;
} }

10
stdio-common/vfprintf.c
View File

@ -660,6 +660,8 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
{ \ { \
if (is_long_num) \ if (is_long_num) \
number.word = va_arg (ap, unsigned long int); \ number.word = va_arg (ap, unsigned long int); \
else if (is_char) \
number.word = (unsigned char) va_arg (ap, unsigned int); \
else if (!is_short) \ else if (!is_short) \
number.word = va_arg (ap, unsigned int); \ number.word = va_arg (ap, unsigned int); \
else \ else \
@ -935,6 +937,10 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
*(long long int *) va_arg (ap, void *) = done; \ *(long long int *) va_arg (ap, void *) = done; \
else if (is_long_num) \ else if (is_long_num) \
*(long int *) va_arg (ap, void *) = done; \ *(long int *) va_arg (ap, void *) = done; \
else if (is_char) \
*(char *) va_arg (ap, void *) = done; \
else if (is_long_num) \
*(long int *) va_arg (ap, void *) = done; \
else if (!is_short) \ else if (!is_short) \
*(int *) va_arg (ap, void *) = done; \ *(int *) va_arg (ap, void *) = done; \
else \ else \
@ -945,6 +951,10 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
*(long long int *) args_value[fspec->data_arg].pa_pointer = done; \ *(long long int *) args_value[fspec->data_arg].pa_pointer = done; \
else if (is_long_num) \ else if (is_long_num) \
*(long int *) args_value[fspec->data_arg].pa_pointer = done; \ *(long int *) args_value[fspec->data_arg].pa_pointer = done; \
else if (is_long_num) \
*(long int *) args_value[fspec->data_arg].pa_pointer = done; \
else if (is_char) \
*(char *) args_value[fspec->data_arg].pa_pointer = done; \
else if (!is_short) \ else if (!is_short) \
*(int *) args_value[fspec->data_arg].pa_pointer = done; \ *(int *) args_value[fspec->data_arg].pa_pointer = done; \
else \ else \