+2012-05-03 Joseph Myers <joseph@codesourcery.com>
+
+ [BZ #13775]
+ * libio/bits/stdio-ldbl.h [__USE_XOPEN2K8] (__dprintf_chk):
+ Redirect under this condition.
+ [__USE_XOPEN2K8] (__vdprintf_chk): Likewise.
+ [__USE_GNU] (__dprintf_chk): Not under this condition.
+ [__USE_GNU] (__vdprintf_chk): Likewise.
+ * libio/bits/stdio2.h [__USE_XOPEN2K8] (__dprintf_chk): Declare
+ under this condition.
+ [__USE_XOPEN2K8] (__vdprintf_chk): Likewise.
+ [__USE_XOPEN2K8] (dprintf): Define under this condition.
+ [__USE_XOPEN2K8] (vdprintf): Likewise.
+ [__USE_GNU] (__dprintf_chk): Not under this condition.
+ [__USE_GNU] (__vdprintf_chk): Likewise.
+ [__USE_GNU] (dprintf): Likewise.
+ [__USE_GNU] (vdprintf): Likewise.
+
2012-05-03 Roland McGrath <roland@hack.frob.com>
* elf/Makefile (common-generated): Set this instead of generated for
12047, 12340, 13058, 13525, 13526, 13527, 13528, 13529, 13530, 13531,
13532, 13533, 13547, 13551, 13552, 13553, 13555, 13559, 13566, 13583,
13592, 13618, 13637, 13656, 13658, 13673, 13691, 13695, 13704, 13705,
- 13706, 13726, 13738, 13739, 13758, 13760, 13761, 13786, 13792, 13806,
- 13824, 13840, 13841, 13844, 13846, 13851, 13852, 13854, 13871, 13872,
- 13873, 13879, 13883, 13886, 13892, 13895, 13908, 13910, 13911, 13912,
- 13913, 13915, 13916, 13917, 13918, 13919, 13920, 13921, 13924, 13926,
- 13927, 13928, 13938, 13941, 13942, 13963, 13967, 13970, 13973, 14027,
- 14033, 14034, 14040, 14055
+ 13706, 13726, 13738, 13739, 13758, 13760, 13761, 13775, 13786, 13792,
+ 13806, 13824, 13840, 13841, 13844, 13846, 13851, 13852, 13854, 13871,
+ 13872, 13873, 13879, 13883, 13886, 13892, 13895, 13908, 13910, 13911,
+ 13912, 13913, 13915, 13916, 13917, 13918, 13919, 13920, 13921, 13924,
+ 13926, 13927, 13928, 13938, 13941, 13942, 13963, 13967, 13970, 13973,
+ 14027, 14033, 14034, 14040, 14055
* ISO C11 support:
__LDBL_REDIR_DECL (__printf_chk)
__LDBL_REDIR_DECL (__vfprintf_chk)
__LDBL_REDIR_DECL (__vprintf_chk)
+# ifdef __USE_XOPEN2K8
+__LDBL_REDIR_DECL (__dprintf_chk)
+__LDBL_REDIR_DECL (__vdprintf_chk)
+# endif
# ifdef __USE_GNU
__LDBL_REDIR_DECL (__asprintf_chk)
__LDBL_REDIR_DECL (__vasprintf_chk)
-__LDBL_REDIR_DECL (__dprintf_chk)
-__LDBL_REDIR_DECL (__vdprintf_chk)
__LDBL_REDIR_DECL (__obstack_printf_chk)
__LDBL_REDIR_DECL (__obstack_vprintf_chk)
# endif
return __vfprintf_chk (__stream, __USE_FORTIFY_LEVEL - 1, __fmt, __ap);
}
+# ifdef __USE_XOPEN2K8
+extern int __dprintf_chk (int __fd, int __flag, const char *__restrict __fmt,
+ ...) __attribute__ ((__format__ (__printf__, 3, 4)));
+extern int __vdprintf_chk (int __fd, int __flag,
+ const char *__restrict __fmt, _G_va_list __arg)
+ __attribute__ ((__format__ (__printf__, 3, 0)));
+
+# ifdef __va_arg_pack
+__fortify_function int
+dprintf (int __fd, const char *__restrict __fmt, ...)
+{
+ return __dprintf_chk (__fd, __USE_FORTIFY_LEVEL - 1, __fmt,
+ __va_arg_pack ());
+}
+# elif !defined __cplusplus
+# define dprintf(fd, ...) \
+ __dprintf_chk (fd, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
+# endif
+
+__fortify_function int
+vdprintf (int __fd, const char *__restrict __fmt, _G_va_list __ap)
+{
+ return __vdprintf_chk (__fd, __USE_FORTIFY_LEVEL - 1, __fmt, __ap);
+}
+# endif
+
# ifdef __USE_GNU
extern int __asprintf_chk (char **__restrict __ptr, int __flag,
extern int __vasprintf_chk (char **__restrict __ptr, int __flag,
const char *__restrict __fmt, _G_va_list __arg)
__THROW __attribute__ ((__format__ (__printf__, 3, 0))) __wur;
-extern int __dprintf_chk (int __fd, int __flag, const char *__restrict __fmt,
- ...) __attribute__ ((__format__ (__printf__, 3, 4)));
-extern int __vdprintf_chk (int __fd, int __flag,
- const char *__restrict __fmt, _G_va_list __arg)
- __attribute__ ((__format__ (__printf__, 3, 0)));
extern int __obstack_printf_chk (struct obstack *__restrict __obstack,
int __flag, const char *__restrict __format,
...)
}
__fortify_function int
-dprintf (int __fd, const char *__restrict __fmt, ...)
-{
- return __dprintf_chk (__fd, __USE_FORTIFY_LEVEL - 1, __fmt,
- __va_arg_pack ());
-}
-
-__fortify_function int
__NTH (obstack_printf (struct obstack *__restrict __obstack,
const char *__restrict __fmt, ...))
{
__asprintf_chk (ptr, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
# define __asprintf(ptr, ...) \
__asprintf_chk (ptr, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
-# define dprintf(fd, ...) \
- __dprintf_chk (fd, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
# define obstack_printf(obstack, ...) \
__obstack_printf_chk (obstack, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__)
# endif
}
__fortify_function int
-vdprintf (int __fd, const char *__restrict __fmt, _G_va_list __ap)
-{
- return __vdprintf_chk (__fd, __USE_FORTIFY_LEVEL - 1, __fmt, __ap);
-}
-
-__fortify_function int
__NTH (obstack_vprintf (struct obstack *__restrict __obstack,
const char *__restrict __fmt, _G_va_list __ap))
{