From patchwork Wed Mar 7 19:32:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zack Weinberg X-Patchwork-Id: 26228 Received: (qmail 58004 invoked by alias); 7 Mar 2018 19:32:10 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 57889 invoked by uid 89); 7 Mar 2018 19:32:09 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=HContent-Transfer-Encoding:8bit X-HELO: l2mail1.panix.com From: Zack Weinberg To: libc-alpha@sourceware.org Subject: [PATCH 6/9] Add __vsyslog_internal, with same flags as __v*printf_internal. Date: Wed, 7 Mar 2018 14:32:02 -0500 Message-Id: <20180307193205.4751-7-zackw@panix.com> In-Reply-To: <20180307193205.4751-1-zackw@panix.com> References: <20180307193205.4751-1-zackw@panix.com> MIME-Version: 1.0 __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. * 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 libc_hidden_proto for __vsyslog_chk. * sysdeps/ieee754/ldbl-opt/nldbl-compat.c (__nldbl___vsyslog_chk): Use __vsyslog_internal. --- include/sys/syslog.h | 15 +++++++++++--- misc/syslog.c | 35 ++++++++++++++++++--------------- sysdeps/ieee754/ldbl-opt/nldbl-compat.c | 2 +- 3 files changed, 32 insertions(+), 20 deletions(-) diff --git a/include/sys/syslog.h b/include/sys/syslog.h index 3be3189ed1..459ca70746 100644 --- a/include/sys/syslog.h +++ b/include/sys/syslog.h @@ -1,11 +1,20 @@ +#ifndef _LIBC_SYS_SYSLOG_H +#define _LIBC_SYS_SYSLOG_H 1 #include - #ifndef _ISOMAC + libc_hidden_proto (syslog) libc_hidden_proto (vsyslog) +/* __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__ ((__format__ (__printf__, 2, 0))); + 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 + +#endif /* _ISOMAC */ +#endif /* syslog.h */ diff --git a/misc/syslog.c b/misc/syslog.c index 644dbe80ec..eb1283a604 100644 --- a/misc/syslog.c +++ b/misc/syslog.c @@ -53,7 +53,7 @@ static char sccsid[] = "@(#)syslog.c 8.4 (Berkeley) 3/18/94"; #include -#include +#include #include #include @@ -114,24 +114,39 @@ __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_hidden_def (__vsyslog, vsyslog) +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; @@ -216,10 +231,7 @@ __vsyslog_chk(int pri, int flag, const char *fmt, va_list ap) /* 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); + __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 +328,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 */ diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-compat.c b/sysdeps/ieee754/ldbl-opt/nldbl-compat.c index 7e8af80d63..f00eb55eb5 100644 --- a/sysdeps/ieee754/ldbl-opt/nldbl-compat.c +++ b/sysdeps/ieee754/ldbl-opt/nldbl-compat.c @@ -842,7 +842,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)