Index: ossp-pkg/l2/Makefile.in RCS File: /v/ossp/cvs/ossp-pkg/l2/Makefile.in,v rcsdiff -q -kk '-r1.43' '-r1.44' -u '/v/ossp/cvs/ossp-pkg/l2/Makefile.in,v' 2>/dev/null --- Makefile.in 2002/05/29 13:53:01 1.43 +++ Makefile.in 2002/07/09 08:50:12 1.44 @@ -57,7 +57,7 @@ LIBTOOL = ./libtool TARGET = $(TARGET_LIBS) $(TARGET_MANS) $(TARGET_PROGS) -TARGET_LIBS = libl2.la libl2syslog.la +TARGET_LIBS = libl2.la TARGET_MANS = l2tool.1 l2-config.1 l2.3 TARGET_PROGS = l2tool l2_test @@ -137,9 +137,6 @@ libl2.la: $(OBJS) $(LIBTOOL) --mode=link --quiet $(CC) -o libl2.la $(OBJS) -rpath $(libdir) \ -version-info `$(SHTOOL) version -l c -d libtool l2_version.c` -libl2syslog.la: l2_syslog.lo libl2.la - $(LIBTOOL) --mode=link --quiet $(CC) -o libl2syslog.la l2_syslog.lo libl2.la -rpath $(libdir) \ - -version-info `$(SHTOOL) version -l c -d libtool l2_version.c` # build regex library l2_ut_pcre.lo: l2_ut_pcre.tab l2_ut_pcre.c @@ -161,8 +158,6 @@ $(LIBTOOL) --mode=link --quiet $(CC) $(LDFLAGS) -o l2tool l2tool.o libl2.la $(LIBS) l2_test: l2_test.o libl2.la $(LIBTOOL) --mode=link --quiet $(CC) $(LDFLAGS) -o l2_test l2_test.o libl2.la $(LIBS) -l2_test_syslog: l2_test_syslog.o libl2syslog.la libl2.la - $(LIBTOOL) --mode=link --quiet $(CC) $(LDFLAGS) -o l2_test_syslog l2_test_syslog.o libl2syslog.la libl2.la $(LIBS) # build Unix manual pages l2tool.1: l2tool.pod l2_version.c @@ -201,14 +196,11 @@ $(SHTOOL) install -c -m 644 l2.h $(DESTDIR)$(includedir)/l2.h @$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 \ libl2.la $(DESTDIR)$(libdir)/libl2.la - @$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 \ - libl2syslog.la $(DESTDIR)$(libdir)/libl2syslog.la # perform standard uninstallation procedure uninstall: $(MAKE) $(MFLAGS) uninstall-c uninstall-std uninstall-c: - @$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libl2syslog.la @$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libl2.la $(RM) $(DESTDIR)$(includedir)/l2.h $(RM) $(DESTDIR)$(mandir)/man3/l2.3 Index: ossp-pkg/l2/l2_syslog.c RCS File: /v/ossp/cvs/ossp-pkg/l2/Attic/l2_syslog.c,v co -q -kk -p'1.1' '/v/ossp/cvs/ossp-pkg/l2/Attic/l2_syslog.c,v' | diff -u - /dev/null -L'ossp-pkg/l2/l2_syslog.c' 2>/dev/null --- ossp-pkg/l2/l2_syslog.c +++ /dev/null 2025-04-04 17:30:29.000000000 +0200 @@ -1,244 +0,0 @@ -/* -** L2 - OSSP Logging Library -** Copyright (c) 2001-2002 The OSSP Project (http://www.ossp.org/) -** Copyright (c) 2001-2002 Cable & Wireless Deutschland (http://www.cw.com/de/) -** -** This file is part of OSSP L2, a flexible logging library which -** can be found at http://www.ossp.org/pkg/l2/. -** -** Permission to use, copy, modify, and distribute this software for -** any purpose with or without fee is hereby granted, provided that -** the above copyright notice and this permission notice appear in all -** copies. -** -** THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR -** 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. -** -** l2_syslog.c: syslog(3) faked API library -*/ - -/* standard includes we use */ -#include -#include -#include -#include -#include -#include -#include -#include - -/* own includes */ -#include "l2.h" -#include "l2_p.h" - -/* standard include we re-implement */ -#include - -/* default for the dedicated logfile */ -#ifndef LOGFILE -#define LOGFILE "/tmp/syslog" -#endif - -#ifndef LOG_PRIMASK -#define LOG_PRIMASK (LOG_EMERG|LOG_ALERT|LOG_CRIT|LOG_ERR|LOG_WARNING|LOG_NOTICE|LOG_INFO|LOG_DEBUG) -#endif -#ifndef LOG_PRI -#define LOG_PRI(p) ((p) & LOG_PRIMASK) -#endif - -/* log level to string mapping */ -static struct { - int level; - char *string; -} level2string[] = { - { LOG_EMERG, "emerg" }, - { LOG_ALERT, "alert" }, - { LOG_CRIT, "crit" }, - { LOG_ERR, "err" }, - { LOG_WARNING, "warning" }, - { LOG_NOTICE, "notice" }, - { LOG_INFO, "info" }, - { LOG_DEBUG, "debug" }, - { 0, NULL } -}; - -/* internal context structure */ -static struct { - FILE *log; - char *logfile; - const char *ident; - int logopt; - int facility; - int maskpri; -} ctx = { - NULL, LOGFILE, "unknown", 0, LOG_USER, 0xff -}; - -void openlog(const char *ident, int logopt, int facility) -{ - /* remember parameters */ - ctx.ident = ident; - ctx.logopt = logopt; - ctx.facility = facility; - - /* close perhaps still open logfile */ - if (ctx.log != NULL) { - fclose(ctx.log); - ctx.log = NULL; - } - - /* (re-)open new logfile */ - if (!(ctx.logopt & LOG_NDELAY) && ctx.log == NULL) - if ((ctx.log = fopen(ctx.logfile, "a")) == NULL) - return; - return; -} - -void closelog(void) -{ - /* close open logfile*/ - if (ctx.log != NULL) { - fclose(ctx.log); - ctx.log = NULL; - } - return; -} - -int setlogmask(int maskpri) -{ - int omask; - - /* remember the logging mask */ - omask = ctx.maskpri; - if (maskpri != 0) - ctx.maskpri = maskpri; - return omask; -} - -void syslog(int priority, const char *message, ...) -{ - va_list args; - - /* wrap around vsyslog(3) */ - va_start(args, message); - vsyslog(priority, message, args); - va_end(args); - return; -} - -#ifdef HAVE_VSYSLOG_USVALIST -void vsyslog(int priority, const char *fmt, __va_list args) -#else -void vsyslog(int priority, const char *fmt, va_list args) -#endif -{ - time_t now; - int saved_errno; - char buf[2048]; - char *cpBuf; - int nBuf; - char caMsg[2048]; - char *cpMsg; - char *cpFmt; - int i; - char *cpTime; - char *cpLevel; - - /* Check for invalid bits */ - if (priority & ~(LOG_PRIMASK|LOG_FACMASK)) - priority &= (LOG_PRIMASK|LOG_FACMASK); - - /* stop processing if mask disabled this call */ - if (!(LOG_MASK(LOG_PRI(priority)) & ctx.maskpri)) - return; - - /* make sure we have a reasonable default for facility */ - if ((priority & LOG_FACMASK) == 0) - priority |= ctx.facility; - - /* remember errno for optional %m processing below */ - saved_errno = errno; - - /* open logfile now (if it was delayed) */ - if (ctx.log == NULL) - if ((ctx.log = fopen(ctx.logfile, "a")) == NULL) - return; - - /* determine current time */ - time(&now); - cpTime = ctime(&now) + 4; - - /* determine logging level name */ - cpLevel = "unknown"; - for (i = 0; level2string[i].string != NULL; i++) { - if (LOG_PRI(priority) == level2string[i].level) { - cpLevel = level2string[i].string; - break; - } - } - - /* start output generation */ - cpBuf = buf; - sprintf(cpBuf, "%.15s <%s> %s", cpTime, cpLevel, ctx.ident); - nBuf = strlen(cpBuf); - - /* optionally add process id */ - if (ctx.logopt & LOG_PID) { - sprintf(cpBuf+nBuf, "[%d]", getpid()); - nBuf += strlen(cpBuf+nBuf); - } - - /* end prefix */ - strcpy(cpBuf+nBuf, ": "); - nBuf += 2; - - /* optionally expand %m in format string */ - cpFmt = (char *)fmt; - if (strstr(cpFmt, "%m")) { - cpMsg = caMsg; - while (cpFmt[0] != '\0') { - if (cpFmt[0] == '%' && cpFmt[1] == 'm') { - strcpy(cpMsg, strerror(saved_errno)); - cpMsg += strlen(cpMsg); - cpFmt += 2; - } else { - *cpMsg++ = *cpFmt++; - *cpMsg = '\0'; - } - } - cpFmt = caMsg; - } - - /* append message to output buffer */ - vsprintf(cpBuf+nBuf, cpFmt, args); - nBuf += strlen(cpBuf+nBuf); - - /* append newline if still not present */ - if (cpBuf[nBuf-1] != '\n') { - cpBuf[nBuf++] = '\n'; - cpBuf[nBuf] = '\0'; - } - - /* now finally write output buffer to logfile */ - fwrite(cpBuf, nBuf, 1, ctx.log); - fflush(ctx.log); - -#ifdef LOG_PERROR - /* optionally also write output buffer to stderr */ - if (ctx.logopt & LOG_PERROR) - fwrite(cpBuf, nBuf, 1, stderr); -#endif - - return; -} - Index: ossp-pkg/l2/l2_syslog.pod RCS File: /v/ossp/cvs/ossp-pkg/l2/Attic/l2_syslog.pod,v co -q -kk -p'1.2' '/v/ossp/cvs/ossp-pkg/l2/Attic/l2_syslog.pod,v' | diff -u - /dev/null -L'ossp-pkg/l2/l2_syslog.pod' 2>/dev/null --- ossp-pkg/l2/l2_syslog.pod +++ /dev/null 2025-04-04 17:30:29.000000000 +0200 @@ -1,110 +0,0 @@ -## -## L2 - OSSP Logging Library -## Copyright (c) 2001-2002 The OSSP Project (http://www.ossp.org/) -## Copyright (c) 2001-2002 Cable & Wireless Deutschland (http://www.cw.com/de/) -## -## This file is part of OSSP L2, a flexible logging library which -## can be found at http://www.ossp.org/pkg/l2/. -## -## Permission to use, copy, modify, and distribute this software for -## any purpose with or without fee is hereby granted, provided that -## the above copyright notice and this permission notice appear in all -## copies. -## -## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR -## 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. -## -## l2_syslog.pod: L2 syslog replacement manual page -## - -=pod - -=head1 NAME - -B - L2 based syslog(3) replacement - -=head1 VERSION - -OSSP L2 L2_VERSION_STR - -=head1 SYNOPSIS - - LDFLAGS=`l2-config --ldflags` \ - LIBS="-ll2syslog -ll2" \ - ./configure [...] - -=head1 DESCRIPTION - -B is a companion library to B, offering the -syslog(3) API otherwise provided by the Standard C Library (F). -Instead of writing to the syslogd(8) process, it uses the powerful -B logging capabilities. It is a drop-in link-time replacement -which enables any syslog(3) consumer to take advantage of B -by just linking this library in before F. The source code of the -program remains unchanged. - -=head1 FILES - -The B library reads configuration sections located in -one or more files. The path to the directory containing these file(s) -is specified at compile time and is given to the configure script via -C<--with-cfgdir=>I. - -=head1 OPERATION - -If an application calls openlog(3) it passes an identification string -(I) and a logging facility (I) along. B -tries to read the file "CCI". If the file is not -readable, all files matching IC are read. - -In both cases, all data that has been read in is then parsed for -configuration sections. These are identified by "CI" -at the beginning of a line. The I argument is a PCRE (Perl -Compatible Regular Expression) that is matched against a string -concatenated from "I/I" given to the openlog(3) call. - -The configuration section contains an B specification enclosed -in curly brackets where the closing bracket must be placed on the -beginning of a line and terminated with a semicolon. The B -specification may contain $1, $2, ... variables which are filled in from -the I regex parts enclosed in round brackets. - -An B channel tree is build from each matching section and all -found trees are merged together with a "null" channel to form a single -tree. Further calls to syslog(3) will then inject log messages into this -channel tree. - -=head1 EXAMPLE - - ident sendmail/.* { - debug: - prefix(prefix="%%b %%d %%H:%%M:%%S <%%L> $1 [%%P]: ", - timezone=local) - -> file(path="sendmail.debug.log", append=0,perm=432) - }; - - -=head1 OPENPKG - -OpenPKG RPM packages must require the package "l2" in both C and -C and force the packaged application to link against F. - -=head1 SEE ALSO - -syslog(3). - -=head1 AUTHOR - -Thomas Lotterer - -=cut Index: ossp-pkg/l2/l2_test_syslog.c RCS File: /v/ossp/cvs/ossp-pkg/l2/Attic/l2_test_syslog.c,v co -q -kk -p'1.1' '/v/ossp/cvs/ossp-pkg/l2/Attic/l2_test_syslog.c,v' | diff -u - /dev/null -L'ossp-pkg/l2/l2_test_syslog.c' 2>/dev/null --- ossp-pkg/l2/l2_test_syslog.c +++ /dev/null 2025-04-04 17:30:29.000000000 +0200 @@ -1,14 +0,0 @@ - -#include -#include - -int main(int argc, char *argv[]) -{ - syslog(LOG_INFO, "Connection from host %s", "foo.bar.dom"); - openlog("ftpd", LOG_PID|LOG_NDELAY, LOG_FTP); - syslog(LOG_ALERT, "who: internal error 23\n"); - setlogmask(LOG_UPTO(LOG_ERR)); - syslog(LOG_INFO|LOG_LOCAL2, "foobar error: %m"); - return 0; -} -