mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 13:00:06 +00:00
af6f39063b
1997-10-26 18:12 Ulrich Drepper <drepper@cygnus.com> * libio/genops.c: Partial undo of last patch. * libio/stdfiles.c: Likewise. * libio/iofdopen.c: Use _IO_FILE_complete, not _IO_file_plus. * libio/iopopen.c: Likewise. * libio/iovdprintf.c: Likewise. * libio/libio.h: Remove duplicated `;'. * libio/stdio.c: Remove misleading comment. * libio/stdio.h: Declare standard streams as variables. * login/Makefile (distribute): Add README.utmpd. * login/README.utmpd: New file. Provided by Mark M. Kettenis <kettenis@phys.uva.nl>. * manual/job.texi: Document tcgetsid. * manual/pattern.texi: Document globfree. * manual/terminal.texi: Document B38400 ... B460800. * posix/confstr.c: Print "-D_FILE_OFFSET_SIZE=64" for _CS_LFS_CFLAGS. * posix/unistd.h: Add explanation of _POSIX_* constants. * posix/unists.h: Add prototypes for __pread, __pread64, __pwrite and __pwrite64. * sysdeps/generic/pread.c: Define as __pread and make pread weak alias. * sysdeps/generic/pread64.c: Likewise. * sysdeps/generic/pwrite.c: Likewise. * sysdeps/generic/pwrite64.c: Likewise. * sysdeps/posix/pread.c: Likewise. * sysdeps/posix/pwrite.c: Likewise. * sysdeps/posix/pread64.c: New file. * sysdeps/posix/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/Makefile [$(subdir)=posix] (sysdep_routines): Add s_pread64 and s_pwrite64. * sysdeps/unix/sysv/linux/pread.c: New file. * sysdeps/unix/sysv/linux/pread64.c: New file. * sysdeps/unix/sysv/linux/pwrite.c: New file. * sysdeps/unix/sysv/linux/pwrite64.c: New file. * sysdeps/unix/sysv/linux/s_pread64.c: New file. * sysdeps/unix/sysv/linux/s_pwrite64.c: New file. * sysdeps/unix/sysv/linux/syscalls.list: Add pread and pwrite. * sysdeps/unix/sysv/linux/alpha/pread64.c: New (empty) file. * sysdeps/unix/sysv/linux/alpha/pwrite64.c: New (empty) file. * sysdeps/unix/sysv/linux/sparc/sparc64/pread64.c: New (empty) file. * sysdeps/unix/sysv/linux/sparc/sparc64/pwrite64.c: New (empty) file. * sysdeps/unix/sysv/linux/alpha/syscalls.list: Add pread and pwrite with weak aliases for *64 functions. * sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: Likewise. * string/bits/string2.h: Add casts to allow void * arguments. * sysdeps/i386/i486/bits/string.h: Define index and rindex only if __USE_BSD or __USE_XOPEN_EXTENDED. * sysdeps/unix/sysv/linux/bits/socket.h: Add SCM_RIGHTS and other SCM_* constants from kernel header. * termios/termios.h: Add prototype for tcgetsid. 1997-10-26 13:26 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * sunrpc/clnt_perr.c: Add trailing '\0' to strings. * sunrpc/get_myaddr.c: Include rpc/clnt.h for prototypes. * sunrpc/pmap_clnt.c: Use get_myaddress from header file. 1997-10-26 05:26 Ulrich Drepper <drepper@cygnus.com> * configure.in: Punt if any directory mentioned in the enable-add-on parameter does not exist. 1997-10-25 19:25 Ulrich Drepper <drepper@cygnus.com> * termios/Makefile (routines): Add tcgetsid. * termios/tcgetsid.c: New file. Provided by Mark M. Kettenis <kettenis@phys.uva.nl>. 1997-10-25 18:56 Ulrich Drepper <drepper@cygnus.com> * stdlib/stdlib.h: Remove mblen optimization. * stdlib/mblen.c: Rewrite to make sure global state is not changed. Reported by anderson@metrolink.com. 1997-10-19 21:51 Wolfram Gloger <wg@wolfram.dent.med.uni-muenchen.de> * malloc/thread-m.h [_LIBC]: Use new __libc_internal_tsd_{set,get} interface for thread-specific data. 1997-10-25 06:51 Ulrich Drepper <drepper@cygnus.com> * elf/dl-addr.c: Use braces for correct logical grouping. Patch by Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>. 1997-10-18 09:15 Geoff Keating <geoffk@ozemail.com.au> * io/ftwtest-sh: Sometimes /tmp is a symlink to somewhere more convenient; that caused this test to break. * sysdeps/powerpc/dl-machine.h: Fix typo. * sysdeps/powerpc/bits/fenv.h: Don't use floating-point registers when -msoft-float is in effect, because this causes compilation to stop. * sysdeps/powerpc/bits/mathinlines.h: Likewise. * rpm/template: Add description, use RPM flags rather than the ones used to build the spec. Build in a temporary directory, not /. * elf/dl-lookup.c: Don't include _itoa.h, it's not used. * elf/dl-minimal.c: Use _itoa_word rather than _itoa. It seems that _itoa is the only routine that ld.so uses that requires something from libgcc.a on powerpc, so it would be best to avoid it in ld.so. * elf/rtld.c: Likewise. * sysdeps/generic/_strerror.c: Likewise. * stdio-common/_itoa.c: Split out digits strings. * stdio-common/itoa-digits.c: New file. * stdio-common/Makefile: Add itoa-digits. 1997-10-21 Andreas Jaeger <aj@arthur.rhein-neckar.de> * manual/filesys.texi (Scanning Directory Content): Document error case more. * dirent/scandir.c (scandir): Ignore errors from select function. Suggested by urbanw@cs.umu.se (closes PR libc/316). 1997-10-25 06:18 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/sparc/sparc32/socket.S: Corrections. Patch by Erik Troan <ewt@redhat.com>. 1997-10-25 04:00 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/dl-cache.c (_dl_load_cache_lookup): Favour exact matching of version function if both the general (1) and glibc-specific (3) entry are present. 1997-10-22 18:47 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * sunrpc/rpc/clnt.h: Add get_myaddress prototype. * nis/libnsl.map: Fix typo. * nis/nis_call.c: Fix memory leak. 1997-10-22 19:29 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/memcmp.c: Define __P if not defined before. Patch by Jim Meyering <meyering@eng.ascend.com>. 1997-10-21 22:09 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/sys/prctl.h: New file by Richard Gooch <rgooch@atnf.csiro.au>. 1997-10-21 21:50 Ulrich Drepper <drepper@cygnus.com> * misc/syslog.c (vsyslog): Open console with O_NOCTTY. Patch by Zack Weinberg <zack@rabi.phys.columbia.edu>. 1997-10-21 18:07 Ulrich Drepper <drepper@cygnus.com> * posix/wordexp.c: Improve handling of $... expressions. Patch by Tim Waugh <tim@cyberelk.demon.co.uk>. 1997-10-21 16:12 Ulrich Drepper <drepper@cygnus.com> * manual/string.texi: Correct return values of bcopy and bzero. Patch by Matthew Wilcox <willy@odie.barnet.ac.uk>. 1997-10-18 15:03 Philip Blundell <Philip.Blundell@pobox.com> * sysdeps/unix/sysv/linux/bits/socket.h: Correct types of some elements in struct msghdr and struct cmsghdr, to keep in step with the kernel. 1997-10-17 22:29 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/sparc/sparc32/init-first.h: Fix another bug in startup code. Patch by Eric Delaunay <delaunay@lix.polytechnique.fr>. 1997-10-16 20:17 Richard Henderson <rth@cygnus.com> * sysdeps/unix/sysv/linux/sparc/sparc32/socket.S: Dump args to the stack and give the kernel a pointer. Use the sysdep.h macros. 1997-10-17 04:07 Ulrich Drepper <drepper@cygnus.com> * sysdeps/sparc/sparc32/elf/start.S: Calculate argv correctly. Patch by Eric Delaunay <delaunay@lix.polytechnique.fr>. 1997-10-16 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/libm-ieee754/s_nextafterxf.c [!__STDC__]: Correct typo. 1997-10-16 14:50 Ulrich Drepper <drepper@cygnus.com> * manual/pattern.texi: Document globfree. 1997-10-15 21:11 Philip Blundell <Philip.Blundell@pobox.com> * sysdeps/unix/sysv/linux/net/if_packet.h: New file. * sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Add net/if_packet.h. * sysdeps/unix/sysv/linux/net/if_arp.h (ARPHRD_ASH): New type, for 64Mbps ASH. (ARPHRD_ETHER): This is used for 100Mbps networks too. 1997-10-15 Andreas Jaeger <aj@arthur.rhein-neckar.de> * Makerules (install): Use full pathnames for linker script. This is to work around a limitation in `ld' while no better solution is possible. 1997-10-15 Andreas Jaeger <aj@arthur.rhein-neckar.de> * malloc/malloc.c (mmap_chunk): Put inline before static in function definition to avoid compiler warning. (malloc_extend): Likewise. * sysdeps/generic/des_impl.c: Include "des.h" to avoid warning. 1997-10-15 Andreas Jaeger <aj@arthur.rhein-neckar.de> * NEWS: Fix @gnu.ai.mit.edu -> @gnu.org. * README.template: Likewise. * db/makedb.c: Likewise. * elf/ldd.bash.in: Likewise. * elf/ldd.sh.in: Likewise. * intl/locale.alias: Likewise. * login/programs/utmpd.c: Likewise. * libio/stdfiles.c [!_IO_MTSAFE] (DEF_STDFILE): Fix parameter list. 1997-10-14 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Rules: Remove all empty.* files. (shared-only-routines): Correct implementation. 1997-10-14 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/libm-ieee754/s_lrintl.c: Make compilable. * sysdeps/libm-ieee754/s_llrintl.c: Likewise. Optimized. 1997-10-14 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/ldd.bash.in: Only prepend ./ if the file contains no slash at all. * elf/ldd.sh.in: Likewise. 1997-10-14 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/sys/ucontext.h: New file. 1997-10-13 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/fpu/s_scalbln.c: New (empty) file. * sysdeps/m68k/fpu/s_scalblnf.c: New (empty) file. * sysdeps/m68k/fpu/s_scalblnl.c: New (empty) file. * sysdeps/m68k/fpu/s_scalbn.c: Add scalbln alias. * sysdeps/m68k/fpu/s_scalbnf.c: Adapted. * sysdeps/m68k/fpu/s_scalbnl.c: Adapted. * sysdeps/m68k/fpu/s_lrint.c: Add standard skeleton stuff. * sysdeps/m68k/fpu/s_lrintf.c: New file. * sysdeps/m68k/fpu/s_lrintl.c: New file. * sysdeps/m68k/fpu/bits/mathinline.h: Add fma and scalbln. Update lrint and scalbn. (__m81_inline) [__cplusplus]: Define to __inline. * math/bits/mathcalls.h: Remove whitespace before second argument of __MATHDECL. Add note explaining this. 1997-10-13 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * manual/arith.texi (Absolute Value): Spelling fix. 1997-10-13 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * malloc/obstack.h (obstack_empty_p) [!__GNUC__]: Properly parenthesize the macro parameter. * Rules: Remove rules to magically install <subdir>.h headers.
343 lines
9.0 KiB
C
343 lines
9.0 KiB
C
/*
|
|
* Copyright (c) 1983, 1988, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#if defined(LIBC_SCCS) && !defined(lint)
|
|
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 <netdb.h>
|
|
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <paths.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <time.h>
|
|
#include <unistd.h>
|
|
#include <stdlib.h>
|
|
#include <bits/libc-lock.h>
|
|
#include <signal.h>
|
|
|
|
#if __STDC__
|
|
#include <stdarg.h>
|
|
#else
|
|
#include <varargs.h>
|
|
#endif
|
|
|
|
static int LogType = SOCK_DGRAM; /* type of socket connection */
|
|
static int LogFile = -1; /* fd for log */
|
|
static int connected; /* have done connect */
|
|
static int LogStat = 0; /* status bits, set by openlog() */
|
|
static const char *LogTag = NULL; /* string to tag the entry with */
|
|
static int LogFacility = LOG_USER; /* default facility code */
|
|
static int LogMask = 0xff; /* mask of priorities to be logged */
|
|
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) internal_function;
|
|
static void closelog_internal(void);
|
|
static void sigpipe_handler (int);
|
|
#ifdef _LIBC_REENTRANT
|
|
static void cancel_handler (void *);
|
|
#endif
|
|
|
|
/*
|
|
* syslog, vsyslog --
|
|
* print message on log file; output is intended for syslogd(8).
|
|
*/
|
|
void
|
|
#if __STDC__
|
|
syslog(int pri, const char *fmt, ...)
|
|
#else
|
|
syslog(pri, fmt, va_alist)
|
|
int pri;
|
|
char *fmt;
|
|
va_dcl
|
|
#endif
|
|
{
|
|
va_list ap;
|
|
|
|
#if __STDC__
|
|
va_start(ap, fmt);
|
|
#else
|
|
va_start(ap);
|
|
#endif
|
|
vsyslog(pri, fmt, ap);
|
|
va_end(ap);
|
|
}
|
|
|
|
void
|
|
vsyslog(pri, fmt, ap)
|
|
int pri;
|
|
register const char *fmt;
|
|
va_list ap;
|
|
{
|
|
struct tm now_tm;
|
|
time_t now;
|
|
int fd;
|
|
FILE *f;
|
|
char *buf = 0;
|
|
size_t bufsize = 0;
|
|
size_t prioff, msgoff;
|
|
struct sigaction action, oldaction;
|
|
struct sigaction *oldaction_ptr = NULL;
|
|
int sigpipe;
|
|
|
|
#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;
|
|
}
|
|
|
|
/* Check priority against setlogmask values. */
|
|
if (!LOG_MASK(LOG_PRI(pri)) & LogMask)
|
|
return;
|
|
|
|
/* Set default facility if none specified. */
|
|
if ((pri & LOG_FACMASK) == 0)
|
|
pri |= LogFacility;
|
|
|
|
/* Build the message in a memory-buffer stream. */
|
|
f = open_memstream (&buf, &bufsize);
|
|
prioff = fprintf (f, "<%d>", pri);
|
|
(void) time (&now);
|
|
#ifdef USE_IN_LIBIO
|
|
f->_IO_write_ptr += strftime (f->_IO_write_ptr,
|
|
f->_IO_write_end - f->_IO_write_ptr,
|
|
"%h %e %T ",
|
|
__localtime_r (&now, &now_tm));
|
|
#else
|
|
f->__bufp += strftime (f->__bufp, f->__put_limit - f->__bufp,
|
|
"%h %e %T ", __localtime_r (&now, &now_tm));
|
|
#endif
|
|
msgoff = ftell (f);
|
|
if (LogTag == NULL)
|
|
LogTag = __progname;
|
|
if (LogTag != NULL)
|
|
fputs (LogTag, f);
|
|
if (LogStat & LOG_PID)
|
|
fprintf (f, "[%d]", getpid ());
|
|
if (LogTag != NULL)
|
|
putc (':', f), putc (' ', f);
|
|
|
|
/* We have the header. Print the user's format into the buffer. */
|
|
vfprintf (f, fmt, ap);
|
|
|
|
/* Close the memory stream; this will finalize the data
|
|
into a malloc'd buffer in BUF. */
|
|
fclose (f);
|
|
|
|
/* Output to stderr if requested. */
|
|
if (LogStat & LOG_PERROR) {
|
|
struct iovec iov[2];
|
|
register struct iovec *v = iov;
|
|
|
|
v->iov_base = buf + msgoff;
|
|
v->iov_len = bufsize - msgoff;
|
|
++v;
|
|
v->iov_base = (char *) "\n";
|
|
v->iov_len = 1;
|
|
(void)writev(STDERR_FILENO, iov, 2);
|
|
}
|
|
|
|
/* Prepare for multiple users. We have to take care: open and
|
|
write are cancellation points. */
|
|
__libc_cleanup_region_start ((void (*) (void *)) cancel_handler,
|
|
&oldaction_ptr);
|
|
__libc_lock_lock (syslog_lock);
|
|
|
|
/* Prepare for a broken connection. */
|
|
memset (&action, 0, sizeof (action));
|
|
action.sa_handler = sigpipe_handler;
|
|
sigemptyset (&action.sa_mask);
|
|
sigpipe = sigaction (SIGPIPE, &action, &oldaction);
|
|
if (sigpipe == 0)
|
|
oldaction_ptr = &oldaction;
|
|
|
|
/* Get connected, output the message to the local logger. */
|
|
if (!connected)
|
|
openlog_internal(LogTag, LogStat | LOG_NDELAY, 0);
|
|
|
|
/* If we have a SOCK_STREAM connection, also send ASCII NUL as
|
|
a record terminator. */
|
|
if (LogType == SOCK_STREAM)
|
|
++bufsize;
|
|
|
|
if (__send(LogFile, buf, bufsize, 0) < 0)
|
|
{
|
|
closelog_internal (); /* attempt re-open next time */
|
|
/*
|
|
* Output the message to the console; don't worry about blocking,
|
|
* if console blocks everything will. Make sure the error reported
|
|
* is the one from the syslogd failure.
|
|
*/
|
|
if (LogStat & LOG_CONS &&
|
|
(fd = open(_PATH_CONSOLE, O_WRONLY|O_NOCTTY, 0)) >= 0)
|
|
{
|
|
dprintf (fd, "%s\r\n", buf + msgoff);
|
|
(void)close(fd);
|
|
}
|
|
}
|
|
|
|
if (sigpipe == 0)
|
|
sigaction (SIGPIPE, &oldaction, (struct sigaction *) NULL);
|
|
|
|
/* End of critical section. */
|
|
__libc_cleanup_region_end (0);
|
|
__libc_lock_unlock (syslog_lock);
|
|
|
|
free (buf);
|
|
}
|
|
|
|
static struct sockaddr SyslogAddr; /* AF_UNIX address of local logger */
|
|
|
|
static void
|
|
internal_function
|
|
openlog_internal(const char *ident, int logstat, int logfac)
|
|
{
|
|
if (ident != NULL)
|
|
LogTag = ident;
|
|
LogStat = logstat;
|
|
if (logfac != 0 && (logfac &~ LOG_FACMASK) == 0)
|
|
LogFacility = logfac;
|
|
|
|
while (1) {
|
|
if (LogFile == -1) {
|
|
SyslogAddr.sa_family = AF_UNIX;
|
|
(void)strncpy(SyslogAddr.sa_data, _PATH_LOG,
|
|
sizeof(SyslogAddr.sa_data));
|
|
if (LogStat & LOG_NDELAY) {
|
|
if ((LogFile = socket(AF_UNIX, LogType, 0))
|
|
== -1)
|
|
return;
|
|
(void)fcntl(LogFile, F_SETFD, 1);
|
|
}
|
|
}
|
|
if (LogFile != -1 && !connected)
|
|
if (__connect(LogFile, &SyslogAddr, sizeof(SyslogAddr))
|
|
== -1)
|
|
{
|
|
int saved_errno = errno;
|
|
(void)close(LogFile);
|
|
LogFile = -1;
|
|
if (LogType == SOCK_DGRAM
|
|
&& saved_errno == EPROTOTYPE)
|
|
{
|
|
/* retry with next SOCK_STREAM: */
|
|
LogType = SOCK_STREAM;
|
|
continue;
|
|
}
|
|
} else
|
|
connected = 1;
|
|
break;
|
|
}
|
|
}
|
|
|
|
void
|
|
openlog (const char *ident, int logstat, int logfac)
|
|
{
|
|
/* Protect against multiple users. */
|
|
__libc_cleanup_region_start ((void (*) __P ((void *))) __libc_mutex_unlock,
|
|
&syslog_lock);
|
|
__libc_lock_lock (syslog_lock);
|
|
|
|
openlog_internal (ident, logstat, logfac);
|
|
|
|
/* Free the lock. */
|
|
__libc_cleanup_region_end (1);
|
|
}
|
|
|
|
static void
|
|
sigpipe_handler (int signo)
|
|
{
|
|
closelog_internal();
|
|
}
|
|
|
|
static void
|
|
closelog_internal()
|
|
{
|
|
(void)close(LogFile);
|
|
LogFile = -1;
|
|
connected = 0;
|
|
}
|
|
|
|
void
|
|
closelog ()
|
|
{
|
|
/* Protect against multiple users. */
|
|
__libc_cleanup_region_start ((void (*) __P ((void *))) __libc_mutex_unlock,
|
|
&syslog_lock);
|
|
__libc_lock_lock (syslog_lock);
|
|
|
|
closelog_internal ();
|
|
|
|
/* Free the lock. */
|
|
__libc_cleanup_region_end (1);
|
|
}
|
|
|
|
#ifdef _LIBC_REENTRANT
|
|
static void
|
|
cancel_handler (void *ptr)
|
|
{
|
|
/* Restore the old signal handler. */
|
|
struct sigaction *oldaction = *((struct sigaction **) ptr);
|
|
|
|
if (oldaction != (struct sigaction *) NULL)
|
|
sigaction (SIGPIPE, oldaction, (struct sigaction *) NULL);
|
|
|
|
/* Free the lock. */
|
|
__libc_lock_unlock (syslog_lock);
|
|
}
|
|
#endif
|
|
|
|
/* setlogmask -- set the log mask level */
|
|
int
|
|
setlogmask(pmask)
|
|
int pmask;
|
|
{
|
|
int omask;
|
|
|
|
omask = LogMask;
|
|
if (pmask != 0)
|
|
LogMask = pmask;
|
|
return (omask);
|
|
}
|