AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 12:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add __vsyslog_internal, with same flags as __v*printf_internal.

Browse Source 
__nldbl___vsyslog_chk will ultimately want to pass PRINTF_LDBL_IS_DBL
down to __vfprintf_internal *as well as* possibly setting PRINTF_FORTIFY.
To make that possible, we need a __vsyslog_internal that takes the
same flags as printf.  The code in misc/syslog.c does also get a
little simpler.

Tested for powerpc and powerpc64le.
This commit is contained in:
Zack Weinberg 2018-03-07 14:32:02 -05:00 committed by Gabriel F. T. Gomes
parent 698fb75b9f
commit 124fc732c1
4 changed files with 53 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ChangeLog
View File

@ -1,3 +1,23 @@
2018-12-05 Zack Weinberg <zackw@panix.com>
Gabriel F. T. Gomes <gabriel@inconstante.eti.br>
* misc/syslog.c: Include libioP.h, not iolibio.h.
(__vsyslog_internal): New function with the former body of
__vsyslog_chk; takes mode_flags argument same as
__v*printf_internal. Call __vfprintf_internal directly.
(__vsyslog_chk): Now a wrapper around __vsyslog_internal.
Remove libc_hidden_def.
(__syslog, __syslog_chk): Use __vsyslog_internal.
(__vsyslog): Move to just below __syslog. Use __vsyslog_internal.
* include/sys/syslog.h: Add multiple inclusion guard.
Add prototype for __vsyslog_internal.
Remove declaration and libc_hidden_proto for __vsyslog_chk.
* sysdeps/ieee754/ldbl-opt/nldbl-compat.c (__nldbl___vsyslog_chk):
Use __vsyslog_internal.
2018-12-05 Zack Weinberg <zackw@panix.com>
Gabriel F. T. Gomes <gabriel@inconstante.eti.br>

21
include/sys/syslog.h
View File

@ -1,11 +1,16 @@
#ifndef _LIBC_SYS_SYSLOG_H
#define _LIBC_SYS_SYSLOG_H 1
#include <misc/sys/syslog.h>
#ifndef _ISOMAC
libc_hidden_proto (syslog)
libc_hidden_proto (vsyslog)
extern void __vsyslog_chk (int __pri, int __flag, const char *__fmt,
__gnuc_va_list __ap)
__attribute__ ((__format__ (__printf__, 3, 0)));
libc_hidden_proto (__vsyslog_chk)
#endif
libc_hidden_proto (syslog)
/* __vsyslog_internal uses the same mode_flags bits as
__v*printf_internal; see libio/libioP.h. */
extern void __vsyslog_internal (int pri, const char *fmt, __gnuc_va_list ap,
unsigned int mode_flags)
attribute_hidden
__attribute__ ((__format__ (__printf__, 2, 0)));
#endif /* _ISOMAC */
#endif /* syslog.h */

36
misc/syslog.c
View File

@ -53,7 +53,7 @@ static char sccsid[] = "@(#)syslog.c 8.4 (Berkeley) 3/18/94";
#include <stdarg.h>
#include <libio/iolibio.h>
#include <libio/libioP.h>
#include <math_ldbl_opt.h>
#include <kernel-features.h>
@ -114,24 +114,38 @@ __syslog(int pri, const char *fmt, ...)
va_list ap;
va_start(ap, fmt);
__vsyslog_chk(pri, -1, fmt, ap);
__vsyslog_internal(pri, fmt, ap, 0);
va_end(ap);
}
ldbl_hidden_def (__syslog, syslog)
ldbl_strong_alias (__syslog, syslog)
void
__vsyslog(int pri, const char *fmt, va_list ap)
{
__vsyslog_internal(pri, fmt, ap, 0);
}
ldbl_weak_alias (__vsyslog, vsyslog)
void
__syslog_chk(int pri, int flag, const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
__vsyslog_chk(pri, flag, fmt, ap);
__vsyslog_internal(pri, fmt, ap, (flag > 0) ? PRINTF_FORTIFY : 0);
va_end(ap);
}
void
__vsyslog_chk(int pri, int flag, const char *fmt, va_list ap)
{
__vsyslog_internal(pri, fmt, ap, (flag > 0) ? PRINTF_FORTIFY : 0);
}
void
__vsyslog_internal(int pri, const char *fmt, va_list ap,
unsigned int mode_flags)
{
struct tm now_tm;
time_t now;
@ -215,11 +229,8 @@ __vsyslog_chk(int pri, int flag, const char *fmt, va_list ap)
__set_errno (saved_errno);
/* We have the header. Print the user's format into the
buffer. */
if (flag == -1)
vfprintf (f, fmt, ap);
else
__vfprintf_chk (f, flag, fmt, ap);
buffer. */
__vfprintf_internal (f, fmt, ap, mode_flags);
/* Close the memory stream; this will finalize the data
into a malloc'd buffer in BUF. */
@ -316,15 +327,6 @@ __vsyslog_chk(int pri, int flag, const char *fmt, va_list ap)
if (buf != failbuf)
free (buf);
}
libc_hidden_def (__vsyslog_chk)
void
__vsyslog(int pri, const char *fmt, va_list ap)
{
__vsyslog_chk (pri, -1, fmt, ap);
}
ldbl_hidden_def (__vsyslog, vsyslog)
ldbl_weak_alias (__vsyslog, vsyslog)
static struct sockaddr_un SyslogAddr; /* AF_UNIX address of local logger */

2
sysdeps/ieee754/ldbl-opt/nldbl-compat.c
View File

@ -843,7 +843,7 @@ attribute_compat_text_section
__nldbl___vsyslog_chk (int pri, int flag, const char *fmt, va_list ap)
{
set_no_long_double ();
__vsyslog_chk (pri, flag, fmt, ap);
__vsyslog_internal (pri, fmt, ap, (flag > 0) ? PRINTF_FORTIFY : 0);
clear_no_long_double ();
}
libc_hidden_def (__nldbl___vsyslog_chk)