lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-07 06:43:00 +03:00
Code Activity

misc: syslog: Fix indentation and style

Browse Source 
And also clenaup the headers, no semantic changes.
This commit is contained in:
Adhemerval Zanella
2021-10-05 09:15:19 -03:00
parent 096c27684a
commit 0cc15f45c9
1 changed files with 224 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
misc/syslog.c
View File

@@ -31,32 +31,16 @@
static char sccsid[] = "@(#)syslog.c 8.4 (Berkeley) 3/18/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/syslog.h>
#include <sys/uio.h>
#include <sys/un.h>
#include <netdb.h>
#include <errno.h>
#include <fcntl.h>
#include <libio/libioP.h>
#include <paths.h>
#include <stdarg.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdio_ext.h>
#include <string.h>
#include <time.h>
#include <unistd.h>
#include <stdlib.h>
#include <libc-lock.h>
#include <signal.h>
#include <locale.h>
#include <stdarg.h>
#include <libio/libioP.h>
#include <math_ldbl_opt.h>
#include <kernel-features.h>
#include <sys/socket.h>
#include <sys/uio.h>
#include <sys/un.h>
#include <syslog.h>
#define ftell(s) _IO_ftell (s)
@@ -71,9 +55,8 @@ extern char *__progname; /* Program name, from crt0. */
/* Define the lock. */
__libc_lock_define_initialized (static, syslog_lock)
static void openlog_internal(const char *, int, int);
static void closelog_internal(void);
static void openlog_internal (const char *, int, int);
static void closelog_internal (void);
struct cleanup_arg
{
@@ -101,42 +84,42 @@ cancel_handler (void *ptr)
* print message on log file; output is intended for syslogd(8).
*/
void
__syslog(int pri, const char *fmt, ...)
__syslog (int pri, const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
__vsyslog_internal(pri, fmt, ap, 0);
va_end(ap);
va_start (ap, fmt);
__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 (int pri, const char *fmt, va_list ap)
{
__vsyslog_internal(pri, fmt, ap, 0);
__vsyslog_internal (pri, fmt, ap, 0);
}
ldbl_weak_alias (__vsyslog, vsyslog)
void
__syslog_chk(int pri, int flag, const char *fmt, ...)
__syslog_chk (int pri, int flag, const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
__vsyslog_internal(pri, fmt, ap, (flag > 0) ? PRINTF_FORTIFY : 0);
va_end(ap);
va_start (ap, fmt);
__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_chk (int pri, int flag, const char *fmt, va_list ap)
{
__vsyslog_internal(pri, fmt, ap, (flag > 0) ? PRINTF_FORTIFY : 0);
__vsyslog_internal (pri, fmt, ap, (flag > 0) ? PRINTF_FORTIFY : 0);
}
void
__vsyslog_internal(int pri, const char *fmt, va_list ap,
__vsyslog_internal (int pri, const char *fmt, va_list ap,
unsigned int mode_flags)
{
struct tm now_tm;
@@ -151,14 +134,14 @@ __vsyslog_internal(int pri, const char *fmt, va_list ap,
#define INTERNALLOG LOG_ERR|LOG_CONS|LOG_PERROR|LOG_PID
/* Check for invalid bits. */
if (pri & ~(LOG_PRIMASK|LOG_FACMASK)) {
syslog(INTERNALLOG,
"syslog: unknown facility/priority: %x", pri);
pri &= LOG_PRIMASK|LOG_FACMASK;
if (pri & ~(LOG_PRIMASK | LOG_FACMASK))
{
syslog (INTERNALLOG, "syslog: unknown facility/priority: %x", pri);
pri &= LOG_PRIMASK | LOG_FACMASK;
}
/* Prepare for multiple users. We have to take care: most
syscalls we are using are cancellation points. */
/* Prepare for multiple users. We have to take care: most syscalls we are
using are cancellation points. */
struct cleanup_arg clarg;
clarg.buf = NULL;
clarg.oldaction = NULL;
@@ -177,8 +160,8 @@ __vsyslog_internal(int pri, const char *fmt, va_list ap,
f = __open_memstream (&buf, &bufsize);
if (f == NULL)
{
/* We cannot get a stream. There is not much we can do but
emitting an error messages. */
/* We cannot get a stream. There is not much we can do but emitting an
error messages. */
char numbuf[3 * sizeof (pid_t)];
char *nump;
char *endp = __stpcpy (failbuf, "out of memory [");
@@ -203,8 +186,7 @@ __vsyslog_internal(int pri, const char *fmt, va_list ap,
fprintf (f, "<%d>", pri);
now = time_now ();
f->_IO_write_ptr += __strftime_l (f->_IO_write_ptr,
f->_IO_write_end
- f->_IO_write_ptr,
f->_IO_write_end - f->_IO_write_ptr,
"%h %e %T ",
__localtime_r (&now, &now_tm),
_nl_C_locobj_ptr);
@@ -224,12 +206,11 @@ __vsyslog_internal(int pri, const char *fmt, va_list ap,
/* Restore errno for %m format. */
__set_errno (saved_errno);
/* We have the header. Print the user's format into the
buffer. */
/* We have the header. Print the user's format into the buffer. */
__vfprintf_internal (f, fmt, ap, mode_flags);
/* Close the memory stream; this will finalize the data
into a malloc'd buffer in BUF. */
/* Close the memory stream; this will finalize the data into a malloc'd
buffer in BUF. */
fclose (f);
/* Tell the cancellation handler to free this buffer. */
@@ -237,7 +218,8 @@ __vsyslog_internal(int pri, const char *fmt, va_list ap,
}
/* Output to stderr if requested. */
if (LogStat & LOG_PERROR) {
if (LogStat & LOG_PERROR)
{
struct iovec iov[2];
struct iovec *v = iov;
@@ -252,29 +234,28 @@ __vsyslog_internal(int pri, const char *fmt, va_list ap,
}
/* writev is a cancellation point. */
(void)__writev(STDERR_FILENO, iov, v - iov + 1);
__writev (STDERR_FILENO, iov, v - iov + 1);
}
/* Get connected, output the message to the local logger. */
if (!connected)
openlog_internal(NULL, LogStat | LOG_NDELAY, LogFacility);
openlog_internal (NULL, LogStat | LOG_NDELAY, LogFacility);
/* If we have a SOCK_STREAM connection, also send ASCII NUL as
a record terminator. */
/* If we have a SOCK_STREAM connection, also send ASCII NUL as a record
terminator. */
if (LogType == SOCK_STREAM)
++bufsize;
if (!connected || __send(LogFile, buf, bufsize, MSG_NOSIGNAL) < 0)
if (!connected || __send (LogFile, buf, bufsize, MSG_NOSIGNAL) < 0)
{
if (connected)
{
/* Try to reopen the syslog connection. Maybe it went
down. */
/* Try to reopen the syslog connection. Maybe it went down. */
closelog_internal ();
openlog_internal(NULL, LogStat | LOG_NDELAY, LogFacility);
openlog_internal (NULL, LogStat | LOG_NDELAY, LogFacility);
}
if (!connected || __send(LogFile, buf, bufsize, MSG_NOSIGNAL) < 0)
if (!connected || __send (LogFile, buf, bufsize, MSG_NOSIGNAL) < 0)
{
closelog_internal (); /* attempt re-open next time */
/*
@@ -284,16 +265,16 @@ __vsyslog_internal(int pri, const char *fmt, va_list ap,
* syslogd failure.
*/
if (LogStat & LOG_CONS &&
(fd = __open(_PATH_CONSOLE, O_WRONLY|O_NOCTTY|O_CLOEXEC,
0)) >= 0)
(fd = __open (_PATH_CONSOLE, O_WRONLY | O_NOCTTY
| O_CLOEXEC, 0)) >= 0)
{
__dprintf (fd, "%s\r\n", buf + msgoff);
(void)__close(fd);
__close (fd);
}
}
}
out:
out:
/* End of critical section. */
__libc_cleanup_pop (0);
__libc_lock_unlock (syslog_lock);
@@ -310,19 +291,22 @@ static const struct sockaddr_un SyslogAddr =
};
static void
openlog_internal(const char *ident, int logstat, int logfac)
openlog_internal (const char *ident, int logstat, int logfac)
{
if (ident != NULL)
LogTag = ident;
LogStat = logstat;
if ((logfac &~ LOG_FACMASK) == 0)
if ((logfac & ~LOG_FACMASK) == 0)
LogFacility = logfac;
int retry = 0;
while (retry < 2) {
if (LogFile == -1) {
if (LogStat & LOG_NDELAY) {
LogFile = __socket(AF_UNIX, LogType | SOCK_CLOEXEC, 0);
while (retry < 2)
{
if (LogFile == -1)
{
if (LogStat & LOG_NDELAY)
{
LogFile = __socket (AF_UNIX, LogType | SOCK_CLOEXEC, 0);
if (LogFile == -1)
return;
}
@@ -330,23 +314,22 @@ openlog_internal(const char *ident, int logstat, int logfac)
if (LogFile != -1 && !connected)
{
int old_errno = errno;
if (__connect(LogFile, &SyslogAddr, sizeof(SyslogAddr))
== -1)
if (__connect (LogFile, &SyslogAddr, sizeof (SyslogAddr)) == -1)
{
int saved_errno = errno;
int fd = LogFile;
LogFile = -1;
(void)__close(fd);
__close (fd);
__set_errno (old_errno);
if (saved_errno == EPROTOTYPE)
{
/* retry with the other type: */
LogType = (LogType == SOCK_DGRAM
? SOCK_STREAM : SOCK_DGRAM);
LogType = LogType == SOCK_DGRAM ? SOCK_STREAM : SOCK_DGRAM;
++retry;
continue;
}
} else
}
else
connected = true;
}
break;