libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix vprintf and vfscanf for GCC PR 14577

This commit is contained in:
Jon Beniston 2018-02-01 09:06:00 +00:00 committed by Corinna Vinschen
parent 1658a57715
commit b8272e3b8d
2 changed files with 24 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
newlib/libc/stdio/nano-vfprintf.c
View File

@ -168,16 +168,6 @@ static char *rcsid = "$Id$";
#include "vfieeefp.h" #include "vfieeefp.h"
#include "nano-vfprintf_local.h" #include "nano-vfprintf_local.h"
/* GCC PR 14577 at https://gcc.gnu.org/bugzilla/show_bug.cgi?id=14557 */
#if __STDC_VERSION__ >= 201112L
#define va_ptr(ap) _Generic(&(ap), va_list *: &(ap), default: (va_list *)(ap))
#elif __GNUC__ >= 4
#define va_ptr(ap) __builtin_choose_expr(__builtin_types_compatible_p(__typeof__(&(ap)), va_list *), &(ap), (va_list *)(ap))
#else
#define va_ptr(ap) (sizeof(ap) == sizeof(va_list) ? (va_list *)&(ap) : (va_list *)(ap))
#endif
/* The __ssputs_r function is shared between all versions of vfprintf /* The __ssputs_r function is shared between all versions of vfprintf
and vfwprintf. */ and vfwprintf. */
#ifdef STRING_ONLY #ifdef STRING_ONLY
@ -485,6 +475,7 @@ _VFPRINTF_R (struct _reent *data,
register char *cp; /* Handy char pointer (short term usage). */ register char *cp; /* Handy char pointer (short term usage). */
const char *flag_chars; const char *flag_chars;
struct _prt_data_t prt_data; /* All data for decoding format string. */ struct _prt_data_t prt_data; /* All data for decoding format string. */
va_list ap_copy;
/* Output function pointer. */ /* Output function pointer. */
int (*pfunc)(struct _reent *, FILE *, const char *, size_t len); int (*pfunc)(struct _reent *, FILE *, const char *, size_t len);
@ -522,6 +513,9 @@ _VFPRINTF_R (struct _reent *data,
prt_data.blank = ' '; prt_data.blank = ' ';
prt_data.zero = '0'; prt_data.zero = '0';
/* GCC PR 14577 at https://gcc.gnu.org/bugzilla/show_bug.cgi?id=14557 */
va_copy (ap_copy, ap);
/* Scan the format for conversions (`%' character). */ /* Scan the format for conversions (`%' character). */
for (;;) for (;;)
{ {
@ -577,7 +571,7 @@ _VFPRINTF_R (struct _reent *data,
* -- ANSI X3J11 * -- ANSI X3J11
* They don't exclude field widths read from args. * They don't exclude field widths read from args.
*/ */
prt_data.width = GET_ARG (n, ap, int); prt_data.width = GET_ARG (n, ap_copy, int);
if (prt_data.width < 0) if (prt_data.width < 0)
{ {
prt_data.width = -prt_data.width; prt_data.width = -prt_data.width;
@ -598,7 +592,7 @@ _VFPRINTF_R (struct _reent *data,
if (*fmt == '*') if (*fmt == '*')
{ {
fmt++; fmt++;
prt_data.prec = GET_ARG (n, ap, int); prt_data.prec = GET_ARG (n, ap_copy, int);
if (prt_data.prec < 0) if (prt_data.prec < 0)
prt_data.prec = -1; prt_data.prec = -1;
} }
@ -630,18 +624,16 @@ _VFPRINTF_R (struct _reent *data,
if (_printf_float == NULL) if (_printf_float == NULL)
{ {
if (prt_data.flags & LONGDBL) if (prt_data.flags & LONGDBL)
GET_ARG (N, ap, _LONG_DOUBLE); GET_ARG (N, ap_copy, _LONG_DOUBLE);
else else
GET_ARG (N, ap, double); GET_ARG (N, ap_copy, double);
} }
else else
{ n = _printf_float (data, &prt_data, fp, pfunc, &ap_copy);
n = _printf_float (data, &prt_data, fp, pfunc, va_ptr(ap));
}
} }
else else
#endif #endif
n = _printf_i (data, &prt_data, fp, pfunc, va_ptr(ap)); n = _printf_i (data, &prt_data, fp, pfunc, &ap_copy);
if (n == -1) if (n == -1)
goto error; goto error;
@ -654,6 +646,7 @@ error:
#ifndef STRING_ONLY #ifndef STRING_ONLY
_newlib_flockfile_end (fp); _newlib_flockfile_end (fp);
#endif #endif
va_end (ap_copy);
return (__sferror (fp) ? EOF : prt_data.ret); return (__sferror (fp) ? EOF : prt_data.ret);
} }

28
newlib/libc/stdio/nano-vfscanf.c
View File

@ -119,15 +119,6 @@ Supporting OS subroutines required:
#include "../stdlib/local.h" #include "../stdlib/local.h"
#include "nano-vfscanf_local.h" #include "nano-vfscanf_local.h"
/* GCC PR 14577 at https://gcc.gnu.org/bugzilla/show_bug.cgi?id=14557 */
#if __STDC_VERSION__ >= 201112L
#define va_ptr(ap) _Generic(&(ap), va_list *: &(ap), default: (va_list *)(ap))
#elif __GNUC__ >= 4
#define va_ptr(ap) __builtin_choose_expr(__builtin_types_compatible_p(__typeof__(&(ap)), va_list *), &(ap), (va_list *)(ap))
#else
#define va_ptr(ap) (sizeof(ap) == sizeof(va_list) ? (va_list *)&(ap) : (va_list *)(ap))
#endif
#define VFSCANF vfscanf #define VFSCANF vfscanf
#define _VFSCANF_R _vfscanf_r #define _VFSCANF_R _vfscanf_r
#define __SVFSCANF __svfscanf #define __SVFSCANF __svfscanf
@ -272,6 +263,7 @@ __SVFSCANF_R (struct _reent *rptr,
register int c; /* Character from format, or conversion. */ register int c; /* Character from format, or conversion. */
register char *p; /* Points into all kinds of strings. */ register char *p; /* Points into all kinds of strings. */
char ccltab[256]; /* Character class table for %[...]. */ char ccltab[256]; /* Character class table for %[...]. */
va_list ap_copy;
int ret; int ret;
char *cp; char *cp;
@ -287,6 +279,9 @@ __SVFSCANF_R (struct _reent *rptr,
scan_data.pfn_ungetc = _ungetc_r; scan_data.pfn_ungetc = _ungetc_r;
scan_data.pfn_refill = __srefill_r; scan_data.pfn_refill = __srefill_r;
/* GCC PR 14577 at https://gcc.gnu.org/bugzilla/show_bug.cgi?id=14557 */
va_copy (ap_copy, ap);
for (;;) for (;;)
{ {
if (*fmt == 0) if (*fmt == 0)
@ -379,17 +374,18 @@ __SVFSCANF_R (struct _reent *rptr,
continue; continue;
if (scan_data.flags & SHORT) if (scan_data.flags & SHORT)
*GET_ARG (N, ap, short *) = scan_data.nread; *GET_ARG (N, ap_copy, short *) = scan_data.nread;
else if (scan_data.flags & LONG) else if (scan_data.flags & LONG)
*GET_ARG (N, ap, long *) = scan_data.nread; *GET_ARG (N, ap_copy, long *) = scan_data.nread;
else else
*GET_ARG (N, ap, int *) = scan_data.nread; *GET_ARG (N, ap_copy, int *) = scan_data.nread;
continue; continue;
/* Disgusting backwards compatibility hacks. XXX. */ /* Disgusting backwards compatibility hacks. XXX. */
case '\0': /* compat. */ case '\0': /* compat. */
_newlib_flockfile_exit (fp); _newlib_flockfile_exit (fp);
va_end (ap_copy);
return EOF; return EOF;
#ifdef FLOATING_POINT #ifdef FLOATING_POINT
@ -427,12 +423,12 @@ __SVFSCANF_R (struct _reent *rptr,
} }
ret = 0; ret = 0;
if (scan_data.code < CT_INT) if (scan_data.code < CT_INT)
ret = _scanf_chars (rptr, &scan_data, fp, va_ptr(ap)); ret = _scanf_chars (rptr, &scan_data, fp, &ap_copy);
else if (scan_data.code < CT_FLOAT) else if (scan_data.code < CT_FLOAT)
ret = _scanf_i (rptr, &scan_data, fp, va_ptr(ap)); ret = _scanf_i (rptr, &scan_data, fp, &ap_copy);
#ifdef FLOATING_POINT #ifdef FLOATING_POINT
else if (_scanf_float) else if (_scanf_float)
ret = _scanf_float (rptr, &scan_data, fp, va_ptr(ap)); ret = _scanf_float (rptr, &scan_data, fp, &ap_copy);
#endif #endif
if (ret == MATCH_FAILURE) if (ret == MATCH_FAILURE)
@ -446,12 +442,14 @@ input_failure:
invalid format string), return EOF if no matches yet, else number invalid format string), return EOF if no matches yet, else number
of matches made prior to failure. */ of matches made prior to failure. */
_newlib_flockfile_exit (fp); _newlib_flockfile_exit (fp);
va_end (ap_copy);
return scan_data.nassigned && !(fp->_flags & __SERR) ? scan_data.nassigned return scan_data.nassigned && !(fp->_flags & __SERR) ? scan_data.nassigned
: EOF; : EOF;
match_failure: match_failure:
all_done: all_done:
/* Return number of matches, which can be 0 on match failure. */ /* Return number of matches, which can be 0 on match failure. */
_newlib_flockfile_end (fp); _newlib_flockfile_end (fp);
va_end (ap_copy);
return scan_data.nassigned; return scan_data.nassigned;
} }