OSSP CVS Repository

ossp - Check-in [3065]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 3065
Date: 2003-Jan-06 12:41:51 (local)
2003-Jan-06 11:41:51 (UTC)
User:rse
Branch:
Comment: - remove trailing whitespaces - adjust copyright messages - consistently use "OSSP l2" - consistently talk about "Flexible Logging" - use standard OSSP ASCII-art
Tickets:
Inspections:
Files:
ossp-pkg/l2/AUTHORS      1.2 -> 1.3     8 inserted, 1 deleted
ossp-pkg/l2/ChangeLog      1.3 -> 1.4     7 inserted, 0 deleted
ossp-pkg/l2/INSTALL      1.1 -> 1.2     10 inserted, 0 deleted
ossp-pkg/l2/LICENSE      1.4 -> 1.5     6 inserted, 4 deleted
ossp-pkg/l2/Makefile.in      1.46 -> 1.47     7 inserted, 6 deleted
ossp-pkg/l2/NEWS      1.1 -> 1.2     10 inserted, 0 deleted
ossp-pkg/l2/README      1.9 -> 1.10     12 inserted, 11 deleted
ossp-pkg/l2/TODO      1.57 -> 1.58     15 inserted, 7 deleted
ossp-pkg/l2/aclocal.m4      1.13 -> 1.14     10 inserted, 9 deleted
ossp-pkg/l2/configure.ac      1.26 -> 1.27     12 inserted, 10 deleted
ossp-pkg/l2/devtool      1.2 -> 1.3     1 inserted, 1 deleted
ossp-pkg/l2/devtool.conf      1.9 -> 1.10     27 inserted, 1 deleted
ossp-pkg/l2/devtool.func      1.3 -> 1.4     1 inserted, 1 deleted
ossp-pkg/l2/l2-config.in      1.6 -> 1.7     8 inserted, 7 deleted
ossp-pkg/l2/l2-config.pod      1.6 -> 1.7     9 inserted, 8 deleted
ossp-pkg/l2/l2.h.in      1.30 -> 1.31     8 inserted, 7 deleted
ossp-pkg/l2/l2.m4      1.5 -> 1.6     30 inserted, 29 deleted
ossp-pkg/l2/l2.pod      1.13 -> 1.14     25 inserted, 24 deleted
ossp-pkg/l2/l2_ch_buffer.c      1.37 -> 1.38     6 inserted, 5 deleted
ossp-pkg/l2/l2_ch_fd.c      1.15 -> 1.16     8 inserted, 7 deleted
ossp-pkg/l2/l2_ch_file.c      1.24 -> 1.25     11 inserted, 10 deleted
ossp-pkg/l2/l2_ch_filter.c      1.18 -> 1.19     7 inserted, 6 deleted
ossp-pkg/l2/l2_ch_irc.c      1.7 -> 1.8     15 inserted, 14 deleted
ossp-pkg/l2/l2_ch_noop.c      1.4 -> 1.5     5 inserted, 4 deleted
ossp-pkg/l2/l2_ch_null.c      1.12 -> 1.13     5 inserted, 4 deleted
ossp-pkg/l2/l2_ch_pipe.c      1.30 -> 1.31     13 inserted, 12 deleted
ossp-pkg/l2/l2_ch_prefix.c      1.22 -> 1.23     7 inserted, 6 deleted
ossp-pkg/l2/l2_ch_smtp.c      1.10 -> 1.11     16 inserted, 15 deleted
ossp-pkg/l2/l2_ch_socket.c      1.37 -> 1.38     7 inserted, 6 deleted
ossp-pkg/l2/l2_ch_syslog.c      1.32 -> 1.33     12 inserted, 11 deleted
ossp-pkg/l2/l2_channel.c      1.29 -> 1.30     18 inserted, 17 deleted
ossp-pkg/l2/l2_env.c      1.9 -> 1.10     7 inserted, 6 deleted
ossp-pkg/l2/l2_p.h      1.33 -> 1.34     6 inserted, 4 deleted
ossp-pkg/l2/l2_spec.c      1.9 -> 1.10     6 inserted, 5 deleted
ossp-pkg/l2/l2_spec.h      1.3 -> 1.4     30 inserted, 0 deleted
ossp-pkg/l2/l2_spec_parse.y      1.9 -> 1.10     43 inserted, 42 deleted
ossp-pkg/l2/l2_spec_scan.l      1.11 -> 1.12     7 inserted, 6 deleted
ossp-pkg/l2/l2_test.c      1.50 -> 1.51     8 inserted, 7 deleted
ossp-pkg/l2/l2_ut_fmtcb.c      1.6 -> 1.7     18 inserted, 17 deleted
ossp-pkg/l2/l2_ut_format.c      1.7 -> 1.8     43 inserted, 42 deleted
ossp-pkg/l2/l2_ut_format.h      1.3 -> 1.4     12 inserted, 10 deleted
ossp-pkg/l2/l2_ut_level.c      1.8 -> 1.9     7 inserted, 6 deleted
ossp-pkg/l2/l2_ut_param.c      1.9 -> 1.10     14 inserted, 13 deleted
ossp-pkg/l2/l2_ut_pcre.c      1.6 -> 1.7     2 inserted, 2 deleted
ossp-pkg/l2/l2tool.c      1.3 -> 1.4     7 inserted, 6 deleted
ossp-pkg/l2/l2tool.pod      1.3 -> 1.4     8 inserted, 7 deleted

ossp-pkg/l2/AUTHORS 1.2 -> 1.3

--- AUTHORS      2001/09/04 09:12:58     1.2
+++ AUTHORS      2003/01/06 11:41:51     1.3
@@ -1,9 +1,16 @@
+   _        ___  ____ ____  ____    _ ____
+  |_|_ _   / _ \/ ___/ ___||  _ \  | |___ \
+  _|_||_| | | | \___ \___ \| |_) | | | __) |
+ |_||_|_| | |_| |___) |__) |  __/  | |/ __/
+  |_|_|_|  \___/|____/____/|_|     |_|_____|
+
+  OSSP l2 -- Flexible Logging
 
   AUTHORS
   =======
 
   This is a list of authors who have written
-  or edited major parts of the OSSP L2 sources.
+  or edited major parts of the OSSP l2 sources.
 
   Ralf S. Engelschall   <rse@engelschall.com>
   Michael Schloh        <michael.schloh@cw.com>


ossp-pkg/l2/ChangeLog 1.3 -> 1.4

--- ChangeLog    2002/07/30 19:13:00     1.3
+++ ChangeLog    2003/01/06 11:41:51     1.4
@@ -1,3 +1,10 @@
+   _        ___  ____ ____  ____    _ ____
+  |_|_ _   / _ \/ ___/ ___||  _ \  | |___ \
+  _|_||_| | | | \___ \___ \| |_) | | | __) |
+ |_||_|_| | |_| |___) |__) |  __/  | |/ __/
+  |_|_|_|  \___/|____/____/|_|     |_|_____|
+
+  OSSP l2 -- Flexible Logging
 
   ChangeLog
   =========


ossp-pkg/l2/INSTALL 1.1 -> 1.2

--- INSTALL      2001/05/10 19:46:01     1.1
+++ INSTALL      2003/01/06 11:41:51     1.2
@@ -0,0 +1,10 @@
+   _        ___  ____ ____  ____    _ ____
+  |_|_ _   / _ \/ ___/ ___||  _ \  | |___ \
+  _|_||_| | | | \___ \___ \| |_) | | | __) |
+ |_||_|_| | |_| |___) |__) |  __/  | |/ __/
+  |_|_|_|  \___/|____/____/|_|     |_|_____|
+
+  OSSP l2 -- Flexible Logging
+
+  INSTALLATION
+


ossp-pkg/l2/LICENSE 1.4 -> 1.5

--- LICENSE      2002/07/30 19:08:24     1.4
+++ LICENSE      2003/01/06 11:41:51     1.5
@@ -1,9 +1,11 @@
 
-  OSSP l2 - 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/)
+  OSSP l2 - Flexible Logging
 
-  This file is part of OSSP L2, a flexible logging library which
+  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
+
+  This file is part of OSSP l2, a flexible logging library which
   can be found at http://www.ossp.org/pkg/lib/l2/.
 
   Permission to use, copy, modify, and distribute this software for


ossp-pkg/l2/Makefile.in 1.46 -> 1.47

--- Makefile.in  2002/08/21 13:26:27     1.46
+++ Makefile.in  2003/01/06 11:41:51     1.47
@@ -1,9 +1,10 @@
 ##
-##  OSSP l2 - 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/)
+##  OSSP l2 - Flexible Logging
+##  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+##  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+##  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 ##
-##  This file is part of OSSP L2, a flexible logging library which
+##  This file is part of OSSP l2, a flexible logging library which
 ##  can be found at http://www.ossp.org/pkg/lib/l2/.
 ##
 ##  Permission to use, copy, modify, and distribute this software for
@@ -166,11 +167,11 @@
         $(_MANPAGE)
 l2-config.1: l2-config.pod l2_version.c
         BASENAME="l2-config"; SEC=1; \
-        NAME="L2"; ONELINE="Logging Library"; \
+        NAME="L2"; ONELINE="Flexible Logging"; \
         $(_MANPAGE)
 l2.3: l2.pod l2_version.c
         BASENAME="l2"; SEC=3; \
-        NAME="L2"; ONELINE="Logging Library"; \
+        NAME="L2"; ONELINE="Flexible Logging"; \
         $(_MANPAGE)
 
 #   (minimalistic) test suite


ossp-pkg/l2/NEWS 1.1 -> 1.2

--- NEWS 2001/05/10 19:46:01     1.1
+++ NEWS 2003/01/06 11:41:51     1.2
@@ -0,0 +1,10 @@
+   _        ___  ____ ____  ____    _ ____
+  |_|_ _   / _ \/ ___/ ___||  _ \  | |___ \
+  _|_||_| | | | \___ \___ \| |_) | | | __) |
+ |_||_|_| | |_| |___) |__) |  __/  | |/ __/
+  |_|_|_|  \___/|____/____/|_|     |_|_____|
+
+  OSSP l2 -- Flexible Logging
+
+  NEWS
+


ossp-pkg/l2/README 1.9 -> 1.10

--- README       2002/10/11 16:00:48     1.9
+++ README       2003/01/06 11:41:51     1.10
@@ -1,10 +1,10 @@
-   _     ____  
-  | |   |___ \ 
-  | |     __) |
-  | |___ / __/ 
-  |_____|_____|
-               
-  OSSP l2 -- Logging Library
+   _        ___  ____ ____  ____    _ ____
+  |_|_ _   / _ \/ ___/ ___||  _ \  | |___ \
+  _|_||_| | | | \___ \___ \| |_) | | | __) |
+ |_||_|_| | |_| |___) |__) |  __/  | |/ __/
+  |_|_|_|  \___/|____/____/|_|     |_|_____|
+
+  OSSP l2 -- Flexible Logging
   Version 0.9.1 (11-Oct-2002)
 
   ABSTRACT
@@ -14,7 +14,7 @@
   channels, stacked together in a top-down data flow tree structure with
   filtering channels in internal nodes and output channels on the leave
   nodes.
-  
+
   Channel trees can be either constructed manually through lower-level
   API functions or all at once with a single API function controlled by
   a compact syntactical description of the channel tree. For generating
@@ -22,7 +22,7 @@
   extended through callback functions. The data flow inside the channel
   tree is controlled by (eight fixed and nine custom) logging message
   severity levels which are assigned to each individual channel.
-  
+
   Channels are implemented by channel handlers which can be even
   customer supplied for creating own channels which seamlessly integrate
   into the framework. For convinience reasons, OSSP l2 already ships
@@ -32,8 +32,9 @@
 
   COPYRIGHT AND LICENSE
 
-  Copyright (c) 2001-2002 The OSSP Project (http://www.ossp.org/)
-  Copyright (c) 2001-2002 Cable & Wireless Deutschland (http://www.cw.com/de/)
+  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 
   This file is part of OSSP l2, a flexible logging library which
   can be found at http://www.ossp.org/pkg/lib/l2/.


ossp-pkg/l2/TODO 1.57 -> 1.58

--- TODO 2002/07/29 11:45:18     1.57
+++ TODO 2003/01/06 11:41:51     1.58
@@ -1,5 +1,13 @@
-OSSP L2 TODO
-============
+   _        ___  ____ ____  ____    _ ____
+  |_|_ _   / _ \/ ___/ ___||  _ \  | |___ \
+  _|_||_| | | | \___ \___ \| |_) | | | __) |
+ |_||_|_| | |_| |___) |__) |  __/  | |/ __/
+  |_|_|_|  \___/|____/____/|_|     |_|_____|
+
+  OSSP l2 -- Flexible Logging
+
+  TODO
+  ====
 
 Structure of channels and documentation [thl]. It should be possible to
 drag the documentation out of a channel's source code. Everything else
@@ -237,7 +245,7 @@
     from the var-args stack, it fetches a "char *" plus a "size_t" and
     this way allows one to log only a sub-string of a larger string
     without the need for any temporary buffers, etc.
-    
+
 - l2_util_fmt_dump:
     This can be used as "%{type}X" for dumping arbitrary octets. The
     parameter "type" can be either "text" (the default if only "%X"
@@ -261,7 +269,7 @@
 ==================================
 Config-File (OSSP):
 logging {
-    channel 0 null ALL; 
+    channel 0 null ALL;
 
     channel 1 prefix CUSTOM1 { prefix="%Y-%m-%d/%H:%M:%S" };
     channel 2 buffer { size=8k };
@@ -283,11 +291,11 @@
     log stat 1;
 };
 
-Alternative: 
+Alternative:
 log access {
     error: syslog;
-    prefix -> { 
-        buffer(size=4k) -> 
+    prefix -> {
+        buffer(size=4k) ->
             file(path=/path/to/log, mode=0644);
         panic: smtp(host=en1, rcpt=rse@engelschall.com);
     }


ossp-pkg/l2/aclocal.m4 1.13 -> 1.14

--- aclocal.m4   2002/07/30 19:08:24     1.13
+++ aclocal.m4   2003/01/06 11:41:51     1.14
@@ -1,9 +1,10 @@
 dnl ##
-dnl ##  OSSP l2 - Logging Library
-dnl ##  Copyright (c) 2001-2002 The OSSP Project (http://www.ossp.org/)
-dnl ##  Copyright (c) 2001-2002 Cable & Wireless Deutschland (http://www.cw.com/de/)
+dnl ##  OSSP l2 - Flexible Logging
+dnl ##  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+dnl ##  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+dnl ##  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 dnl ##
-dnl ##  This file is part of OSSP L2, a flexible logging library which
+dnl ##  This file is part of OSSP l2, a flexible logging library which
 dnl ##  can be found at http://www.ossp.org/pkg/lib/l2/.
 dnl ##
 dnl ##  Permission to use, copy, modify, and distribute this software for
@@ -53,8 +54,8 @@
 dnl ##  Support for Configuration Headers
 dnl ##
 dnl ##  configure.in:
-dnl ##    AC_HEADLINE(<short-name>, <long-name>, 
-dnl ##                <vers-var>, <vers-file>, 
+dnl ##    AC_HEADLINE(<short-name>, <long-name>,
+dnl ##                <vers-var>, <vers-file>,
 dnl ##                <copyright>)
 dnl ##
 
@@ -76,7 +77,7 @@
     #   find out package version
     $3_STR="`$ac_shtool version -l c -d long $ac_srcdir/$4`"
     AC_SUBST($3_STR)
- 
+
     #   friendly header ;)
     if test ".$enable_headline" != .no; then
         echo "Configuring ${TB}$1${TN} ($2), Version ${TB}${$3_STR}${TN}"
@@ -352,7 +353,7 @@
 if test ".$enable_maintainer" = .yes; then
     bison_version=""
     for prog in bison bison-beta bison-alpha bison-snap; do
-        AC_PATH_PROG($1, $prog, NA) 
+        AC_PATH_PROG($1, $prog, NA)
         if test ".$$1" != .NA; then
             bison_version=`($$1 --version | head -1 | sed -e 's;^[[^0-9]]*\([[0-9]][[0-9.]]*\).*;\1;') 2>/dev/null`
             case "$bison_version" in
@@ -381,7 +382,7 @@
 if test ".$enable_maintainer" = .yes; then
     flex_version=""
     for prog in flex flex-beta flex-alpha flex-snap; do
-        AC_PATH_PROG($1, $prog, NA) 
+        AC_PATH_PROG($1, $prog, NA)
         if test ".$$1" != .NA; then
             flex_version=`($$1 --version | head -1 | sed -e 's;^[[^0-9]]*\([[0-9]][[0-9.]]*\).*;\1;') 2>/dev/null`
             case "$flex_version" in


ossp-pkg/l2/configure.ac 1.26 -> 1.27

--- configure.ac 2003/01/06 11:19:45     1.26
+++ configure.ac 2003/01/06 11:41:51     1.27
@@ -1,9 +1,10 @@
 dnl ##
-dnl ##  OSSP l2 - Logging Library
-dnl ##  Copyright (c) 2001-2002 The OSSP Project (http://www.ossp.org/)
-dnl ##  Copyright (c) 2001-2002 Cable & Wireless Deutschland (http://www.cw.com/de/)
+dnl ##  OSSP l2 - Flexible Logging
+dnl ##  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+dnl ##  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+dnl ##  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 dnl ##
-dnl ##  This file is part of OSSP L2, a flexible logging library which
+dnl ##  This file is part of OSSP l2, a flexible logging library which
 dnl ##  can be found at http://www.ossp.org/pkg/lib/l2/.
 dnl ##
 dnl ##  Permission to use, copy, modify, and distribute this software for
@@ -27,13 +28,14 @@
 dnl ##  configure.in: Autoconf specification
 dnl ##
 
-AC_PREREQ(2.54)
+AC_PREREQ(2.57)
 AC_INIT
 AC_HEADLINE(dnl
-OSSP l2, Logging Library, dnl
+OSSP l2, Flexible Logging, dnl
 L2_VERSION, l2_version.c, dnl
-[Copyright (c) 2001-2002 The OSSP Project (http://www.ossp.org/)
-Copyright (c) 2001-2002 Cable & Wireless Deutschland (http://www.cw.com/de/)])
+[Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+Copyright (c) 2001-2003 Ralf S. Engelschall (rse@engelschall.com)
+Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH])
 AC_PREFIX_DEFAULT(/usr/local)
 AC_PLATFORM(PLATFORM)
 
@@ -50,7 +52,7 @@
 AC_CHECK_LIB(nsl, gethostname)
 if test ".`echo $LIBS | grep nsl`" = . ;then
     AC_CHECK_LIB(nsl, gethostbyname)
-fi  
+fi
 AC_CHECK_LIB(socket, accept)
 
 AC_CHECK_HEADERS(sys/time.h)
@@ -66,7 +68,7 @@
 sinclude(l2_ut_sa.ac)
 SA_CHECK_ALL
 
-AC_CHECK_EXTLIB([Dmalloc], dmalloc, dmalloc_debug, dmalloc.h, 
+AC_CHECK_EXTLIB([Dmalloc], dmalloc, dmalloc_debug, dmalloc.h,
                 [AC_DEFINE(WITH_DMALLOC, 1, [Define to 1 if building with Dmalloc])])
 
 AC_CONFIG_HEADERS(l2_config.h)


ossp-pkg/l2/devtool 1.2 -> 1.3

--- devtool      2002/01/02 17:07:38     1.2
+++ devtool      2003/01/06 11:41:51     1.3
@@ -1,7 +1,7 @@
 #!/bin/sh
 ##
 ##  devtool -- Development Tool
-##  Copyright (c) 2001-2002 Ralf S. Engelschall <rse@engelschall.com> 
+##  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 ##
 
 if [ $# -eq 0 ]; then


ossp-pkg/l2/devtool.conf 1.9 -> 1.10

--- devtool.conf 2003/01/06 11:19:45     1.9
+++ devtool.conf 2003/01/06 11:41:51     1.10
@@ -1,4 +1,30 @@
 ##
+##  OSSP l2 - Flexible Logging
+##  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+##  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+##  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
+##
+##  This file is part of OSSP l2, a flexible logging library which
+##  can be found at http://www.ossp.org/pkg/lib/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.
+##
 ##  devtool.conf -- Development Tool Configuration
 ##
 
@@ -28,7 +54,7 @@
 %version
     ./shtool version -l c -n "OSSP l2" -p l2_ -e l2_version.c
     V=`./shtool version -l c -d long l2_version.c`
-    sed -e "s/Version .*(.*)/Version $V/g" <README >README.n 
+    sed -e "s/Version .*(.*)/Version $V/g" <README >README.n
     mv README.n README
 
 %tag


ossp-pkg/l2/devtool.func 1.3 -> 1.4

--- devtool.func 2002/03/14 15:29:23     1.3
+++ devtool.func 2003/01/06 11:41:51     1.4
@@ -1,6 +1,6 @@
 ##
 ##  devtool.func -- Development Tool Functions
-##  Copyright (c) 2001-2002 Ralf S. Engelschall <rse@engelschall.com> 
+##  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 ##
 
 devtool_require () {


ossp-pkg/l2/l2-config.in 1.6 -> 1.7

--- l2-config.in 2002/07/30 19:08:24     1.6
+++ l2-config.in 2003/01/06 11:41:51     1.7
@@ -1,10 +1,11 @@
 #!/bin/sh
 ##
-##  OSSP l2 - 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/)
+##  OSSP l2 - Flexible Logging
+##  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+##  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+##  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 ##
-##  This file is part of OSSP L2, a flexible logging library which
+##  This file is part of OSSP l2, a flexible logging library which
 ##  can be found at http://www.ossp.org/pkg/lib/l2/.
 ##
 ##  Permission to use, copy, modify, and distribute this software for
@@ -25,10 +26,10 @@
 ##  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 ##  SUCH DAMAGE.
 ##
-##  l2-config.in: L2 library build utility
+##  l2-config.in: library build utility
 ##
 
-DIFS='  
+DIFS=' 
 '
 
 prefix="@prefix@"
@@ -81,7 +82,7 @@
             exit 0
             ;;
         --version|-v)
-            echo "OSSP L2 $l2_version"
+            echo "OSSP l2 $l2_version"
             exit 0
             ;;
         --all)


ossp-pkg/l2/l2-config.pod 1.6 -> 1.7

--- l2-config.pod        2002/07/30 19:08:24     1.6
+++ l2-config.pod        2003/01/06 11:41:51     1.7
@@ -1,9 +1,10 @@
 ##
-##  OSSP l2 - 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/)
+##  OSSP l2 - Flexible Logging
+##  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+##  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+##  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 ##
-##  This file is part of OSSP L2, a flexible logging library which
+##  This file is part of OSSP l2, a flexible logging library which
 ##  can be found at http://www.ossp.org/pkg/lib/l2/.
 ##
 ##  Permission to use, copy, modify, and distribute this software for
@@ -24,18 +25,18 @@
 ##  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 ##  SUCH DAMAGE.
 ##
-##  l2-config.pod: L2 library build utility manual page
+##  l2-config.pod: library build utility manual page
 ##
 
 =pod
 
 =head1 NAME
 
-B<l2-config> - L2 library build utility
+B<l2-config> - OSSP l2 library build utility
 
 =head1 VERSION
 
-OSSP L2 L2_VERSION_STR
+OSSP l2 L2_VERSION_STR
 
 =head1 SYNOPSIS
 
@@ -79,7 +80,7 @@
 =item B<--all>
 
 Forces the output of all flags, that is, including extra flags which are not
-B<L2> specific.
+B<OSSP l2> specific.
 
 =item B<--prefix>
 


ossp-pkg/l2/l2.h.in 1.30 -> 1.31

--- l2.h.in      2002/07/30 19:08:24     1.30
+++ l2.h.in      2003/01/06 11:41:51     1.31
@@ -1,9 +1,10 @@
 /*
-**  OSSP l2 - 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/)
+**  OSSP l2 - Flexible Logging
+**  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+**  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+**  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 **
-**  This file is part of OSSP L2, a flexible logging library which
+**  This file is part of OSSP l2, a flexible logging library which
 **  can be found at http://www.ossp.org/pkg/lib/l2/.
 **
 **  Permission to use, copy, modify, and distribute this software for
@@ -53,7 +54,7 @@
 #include <stdarg.h>
 #include <string.h>
 
-/* counterbalance poor standard environments */ 
+/* counterbalance poor standard environments */
 #ifndef NULL
 #define NULL (void *)0
 #endif
@@ -88,7 +89,7 @@
     L2_LEVEL_ERROR    = (1 << 2),
     L2_LEVEL_WARNING  = (1 << 3),
     L2_LEVEL_NOTICE   = (1 << 4),
-    L2_LEVEL_INFO     = (1 << 5),  
+    L2_LEVEL_INFO     = (1 << 5),
     L2_LEVEL_TRACE    = (1 << 6),
     L2_LEVEL_DEBUG    = (1 << 7)
 } l2_level_t;
@@ -99,7 +100,7 @@
 /* macro describing all levels */
 #define L2_LEVEL_ALL ((1 << (8+9+1))-1)
 
-/* macro describing all levels from highest (PANIC) 
+/* macro describing all levels from highest (PANIC)
    to and including a particular low level */
 #define L2_LEVEL_UPTO(level) (((level)-1)|(level))
 


ossp-pkg/l2/l2.m4 1.5 -> 1.6

--- l2.m4        2002/07/30 19:08:24     1.5
+++ l2.m4        2003/01/06 11:41:51     1.6
@@ -1,9 +1,10 @@
 dnl ##
-dnl ##  OSSP l2 - Logging Library
-dnl ##  Copyright (c) 2001-2002 The OSSP Project (http://www.ossp.org/)
-dnl ##  Copyright (c) 2001-2002 Cable & Wireless Deutschland (http://www.cw.com/de/)
+dnl ##  OSSP l2 - Flexible Logging
+dnl ##  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+dnl ##  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+dnl ##  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 dnl ##
-dnl ##  This file is part of OSSP L2, a flexible logging library which
+dnl ##  This file is part of OSSP l2, a flexible logging library which
 dnl ##  can be found at http://www.ossp.org/pkg/lib/l2/.
 dnl ##
 dnl ##  Permission to use, copy, modify, and distribute this software for
@@ -24,18 +25,18 @@
 dnl ##  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 dnl ##  SUCH DAMAGE.
 dnl ##
-dnl ##  l2.m4: Autoconf macro for locating OSSP L2 from within
+dnl ##  l2.m4: Autoconf macro for locating OSSP l2 from within
 dnl ##         configure.in of third-party software packages
 dnl ##
 
 dnl ##
 dnl ##  Synopsis:
-dnl ##  AC_CHECK_L2([MIN-VERSION [,          # minimum L2 version, e.g. 1.2.0
+dnl ##  AC_CHECK_L2([MIN-VERSION [,          # minimum OSSP l2 version, e.g. 1.2.0
 dnl ##               DEFAULT-WITH-L2 [,      # default value for --with-l2 option
 dnl ##               DEFAULT-WITH-L2-TEST [, # default value for --with-l2-test option
 dnl ##               EXTEND-VARS [,          # whether CFLAGS/LDFLAGS/etc are extended
-dnl ##               ACTION-IF-FOUND [,      # action to perform if L2 was found
-dnl ##               ACTION-IF-NOT-FOUND     # action to perform if L2 was not found
+dnl ##               ACTION-IF-FOUND [,      # action to perform if OSSP l2 was found
+dnl ##               ACTION-IF-NOT-FOUND     # action to perform if OSSP l2 was not found
 dnl ##               ]]]]]])
 dnl ##  Examples:
 dnl ##  AC_CHECK_L2(1.2.0)
@@ -77,15 +78,15 @@
 AC_SUBST(L2_LDFLAGS)
 AC_SUBST(L2_LIBS)
 dnl #   command line options
-AC_MSG_CHECKING(for OSSP L2)
+AC_MSG_CHECKING(for OSSP l2)
 _AC_L2_VERBOSE([])
 AC_ARG_WITH(l2,dnl
-[  --with-l2[=ARG]        Build with OSSP L2 Library  (default=]ifelse([$2],,yes,$2)[)],dnl
+[  --with-l2[=ARG]        Build with OSSP l2 Library  (default=]ifelse([$2],,yes,$2)[)],dnl
 ,dnl
 with_l2="ifelse([$2],,yes,$2)"
 )dnl
 AC_ARG_WITH(l2-test,dnl
-[  --with-l2-test         Perform OSSP L2 Sanity Test (default=]ifelse([$3],,yes,$3)[)],dnl
+[  --with-l2-test         Perform OSSP l2 Sanity Test (default=]ifelse([$3],,yes,$3)[)],dnl
 ,dnl
 with_l2_test="ifelse([$3],,yes,$3)"
 )dnl
@@ -213,18 +214,18 @@
     if test ".$_l2_version" = .; then
         if test ".$with_l2" != .yes; then
              _AC_L2_ERROR([dnl
-             Unable to locate OSSP L2 under $with_l2.
-             Please specify the correct path to either a OSSP L2 installation tree
-             (use --with-l2=DIR if you used --prefix=DIR for installing OSSP L2 in
-             the past) or to a OSSP L2 source tree (use --with-l2=DIR if DIR is a
+             Unable to locate OSSP l2 under $with_l2.
+             Please specify the correct path to either a OSSP l2 installation tree
+             (use --with-l2=DIR if you used --prefix=DIR for installing OSSP l2 in
+             the past) or to a OSSP l2 source tree (use --with-l2=DIR if DIR is a
              path to a l2-X.Y.Z/ directory; but make sure the package is already
              built, i.e., the "configure; make" step was already performed there).])
         else
              _AC_L2_ERROR([dnl
-             Unable to locate OSSP L2 in any system-wide location (see \$PATH).
-             Please specify the correct path to either a OSSP L2 installation tree
-             (use --with-l2=DIR if you used --prefix=DIR for installing OSSP L2 in
-             the past) or to a OSSP L2 source tree (use --with-l2=DIR if DIR is a
+             Unable to locate OSSP l2 in any system-wide location (see \$PATH).
+             Please specify the correct path to either a OSSP l2 installation tree
+             (use --with-l2=DIR if you used --prefix=DIR for installing OSSP l2 in
+             the past) or to a OSSP l2 source tree (use --with-l2=DIR if DIR is a
              path to a l2-X.Y.Z/ directory; but make sure the package is already
              built, i.e., the "configure; make" step was already performed there).])
         fi
@@ -308,9 +309,9 @@
         AC_TRY_CPP(_code1, _ok=yes, _ok=no)
         if test ".$_ok" != .yes; then
             _AC_L2_ERROR([dnl
-            Found OSSP L2 $_l2_version under $_l2_location, but
+            Found OSSP l2 $_l2_version under $_l2_location, but
             was unable to perform a sanity pre-processor check. This means
-            the OSSP L2 header l2.h was not found.
+            the OSSP l2 header l2.h was not found.
             We used the following build environment:
             >> CPP="$CPP"
             >> CPPFLAGS="$CPPFLAGS"
@@ -320,9 +321,9 @@
         AC_TRY_LINK(_code1, _code2, _ok=yes, _ok=no)
         if test ".$_ok" != .yes; then
             _AC_L2_ERROR([dnl
-            Found OSSP L2 $_l2_version under $_l2_location, but
+            Found OSSP l2 $_l2_version under $_l2_location, but
             was unable to perform a sanity linker check. This means
-            the OSSP L2 library libl2.a was not found.
+            the OSSP l2 library libl2.a was not found.
             We used the following build environment:
             >> CC="$CC"
             >> CFLAGS="$CFLAGS"
@@ -335,12 +336,12 @@
         if test ".$_ok" != .yes; then
             if test ".$_ok" = .no; then
                 _AC_L2_ERROR([dnl
-                Found OSSP L2 $_l2_version under $_l2_location, but
+                Found OSSP l2 $_l2_version under $_l2_location, but
                 was unable to perform a sanity execution check. This usually
-                means that the OSSP L2 shared library libl2.so is present
+                means that the OSSP l2 shared library libl2.so is present
                 but \$LD_LIBRARY_PATH is incomplete to execute a L2 test.
                 In this case either disable this test via --without-l2-test,
-                or extend \$LD_LIBRARY_PATH, or build OSSP L2 as a static
+                or extend \$LD_LIBRARY_PATH, or build OSSP l2 as a static
                 library only via its --disable-shared Autoconf option.
                 We used the following build environment:
                 >> CC="$CC"
@@ -350,11 +351,11 @@
                 See config.log for possibly more details.])
             else
                 _AC_L2_ERROR([dnl
-                Found OSSP L2 $_l2_version under $_l2_location, but
+                Found OSSP l2 $_l2_version under $_l2_location, but
                 was unable to perform a sanity run-time check. This usually
-                means that the OSSP L2 library failed to work and possibly
+                means that the OSSP l2 library failed to work and possibly
                 caused a core dump in the test program. In this case it
-                is strongly recommended that you re-install OSSP L2 and this
+                is strongly recommended that you re-install OSSP l2 and this
                 time make sure that it really passes its "make test" procedure.
                 We used the following build environment:
                 >> CC="$CC"


ossp-pkg/l2/l2.pod 1.13 -> 1.14

--- l2.pod       2002/07/30 19:08:24     1.13
+++ l2.pod       2003/01/06 11:41:51     1.14
@@ -1,9 +1,10 @@
 ##
-##  OSSP l2 - 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/)
+##  OSSP l2 - Flexible Logging
+##  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+##  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+##  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 ##
-##  This file is part of OSSP L2, a flexible logging library which
+##  This file is part of OSSP l2, a flexible logging library which
 ##  can be found at http://www.ossp.org/pkg/lib/l2/.
 ##
 ##  Permission to use, copy, modify, and distribute this software for
@@ -23,7 +24,7 @@
 ##  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.pod: Unix manual page for C API
 ##
 
@@ -31,11 +32,11 @@
 
 =head1 NAME
 
-B<L2> - Logging Library
+B<OSSP l2> - Flexible Logging
 
 =head1 VERSION
 
-L2 L2_VERSION_STR
+OSSP l2 L2_VERSION_STR
 
 =head1 SYNOPSIS
 
@@ -43,7 +44,7 @@
 
 =head1 DESCRIPTION
 
-OSSP L2 is a C library providing a very flexible and sophisticated
+B<OSSP l2> is a C library providing a very flexible and sophisticated
 Unix logging facility. It is based on the model of arbitrary number of
 channels, stacked together in a top-down data flow tree structure with
 filtering channels in internal nodes and output channels on the leave
@@ -59,19 +60,19 @@
 
 Channels are implemented by channel handlers which can be even
 customer supplied for creating own channels which seamlessly integrate
-into the framework. For convinience reasons, L2 already ships with
+into the framework. For convinience reasons, B<OSSP l2> already ships with
 pre-implemented filtering (noop, filter, prefix, buffer) and output
 (null, fd, file, pipe, socket, syslog, smtp) channels which already
 cover mostly all use cases of logging.
 
 A language is provided to allow for channel specification and configuration.
 Thus, the channel tree can be constructed either by the API and its ANSI C
-bindings or through the use of this L2 channel definition language. Applying
+bindings or through the use of this B<OSSP l2> channel definition language. Applying
 the API allows fine grained control of the channel tree. Additionally, the
 API allows for a more interactive channel definition. However, using the
 channel definition language to define the channel tree is more convenient,
 and takes less coding effort. The channel definition language is almost
-always sufficient for an application using L2.
+always sufficient for an application using B<OSSP l2>.
 
 =head1 LOGGING LEVELS
 
@@ -88,7 +89,7 @@
 
 =head1 CHANNEL TREE SPECIFICATION
 
-An L2 channel tree can be descriped by a textual specification according
+An B<OSSP l2> channel tree can be descriped by a textual specification according
 to the following Backus-Naur-Form (BNF):
 
  tree               ::= stream
@@ -127,7 +128,7 @@
 
 =head1 FUNCTIONS
 
-The following functions are provided by the B<L2> API:
+The following functions are provided by the B<OSSP l2> API:
 
 =head1 AVAILABLE CHANNEL HANDLERS
 
@@ -153,16 +154,16 @@
 Host name or IP address of the remote Syslog service.
 No default exists, user has to provide value.
 
-=item B<remoteport> (optional, C<int>)     
+=item B<remoteport> (optional, C<int>)
 
 Port number of the remote SMTP service.
 Default is C<514>.
 
-=item B<localhost> (optional, C<char *>)     
+=item B<localhost> (optional, C<char *>)
 
 The name of the local host, I<without> any domain appended.
 
-=item B<facility> (optional, C<char *>)     
+=item B<facility> (optional, C<char *>)
 
 The Syslog facility used for all messages. It has to be one of the
 following: C<kern>, C<user>, C<mail>, C<daemon>, C<auth>, C<syslog>,
@@ -170,12 +171,12 @@
 C<security>, C<console>, C<clock>, C<local0>, C<local1>, C<local2>,
 C<local3>, C<local4>, C<local5>, C<local6>, C<local7>.
 
-=item B<ident> (I<mandatory>, C<char *>)     
+=item B<ident> (I<mandatory>, C<char *>)
 
 Arbitrary string identifying the program.
 There is no default, user has to provide value.
 
-=item B<logpid> (optional, C<int>)     
+=item B<logpid> (optional, C<int>)
 
 Boolean flag whether to add the Process ID (pid)
 to the B<ident> tag in messages. Default is C<0>.
@@ -194,7 +195,7 @@
 
 Attention! Commands that exit on their own and with a success return value will
 not be restarted, however those returning with non-zero exit codes will be
-restarted. L2 reopens closed pipe channels due to faulted command processes in
+restarted. B<OSSP l2> reopens closed pipe channels due to faulted command processes in
 this way. Should such a reconnection be required after a command's successful
 self-termination, l2_channel_open() may be called again on the same pipe channel
 pointer previously used. Stream logging will then write to the pipe channel
@@ -214,12 +215,12 @@
             exit(1); /* failure */
 
 The command passed to the pipe channel handler may also be stopped while still
-using a L2 stream log. If a command process is stopped no action is taken
+using a B<OSSP l2> stream log. If a command process is stopped no action is taken
 until further logging occurs. As soon as the pipe channel handler receives a
 message due to a l2_stream_log operation, it will attempt to restart the
 stopped command process and write to its standard input. If the effort to
 restart the command process fails then the command process is considered
-dead, and L2 will terminate the process and close the channel. A
+dead, and B<OSSP l2> will terminate the process and close the channel. A
 l2_channel_open() will then reopen the pipe channel using configuration
 information previously entered with l2_channel_configure().
 
@@ -229,7 +230,7 @@
 
 =item B<command> (optional, C<char *>)
 
-L2 will execute the command at this user-provided path, and pipe messages to
+B<OSSP l2> will execute the command at this user-provided path, and pipe messages to
 its standard input when l2_stream_log operations are called.
 
 =back
@@ -248,7 +249,7 @@
 
 =item B<progname> (optional, C<char *>)
 
-Arbitrary string identifying the program using B<OSSP L2>.
+Arbitrary string identifying the program using B<OSSP l2>.
 Default is C<NULL> which means no program identification.
 
 =item B<localhost> (optional, C<char *>)
@@ -281,7 +282,7 @@
 Host name or IP address of the remote SMTP service.
 No default exists, user has to provide value.
 
-=item B<port> (optional, C<char *>)     
+=item B<port> (optional, C<char *>)
 
 Port name or number of the remote SMTP service.
 Default is C<smtp> (25).


ossp-pkg/l2/l2_ch_buffer.c 1.37 -> 1.38

--- l2_ch_buffer.c       2002/07/30 19:08:24     1.37
+++ l2_ch_buffer.c       2003/01/06 11:41:51     1.38
@@ -1,9 +1,10 @@
 /*
-**  OSSP l2 - 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/)
+**  OSSP l2 - Flexible Logging
+**  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+**  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+**  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 **
-**  This file is part of OSSP L2, a flexible logging library which
+**  This file is part of OSSP l2, a flexible logging library which
 **  can be found at http://www.ossp.org/pkg/lib/l2/.
 **
 **  Permission to use, copy, modify, and distribute this software for
@@ -172,7 +173,7 @@
     if (cfg->bufinterval == -1L) /* -1 is reserved by L2 */
         return L2_ERR_ARG;       /* set_alarm() uses it  */
 
-    if (cfg->bufsize < 0) 
+    if (cfg->bufsize < 0)
         return L2_ERR_ARG;
 
     return rv;


ossp-pkg/l2/l2_ch_fd.c 1.15 -> 1.16

--- l2_ch_fd.c   2002/07/31 07:39:21     1.15
+++ l2_ch_fd.c   2003/01/06 11:41:51     1.16
@@ -1,9 +1,10 @@
 /*
-**  OSSP l2 - 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/)
+**  OSSP l2 - Flexible Logging
+**  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+**  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+**  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 **
-**  This file is part of OSSP L2, a flexible logging library which
+**  This file is part of OSSP l2, a flexible logging library which
 **  can be found at http://www.ossp.org/pkg/lib/l2/.
 **
 **  Permission to use, copy, modify, and distribute this software for
@@ -45,7 +46,7 @@
         return L2_ERR_MEM;
 
     /* initialize configuration with reasonable defaults */
-    cfg->fd = -1; 
+    cfg->fd = -1;
 
     /* link private channel configuration into channel context */
     ctx->vp = cfg;
@@ -57,7 +58,7 @@
 static l2_result_t hook_configure(l2_context_t *ctx, l2_channel_t *ch, const char *fmt, va_list ap)
 {
     l2_ch_fd_t *cfg;
-    l2_param_t pa[1]; 
+    l2_param_t pa[1];
     l2_result_t rv;
     l2_env_t *env;
 
@@ -136,7 +137,7 @@
 static l2_result_t hook_destroy(l2_context_t *ctx, l2_channel_t *ch)
 {
     /* parameter checks */
-    if (ctx->vp == NULL) 
+    if (ctx->vp == NULL)
         return L2_ERR_ARG;
 
     /* destroy channel configuration */


ossp-pkg/l2/l2_ch_file.c 1.24 -> 1.25

--- l2_ch_file.c 2002/07/30 19:08:24     1.24
+++ l2_ch_file.c 2003/01/06 11:41:51     1.25
@@ -1,9 +1,10 @@
 /*
-**  OSSP l2 - 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/)
+**  OSSP l2 - Flexible Logging
+**  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+**  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+**  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 **
-**  This file is part of OSSP L2, a flexible logging library which
+**  This file is part of OSSP l2, a flexible logging library which
 **  can be found at http://www.ossp.org/pkg/lib/l2/.
 **
 **  Permission to use, copy, modify, and distribute this software for
@@ -51,10 +52,10 @@
         return L2_ERR_ARG;
 
     /* initialize configuration with reasonable defaults */
-    cfg->fd     = -1; 
-    cfg->path   = NULL; 
-    cfg->append = TRUE; 
-    cfg->perm   = (S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); 
+    cfg->fd     = -1;
+    cfg->path   = NULL;
+    cfg->append = TRUE;
+    cfg->perm   = (S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
 
     /* link private channel configuration into channel context */
     ctx->vp = cfg;
@@ -66,7 +67,7 @@
 static l2_result_t hook_configure(l2_context_t *ctx, l2_channel_t *ch, const char *fmt, va_list ap)
 {
     l2_ch_file_t *cfg = (l2_ch_file_t *)ctx->vp;
-    l2_param_t pa[4]; 
+    l2_param_t pa[4];
     l2_result_t rv;
     l2_env_t *env;
 
@@ -112,7 +113,7 @@
                               l2_level_t level, const char *buf, size_t buf_size)
 {
     l2_ch_file_t *cfg = (l2_ch_file_t *)ctx->vp;
-    
+
     /* write message to channel file */
     if (write(cfg->fd, buf, buf_size) == -1)
         return L2_ERR_SYS;


ossp-pkg/l2/l2_ch_filter.c 1.18 -> 1.19

--- l2_ch_filter.c       2002/07/30 19:08:24     1.18
+++ l2_ch_filter.c       2003/01/06 11:41:51     1.19
@@ -1,9 +1,10 @@
 /*
-**  OSSP l2 - 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/)
+**  OSSP l2 - Flexible Logging
+**  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+**  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+**  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 **
-**  This file is part of OSSP L2, a flexible logging library which
+**  This file is part of OSSP l2, a flexible logging library which
 **  can be found at http://www.ossp.org/pkg/lib/l2/.
 **
 **  Permission to use, copy, modify, and distribute this software for
@@ -66,7 +67,7 @@
 {
     l2_ch_filter_t *cfg = (l2_ch_filter_t *)ctx->vp;
     l2_env_t *env;
-    l2_param_t pa[4]; 
+    l2_param_t pa[4];
     l2_result_t rv;
     const char *szError;
     int nErrorOffset;
@@ -81,7 +82,7 @@
     if ((rv = l2_util_setparams(env, pa, fmt, ap)) != L2_OK)
         return rv;
 
-    /* translate regular expression into finite state machine */ 
+    /* translate regular expression into finite state machine */
     if (cfg->szRegex != NULL) {
         /* compile regular expression into FSM */
         opt = 0;


ossp-pkg/l2/l2_ch_irc.c 1.7 -> 1.8

--- l2_ch_irc.c  2002/07/30 19:08:24     1.7
+++ l2_ch_irc.c  2003/01/06 11:41:51     1.8
@@ -1,9 +1,10 @@
 /*
-**  OSSP l2 - 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/)
+**  OSSP l2 - Flexible Logging
+**  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+**  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+**  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 **
-**  This file is part of OSSP L2, a flexible logging library which
+**  This file is part of OSSP l2, a flexible logging library which
 **  can be found at http://www.ossp.org/pkg/lib/l2/.
 **
 **  Permission to use, copy, modify, and distribute this software for
@@ -49,7 +50,7 @@
     int   bJoin;
     char *cpHost;
     char *cpPort;
-    long nTimeout; 
+    long nTimeout;
     sa_addr_t *saaServer;
     sa_t *saServer;
 } l2_ch_irc_t;
@@ -97,7 +98,7 @@
 static l2_result_t hook_configure(l2_context_t *ctx, l2_channel_t *ch, const char *fmt, va_list ap)
 {
     l2_ch_irc_t *cfg = (l2_ch_irc_t *)ctx->vp;
-    l2_param_t pa[12]; 
+    l2_param_t pa[12];
     l2_result_t rv;
     l2_env_t *env;
 
@@ -133,7 +134,7 @@
     /* create socket address */
     if ((rc = sa_addr_create(&cfg->saaServer)) != SA_OK)
         return (rc == SA_ERR_SYS ? L2_ERR_SYS : L2_ERR_INT);
-    if ((rc = sa_addr_u2a(cfg->saaServer, "inet://%s:%s", 
+    if ((rc = sa_addr_u2a(cfg->saaServer, "inet://%s:%s",
                           cfg->cpHost, cfg->cpPort)) != SA_OK)
         return (rc == SA_ERR_SYS ? L2_ERR_SYS : L2_ERR_INT);
 
@@ -163,8 +164,8 @@
     struct tm *tm;
     time_t t;
     char caDate[80];
-    
-    /* 
+
+    /*
      * Sample IRC client transaction for reference:
      * | PASS secret
      * | NICK rse
@@ -176,17 +177,17 @@
      * | :irc.engelschall.com 251 rse :There are 1 users and 0 services on 1 servers
      * | :irc.engelschall.com 254 rse 11 :channels formed
      * | :irc.engelschall.com 255 rse :I have 1 users, 0 services and 0 servers
-     * | :irc.engelschall.com 375 rse :- irc.engelschall.com Message of the Day - 
+     * | :irc.engelschall.com 375 rse :- irc.engelschall.com Message of the Day -
      * | :irc.engelschall.com 372 rse :- 17/10/2001 19:32
      * | :irc.engelschall.com 372 rse :- Welcome to the Engelschall VISP IRC Service.
      * | :irc.engelschall.com 376 rse :End of MOTD command.
      * | :rse MODE rse :+i
      * | JOIN #dev
      * | :rse!~rse@dev10.dev.de.cw.net JOIN :#dev
-     * | :irc.engelschall.com 353 rse = #dev :@rse 
+     * | :irc.engelschall.com 353 rse = #dev :@rse
      * | :irc.engelschall.com 366 rse #dev :End of NAMES list.
      * | PRIVMSG #dev :Sample log message line 1
-     * | PRIVMSG #dev :Sample log message line 2 
+     * | PRIVMSG #dev :Sample log message line 2
      * | PRIVMSG #dev :Sample log message line 3
      * | QUIT
      * | ERROR :Closing Link: rse[~rse@dev10.dev.de.cw.net] (I Quit)
@@ -214,10 +215,10 @@
         sa_writef(sa, "JOIN %s\r\n", cfg->cpChannel);
     sa_writef(sa, "PRIVMSG %s :", cfg->cpChannel);
     if (cfg->cpLocalProg != NULL)
-        sa_writef(sa, "Program %s of user %s on host %s logged at %s:\r\n", 
+        sa_writef(sa, "Program %s of user %s on host %s logged at %s:\r\n",
                    cfg->cpLocalProg, cfg->cpLocalUser, cfg->cpLocalHost, caDate);
     else
-        sa_writef(sa, "A program of user %s on host %s logged at %s:\r\n", 
+        sa_writef(sa, "A program of user %s on host %s logged at %s:\r\n",
                    cfg->cpLocalUser, cfg->cpLocalHost, caDate);
     sa_writef(sa, "PRIVMSG %s :", cfg->cpChannel);
     sa_write(sa, buf, buf_size-1, NULL);


ossp-pkg/l2/l2_ch_noop.c 1.4 -> 1.5

--- l2_ch_noop.c 2002/07/30 19:08:24     1.4
+++ l2_ch_noop.c 2003/01/06 11:41:51     1.5
@@ -1,9 +1,10 @@
 /*
-**  OSSP l2 - 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/)
+**  OSSP l2 - Flexible Logging
+**  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+**  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+**  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 **
-**  This file is part of OSSP L2, a flexible logging library which
+**  This file is part of OSSP l2, a flexible logging library which
 **  can be found at http://www.ossp.org/pkg/lib/l2/.
 **
 **  Permission to use, copy, modify, and distribute this software for


ossp-pkg/l2/l2_ch_null.c 1.12 -> 1.13

--- l2_ch_null.c 2002/07/30 19:08:24     1.12
+++ l2_ch_null.c 2003/01/06 11:41:51     1.13
@@ -1,9 +1,10 @@
 /*
-**  OSSP l2 - 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/)
+**  OSSP l2 - Flexible Logging
+**  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+**  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+**  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 **
-**  This file is part of OSSP L2, a flexible logging library which
+**  This file is part of OSSP l2, a flexible logging library which
 **  can be found at http://www.ossp.org/pkg/lib/l2/.
 **
 **  Permission to use, copy, modify, and distribute this software for


ossp-pkg/l2/l2_ch_pipe.c 1.30 -> 1.31

--- l2_ch_pipe.c 2002/07/30 19:08:24     1.30
+++ l2_ch_pipe.c 2003/01/06 11:41:51     1.31
@@ -1,9 +1,10 @@
 /*
-**  OSSP l2 - 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/)
+**  OSSP l2 - Flexible Logging
+**  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+**  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+**  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 **
-**  This file is part of OSSP L2, a flexible logging library which
+**  This file is part of OSSP l2, a flexible logging library which
 **  can be found at http://www.ossp.org/pkg/lib/l2/.
 **
 **  Permission to use, copy, modify, and distribute this software for
@@ -75,7 +76,7 @@
     else if (sig == SIGPIPE);          /* noop for now                      */
 }
 
-/* 
+/*
  * The lifecycle of the command executed by the pipe channel handler
  * depends on the runtime option selected during configuration. The
  * option 'continuous' describes subsequent behavior which rebuilds an
@@ -152,12 +153,12 @@
 
     /* initialize configuration with reasonable defaults */
     cfg->Pid        = -1;
-    cfg->iWritefail =  0; 
-    cfg->piFd[0]    = -1; 
-    cfg->piFd[1]    = -1; 
-    cfg->iNulldev   = -1; 
-    cfg->iMode      = -1; 
-    cfg->iRtme      = -1; 
+    cfg->iWritefail =  0;
+    cfg->piFd[0]    = -1;
+    cfg->piFd[1]    = -1;
+    cfg->iNulldev   = -1;
+    cfg->iMode      = -1;
+    cfg->iRtme      = -1;
     cfg->szCmdpath  = NULL;
     memset(&cfg->sigchld, 0, sizeof(cfg->sigchld));
     memset(&cfg->sigpipe, 0, sizeof(cfg->sigpipe));
@@ -172,7 +173,7 @@
 static l2_result_t hook_configure(l2_context_t *ctx, l2_channel_t *ch, const char *fmt, va_list ap)
 {
     l2_ch_pipe_t *cfg = (l2_ch_pipe_t *)ctx->vp;
-    l2_param_t pa[4]; 
+    l2_param_t pa[4];
     l2_result_t rv;
     char *szMode = NULL;
     char *szRel  = NULL;


ossp-pkg/l2/l2_ch_prefix.c 1.22 -> 1.23

--- l2_ch_prefix.c       2002/08/06 12:55:06     1.22
+++ l2_ch_prefix.c       2003/01/06 11:41:51     1.23
@@ -1,9 +1,10 @@
 /*
-**  OSSP l2 - 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/)
+**  OSSP l2 - Flexible Logging
+**  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+**  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+**  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 **
-**  This file is part of OSSP L2, a flexible logging library which
+**  This file is part of OSSP l2, a flexible logging library which
 **  can be found at http://www.ossp.org/pkg/lib/l2/.
 **
 **  Permission to use, copy, modify, and distribute this software for
@@ -64,7 +65,7 @@
 static l2_result_t hook_configure(l2_context_t *ctx, l2_channel_t *ch, const char *fmt, va_list ap)
 {
     l2_ch_prefix_t *cfg = (l2_ch_prefix_t *)ctx->vp;
-    l2_param_t pa[3]; 
+    l2_param_t pa[3];
     l2_result_t rv;
     l2_env_t *env;
 
@@ -79,7 +80,7 @@
     if (rv == L2_OK) {
         if (cfg->timezone == NULL)
             return L2_ERR_ARG;
-        if (!(   strcmp(cfg->timezone, "local") == 0 
+        if (!(   strcmp(cfg->timezone, "local") == 0
               || strcmp(cfg->timezone, "utc")   == 0))
             return L2_ERR_ARG;
     }


ossp-pkg/l2/l2_ch_smtp.c 1.10 -> 1.11

--- l2_ch_smtp.c 2002/07/30 19:08:24     1.10
+++ l2_ch_smtp.c 2003/01/06 11:41:51     1.11
@@ -1,9 +1,10 @@
 /*
-**  OSSP l2 - 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/)
+**  OSSP l2 - Flexible Logging
+**  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+**  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+**  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 **
-**  This file is part of OSSP L2, a flexible logging library which
+**  This file is part of OSSP l2, a flexible logging library which
 **  can be found at http://www.ossp.org/pkg/lib/l2/.
 **
 **  Permission to use, copy, modify, and distribute this software for
@@ -46,7 +47,7 @@
     char *cpLocalProg;
     char *cpLocalUser;
     char *cpLocalHost;
-    long nTimeout; 
+    long nTimeout;
     sa_addr_t *saaServer;
     sa_t *saServer;
 } l2_ch_smtp_t;
@@ -91,7 +92,7 @@
 static l2_result_t hook_configure(l2_context_t *ctx, l2_channel_t *ch, const char *fmt, va_list ap)
 {
     l2_ch_smtp_t *cfg = (l2_ch_smtp_t *)ctx->vp;
-    l2_param_t pa[10]; 
+    l2_param_t pa[10];
     l2_result_t rv;
     l2_env_t *env;
 
@@ -125,7 +126,7 @@
     /* create socket address */
     if ((rc = sa_addr_create(&cfg->saaServer)) != SA_OK)
         return (rc == SA_ERR_SYS ? L2_ERR_SYS : L2_ERR_INT);
-    if ((rc = sa_addr_u2a(cfg->saaServer, "inet://%s:%s", 
+    if ((rc = sa_addr_u2a(cfg->saaServer, "inet://%s:%s",
                           cfg->cpHost, cfg->cpPort)) != SA_OK)
         return (rc == SA_ERR_SYS ? L2_ERR_SYS : L2_ERR_INT);
 
@@ -158,8 +159,8 @@
     struct tm *tm;
     time_t t;
     char caDate[80];
-    
-    /* 
+
+    /*
      * Sample SMTP transaction for reference:
      *
      * | 220 en1.engelschall.com ESMTP SMTP Sendmail 8.11.0+ ready
@@ -175,7 +176,7 @@
      * | From: rse@en1.engelschall.com
      * | To: rse@engelschall.com
      * | Subject: [L2] log channel output on en1.engelschall.com
-     * | User-Agent: L2/0.1.0                                                                              
+     * | User-Agent: L2/0.1.0
      * |
      * | A program of user rse on host en1.engelschall.com logged:
      * | [2001-09-10/01:02:03] <notice> sample logging message
@@ -198,7 +199,7 @@
     /* | 220 en1.engelschall.com ESMTP SMTP Sendmail 8.11.0+ ready */
     sa_rv = sa_readln(sa, caLine, sizeof(caLine), &n);
     cu_on(!(sa_rv == SA_OK && n > 3 && atoi(caLine) == 220), L2_ERR_IO);
-    
+
     /* | HELO l2
      * | 250 en1.engelschall.com Hello en1.engelschall.com [141.1.129.1], pleased to meet you */
     sa_writef(sa, "HELO %s\r\n", cfg->cpLocalHost);
@@ -227,7 +228,7 @@
      * | From: rse@en1.engelschall.com
      * | To: rse@engelschall.com
      * | Subject: [L2] log channel output on en1.engelschall.com
-     * | User-Agent: L2/0.1.0                                                                              
+     * | User-Agent: L2/0.1.0
      * |                                                             */
     t = time(NULL);
     tm = localtime(&t);
@@ -237,7 +238,7 @@
     sa_writef(sa, "To: %s\r\n", cfg->cpRcpt);
     sa_writef(sa, "Subject: %s\r\n", cfg->cpSubject);
     if (cfg->cpLocalProg != NULL)
-        sa_writef(sa, "User-Agent: %s (%s)\r\n", 
+        sa_writef(sa, "User-Agent: %s (%s)\r\n",
                   l2_version.v_web, cfg->cpLocalProg);
     else
         sa_writef(sa, "User-Agent: %s\r\n", l2_version.v_web);
@@ -246,10 +247,10 @@
     /* | A program of user rse on host en1.engelschall.com logged:
      * | [2001-09-10/01:02:03] <notice> sample logging message      */
     if (cfg->cpLocalProg != NULL)
-        sa_writef(sa, "Program %s of user %s on host %s logged:\r\n", 
+        sa_writef(sa, "Program %s of user %s on host %s logged:\r\n",
                    cfg->cpLocalProg, cfg->cpLocalUser, cfg->cpLocalHost);
     else
-        sa_writef(sa, "A program of user %s on host %s logged:\r\n", 
+        sa_writef(sa, "A program of user %s on host %s logged:\r\n",
                    cfg->cpLocalUser, cfg->cpLocalHost);
     cpB = buf;
     cpE = buf;


ossp-pkg/l2/l2_ch_socket.c 1.37 -> 1.38

--- l2_ch_socket.c       2002/11/09 14:44:31     1.37
+++ l2_ch_socket.c       2003/01/06 11:41:51     1.38
@@ -1,9 +1,10 @@
 /*
-**  OSSP l2 - 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/)
+**  OSSP l2 - Flexible Logging
+**  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+**  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+**  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 **
-**  This file is part of OSSP L2, a flexible logging library which
+**  This file is part of OSSP l2, a flexible logging library which
 **  can be found at http://www.ossp.org/pkg/lib/l2/.
 **
 **  Permission to use, copy, modify, and distribute this software for
@@ -43,7 +44,7 @@
     char      *szProto;
     char      *szHost;
     char      *szPort;
-    long       nTimeout; 
+    long       nTimeout;
     sa_addr_t *saaRemote;
     sa_t      *saRemote;
 } l2_ch_socket_t;
@@ -143,7 +144,7 @@
             return (rc == SA_ERR_SYS ? L2_ERR_SYS : L2_ERR_INT);
     }
 
-    /* write message to channel socket, but check to make  
+    /* write message to channel socket, but check to make
        sure that the whole message was successfully written */
     sizeWrite  = 0;
     sizeRemain = buf_size;


ossp-pkg/l2/l2_ch_syslog.c 1.32 -> 1.33

--- l2_ch_syslog.c       2002/11/09 14:44:31     1.32
+++ l2_ch_syslog.c       2003/01/06 11:41:51     1.33
@@ -1,9 +1,10 @@
 /*
-**  OSSP l2 - 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/)
+**  OSSP l2 - Flexible Logging
+**  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+**  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+**  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 **
-**  This file is part of OSSP L2, a flexible logging library which
+**  This file is part of OSSP l2, a flexible logging library which
 **  can be found at http://www.ossp.org/pkg/lib/l2/.
 **
 **  Permission to use, copy, modify, and distribute this software for
@@ -191,7 +192,7 @@
         cfg->nFacility = l2_ch_syslog_SLfac[i].numLOCAL;
     else
         cfg->nFacility = (l2_ch_syslog_SLfac[i].numREMOTE << 3);
-    if (   strcmp(cfg->szTarget, "remote") == 0 
+    if (   strcmp(cfg->szTarget, "remote") == 0
         && (cfg->szRemoteHost == NULL
             || (cfg->nRemotePort <= 0 || cfg->nRemotePort >= 65536)))
         return L2_ERR_USE;
@@ -227,7 +228,7 @@
             return L2_ERR_USE;
         if ((rc = sa_addr_create(&cfg->saaRemoteAddr)) != SA_OK)
             return (rc == SA_ERR_SYS ? L2_ERR_SYS : L2_ERR_INT);
-        if ((rc = sa_addr_u2a(cfg->saaRemoteAddr, "inet://%s:%d", 
+        if ((rc = sa_addr_u2a(cfg->saaRemoteAddr, "inet://%s:%d",
                               cfg->szRemoteHost, cfg->nRemotePort)) != SA_OK)
             return (rc == SA_ERR_SYS ? L2_ERR_SYS : L2_ERR_INT);
         if ((rc = sa_create(&cfg->saRemoteSock)) != SA_OK)
@@ -287,13 +288,13 @@
         strftime(caTime, sizeof(caTime), "%b %d %H:%M:%S", tm);
         if (caTime[4] == '0')
             caTime[4] = ' ';
-        if (cfg->bLogPid) 
-            n = l2_util_sprintf(caBuf, sizeof(caBuf), "<%d>%s %s %s[%lu]: %s", 
-                                prio, caTime, cfg->szLocalHost, 
+        if (cfg->bLogPid)
+            n = l2_util_sprintf(caBuf, sizeof(caBuf), "<%d>%s %s %s[%lu]: %s",
+                                prio, caTime, cfg->szLocalHost,
                                 cfg->szIdent, (unsigned long)getpid(), buf);
         else
-            n = l2_util_sprintf(caBuf, sizeof(caBuf), "<%d>%s %s %s: %s", 
-                                prio, caTime, cfg->szLocalHost, 
+            n = l2_util_sprintf(caBuf, sizeof(caBuf), "<%d>%s %s %s: %s",
+                                prio, caTime, cfg->szLocalHost,
                                 cfg->szIdent, buf);
         if ((n = strlen(caBuf)) > 1024)
             return L2_ERR_IO;


ossp-pkg/l2/l2_channel.c 1.29 -> 1.30

--- l2_channel.c 2002/07/30 19:08:25     1.29
+++ l2_channel.c 2003/01/06 11:41:51     1.30
@@ -1,9 +1,10 @@
 /*
-**  OSSP l2 - 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/)
+**  OSSP l2 - Flexible Logging
+**  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+**  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+**  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 **
-**  This file is part of OSSP L2, a flexible logging library which
+**  This file is part of OSSP l2, a flexible logging library which
 **  can be found at http://www.ossp.org/pkg/lib/l2/.
 **
 **  Permission to use, copy, modify, and distribute this software for
@@ -30,7 +31,7 @@
 
 #include "l2_p.h"
 
-/* 
+/*
  * A channel is the central object for a logging stream. It is
  * implemented by a framework (the code implemented here) which provides
  * the channel API and which is equal for all channels and a particular
@@ -309,8 +310,8 @@
         rv = ch->handler.open(&ch->context, ch);
     else
         rv = L2_OK_PASS;
-   
-    /* optionally pass operation downstream */ 
+
+    /* optionally pass operation downstream */
     if (rv == L2_OK_PASS) {
         rv = L2_OK;
         chD = NULL;
@@ -367,8 +368,8 @@
         rv = ch->handler.write(&ch->context, ch, level, buf, bufsize);
     else
         rv = L2_OK_PASS;
-   
-    /* optionally pass operation downstream */ 
+
+    /* optionally pass operation downstream */
     if (rv == L2_OK_PASS) {
         rv = L2_OK;
         chD = NULL;
@@ -400,8 +401,8 @@
         rv = ch->handler.flush(&ch->context, ch);
     else
         rv = L2_OK_PASS;
-   
-    /* optionally pass operation downstream */ 
+
+    /* optionally pass operation downstream */
     if (rv == L2_OK_PASS) {
         rv = L2_OK;
         chD = NULL;
@@ -423,7 +424,7 @@
     /* argument sanity check */
     if (ch == NULL)
         return L2_ERR_ARG;
-    
+
     /* make sure channel is in state "opened" */
     if (ch->state != L2_CHSTATE_OPENED)
         return L2_ERR_USE;
@@ -433,8 +434,8 @@
         rv = ch->handler.close(&ch->context, ch);
     else
         rv = L2_OK_PASS;
-   
-    /* optionally pass operation downstream */ 
+
+    /* optionally pass operation downstream */
     if (rv == L2_OK_PASS) {
         rv = L2_OK;
         chD = NULL;
@@ -471,8 +472,8 @@
         rv = ch->handler.destroy(&ch->context, ch);
     else
         rv = L2_OK_PASS;
-   
-    /* optionally pass operation downstream */ 
+
+    /* optionally pass operation downstream */
     if (rv == L2_OK_PASS) {
         rv = L2_OK;
         chD = NULL;
@@ -528,7 +529,7 @@
     /* iterate over all configured L2 formatters */
     for (i = 0; i < L2_MAX_FORMATTERS && env->formatters[i].cb != NULL; i++) {
         if (env->formatters[i].id == cId) {
-            rv = env->formatters[i].cb(env->formatters[i].ctx, cId, cpParam, 
+            rv = env->formatters[i].cb(env->formatters[i].ctx, cId, cpParam,
                                        cpBuf, nBufLenMax, npOutLen, apArgs);
             vfmt->data[1].i = (int)rv;
             if (rv == L2_OK) {


ossp-pkg/l2/l2_env.c 1.9 -> 1.10

--- l2_env.c     2002/07/30 19:08:25     1.9
+++ l2_env.c     2003/01/06 11:41:51     1.10
@@ -1,9 +1,10 @@
 /*
-**  OSSP l2 - 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/)
+**  OSSP l2 - Flexible Logging
+**  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+**  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+**  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 **
-**  This file is part of OSSP L2, a flexible logging library which
+**  This file is part of OSSP l2, a flexible logging library which
 **  can be found at http://www.ossp.org/pkg/lib/l2/.
 **
 **  Permission to use, copy, modify, and distribute this software for
@@ -38,8 +39,8 @@
     /* argument sanity check */
     if (envp == NULL)
         return L2_ERR_ARG;
-    
-    /* allocate environment structure */ 
+
+    /* allocate environment structure */
     if ((env = (l2_env_t *)malloc(sizeof(l2_env_t))) == NULL)
         return L2_ERR_SYS;
 


ossp-pkg/l2/l2_p.h 1.33 -> 1.34

--- l2_p.h       2002/07/30 19:08:25     1.33
+++ l2_p.h       2003/01/06 11:41:52     1.34
@@ -1,8 +1,10 @@
 /*
-**  OSSP l2 - Logging Library
-**  Copyright (c) 2001-2002 Cable & Wireless Deutschland GmbH
+**  OSSP l2 - Flexible Logging
+**  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+**  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+**  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 **
-**  This file is part of OSSP L2, a flexible logging library which
+**  This file is part of OSSP l2, a flexible logging library which
 **  can be found at http://www.ossp.org/pkg/lib/l2/.
 **
 **  Permission to use, copy, modify, and distribute this software for
@@ -74,7 +76,7 @@
 #define L2_MAX_MSGSIZE         4096
 #define L2_MAX_FORMATTERS       128
 #define L2_MAX_HANDLERS         128
-#define L2_BROKEN_TIMER          -1 
+#define L2_BROKEN_TIMER          -1
 #define L2_BUFFER_TIMER ITIMER_REAL /* for [s|g]etitimer() and alarm() */
 
 /* internal channel state */


ossp-pkg/l2/l2_spec.c 1.9 -> 1.10

--- l2_spec.c    2002/07/30 19:08:25     1.9
+++ l2_spec.c    2003/01/06 11:41:52     1.10
@@ -1,9 +1,10 @@
 /*
-**  OSSP l2 - 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/)
+**  OSSP l2 - Flexible Logging
+**  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+**  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+**  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 **
-**  This file is part of OSSP L2, a flexible logging library which
+**  This file is part of OSSP l2, a flexible logging library which
 **  can be found at http://www.ossp.org/pkg/lib/l2/.
 **
 **  Permission to use, copy, modify, and distribute this software for
@@ -68,7 +69,7 @@
     l2_spec_lex_init(&yyscan);
     l2_spec_set_extra(&ctx, yyscan);
 
-    /* establish our own context which is passed 
+    /* establish our own context which is passed
        through the parser and scanner */
     ctx.yyscan   = yyscan;
     ctx.inputptr = specstr;


ossp-pkg/l2/l2_spec.h 1.3 -> 1.4

--- l2_spec.h    2001/12/14 12:42:07     1.3
+++ l2_spec.h    2003/01/06 11:41:52     1.4
@@ -1,3 +1,33 @@
+/*
+**  OSSP l2 - Flexible Logging
+**  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+**  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+**  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
+**
+**  This file is part of OSSP l2, a flexible logging library which
+**  can be found at http://www.ossp.org/pkg/lib/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_spec.h: specification common header
+*/
+
 #ifndef __L2_SPEC_H__
 #define __L2_SPEC_H__
 


ossp-pkg/l2/l2_spec_parse.y 1.9 -> 1.10

--- l2_spec_parse.y      2003/01/06 11:19:45     1.9
+++ l2_spec_parse.y      2003/01/06 11:41:52     1.10
@@ -1,10 +1,11 @@
 %{
 /*
-**  OSSP l2 - 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/)
+**  OSSP l2 - Flexible Logging
+**  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+**  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+**  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 **
-**  This file is part of OSSP L2, a flexible logging library which
+**  This file is part of OSSP l2, a flexible logging library which
 **  can be found at http://www.ossp.org/pkg/lib/l2/.
 **
 **  Permission to use, copy, modify, and distribute this software for
@@ -39,10 +40,10 @@
 #define YYPARSE_PARAM ctx
 #define YYLEX_PARAM   CTX->yyscan
 
-/* provide an explicit prototype for the yylex() function but use 
-   "void *" instead of correct type because at this point in the 
+/* provide an explicit prototype for the yylex() function but use
+   "void *" instead of correct type because at this point in the
    generation process we have the types still not available */
-extern int yylex(/*YYSTYPE*/ void *lvalp, 
+extern int yylex(/*YYSTYPE*/ void *lvalp,
                  /*YYLTYPE*/ void *llocp, l2_spec_ctx_t *ctx);
 
 /* generate verbose error messages and remember them inside the context */
@@ -85,7 +86,7 @@
 /* operator association */
 %right T_OP_ARROW
 
-/* grammar start rule 
+/* grammar start rule
    (technically redundant but explicit to be sure) */
 %start tree
 
@@ -93,10 +94,10 @@
 
 /* channel tree */
 tree
-    : stream { 
+    : stream {
           CTX->ch = $1;
       }
-    ; 
+    ;
 
 /* stream of channels */
 stream
@@ -108,18 +109,18 @@
           }
           $$ = ch;
       }
-    | channel { 
-          $$ = $1; 
+    | channel {
+          $$ = $1;
       }
-    | channel T_OP_ARROW stream { 
-          $$ = $1; 
+    | channel T_OP_ARROW stream {
+          $$ = $1;
           if ((CTX->rv = l2_channel_link($1, L2_LINK_CHILD, $3, NULL)) != L2_OK) {
               l2_spec_error(CTX, CTX->rv, &yylloc, "unable to link parent with child");
               YYERROR;
           }
       }
-    | channel T_OP_ARROW '{' streams '}' { 
-          $$ = $1; 
+    | channel T_OP_ARROW '{' streams '}' {
+          $$ = $1;
           if ((CTX->rv = l2_channel_link($1, L2_LINK_CHILD, $4, NULL)) != L2_OK) {
               l2_spec_error(CTX, CTX->rv, &yylloc, "unable to link parent with child list");
               YYERROR;
@@ -129,11 +130,11 @@
 
 /* list of sibling streams */
 streams
-    : stream { 
-          $$ = $1; 
+    : stream {
+          $$ = $1;
       }
-    | stream ';' streams { 
-          $$ = $1; 
+    | stream ';' streams {
+          $$ = $1;
           if ((CTX->rv = l2_channel_link($1, L2_LINK_SIBLING, $3, NULL)) != L2_OK) {
               l2_spec_error(CTX, CTX->rv, &yylloc, "unable to link childs together");
               YYERROR;
@@ -143,28 +144,28 @@
 
 /* channel */
 channel
-    : channel_level '/' channel_level ':' channel_cons { 
-          $$ = $5; 
+    : channel_level '/' channel_level ':' channel_cons {
+          $$ = $5;
           if ((CTX->rv = l2_channel_levels($5, $1, $3)) != L2_OK) {
               l2_spec_error(CTX, CTX->rv, &yylloc, "failed to set channel write and flush levels");
               YYERROR;
           }
       }
-    | channel_level ':' channel_cons { 
-          $$ = $3; 
+    | channel_level ':' channel_cons {
+          $$ = $3;
           if ((CTX->rv = l2_channel_levels($3, $1, L2_LEVEL_NONE)) != L2_OK) {
               l2_spec_error(CTX, CTX->rv, &yylloc, "failed to set channel write levels");
               YYERROR;
           }
       }
-    | channel_cons { 
+    | channel_cons {
           $$ = $1;
       }
     ;
 
 /* channel level */
 channel_level
-    : T_ID { 
+    : T_ID {
           unsigned int levelmask;
           if ((CTX->rv = l2_util_s2l($1, strlen($1), ',', &levelmask)) != L2_OK) {
               l2_spec_error(CTX, CTX->rv, &yylloc, "invalid level '%s'", $1);
@@ -172,14 +173,14 @@
           }
           $$ = L2_LEVEL_UPTO(levelmask);
       }
-    | '(' channel_level_mask ')' { 
-          $$ = $2; 
+    | '(' channel_level_mask ')' {
+          $$ = $2;
       }
     ;
 
 /* channel level mask */
-channel_level_mask 
-    : T_ID { 
+channel_level_mask
+    : T_ID {
           unsigned int levelmask;
           if ((CTX->rv = l2_util_s2l($1, strlen($1), ',', &levelmask)) != L2_OK) {
               l2_spec_error(CTX, CTX->rv, &yylloc, "invalid level '%s'", $1);
@@ -187,19 +188,19 @@
           }
           $$ = levelmask;
       }
-    | T_ID '|' channel_level_mask { 
+    | T_ID '|' channel_level_mask {
           unsigned int levelmask;
           if ((CTX->rv = l2_util_s2l($1, strlen($1), ',', &levelmask)) != L2_OK) {
               l2_spec_error(CTX, CTX->rv, &yylloc, "invalid level '%s'", $1);
               YYERROR;
           }
-          $$ = levelmask | $3; 
+          $$ = levelmask | $3;
       }
     ;
 
 /* channel constructor */
-channel_cons   
-    : T_ID { 
+channel_cons
+    : T_ID {
           l2_channel_t *ch;
           if ((CTX->rv = l2_channel_create(&ch, CTX->env, $1)) != L2_OK) {
               l2_spec_error(CTX, CTX->rv, &yylloc, "failed to create channel '%s'", $1);
@@ -210,36 +211,36 @@
              not know where on the token stack our $$ is because it is a
              sub-rule of the recursive channel_param_list rule and hence
              cannot use "$<chChannel>-n". */
-          CTX->chTmp = ch; 
+          CTX->chTmp = ch;
       }
-      channel_params { 
+      channel_params {
           $$ = $<chChannel>2; /* pass-through result */
           CTX->chTmp = NULL;
       }
     ;
 
 /* channel parameters */
-channel_params 
+channel_params
     : /* empty */
     | '(' ')'
     | '(' channel_param_list ')'
     ;
 
 /* channel parameter list */
-channel_param_list 
+channel_param_list
     : channel_param
     | channel_param ',' channel_param_list
     ;
-        
+
 /* channel parameter */
-channel_param  
-    : T_ID '=' { l2_spec_scan_push(CTX, "SS_PARAM"); } T_PARAM { l2_spec_scan_pop(CTX); } { 
+channel_param
+    : T_ID '=' { l2_spec_scan_push(CTX, "SS_PARAM"); } T_PARAM { l2_spec_scan_pop(CTX); } {
           if ((CTX->rv = l2_channel_configure(CTX->chTmp, "%s=\"%s\"", $1, $4)) != L2_OK) {
               l2_spec_error(CTX, CTX->rv, &yylloc, "failed to configure channel with '%s=\"%s\"'", $1, $4);
               YYERROR;
           }
       }
     ;
- 
+
 %%
 


ossp-pkg/l2/l2_spec_scan.l 1.11 -> 1.12

--- l2_spec_scan.l       2003/01/06 11:19:45     1.11
+++ l2_spec_scan.l       2003/01/06 11:41:52     1.12
@@ -1,10 +1,11 @@
 %{
 /*
-**  OSSP l2 - 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/)
+**  OSSP l2 - Flexible Logging
+**  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+**  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+**  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 **
-**  This file is part of OSSP L2, a flexible logging library which
+**  This file is part of OSSP l2, a flexible logging library which
 **  can be found at http://www.ossp.org/pkg/lib/l2/.
 **
 **  Permission to use, copy, modify, and distribute this software for
@@ -106,7 +107,7 @@
 <SS_PARAM_Q>\n {
     l2_spec_error(CTX, L2_ERR_SYN, yylloc, "Unterminated string");
     return 0;
-}   
+}
 <SS_PARAM_Q>\\[0-7]{1,3} {
     unsigned int result;
     (void)sscanf(yytext+1, "%o", &result);
@@ -150,7 +151,7 @@
 }
 
    /* operators */
-"->" { 
+"->" {
     return T_OP_ARROW;
 }
 


ossp-pkg/l2/l2_test.c 1.50 -> 1.51

--- l2_test.c    2002/07/30 19:08:25     1.50
+++ l2_test.c    2003/01/06 11:41:52     1.51
@@ -1,9 +1,10 @@
 /*
-**  OSSP l2 - 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/)
+**  OSSP l2 - Flexible Logging
+**  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+**  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+**  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 **
-**  This file is part of OSSP L2, a flexible logging library which
+**  This file is part of OSSP l2, a flexible logging library which
 **  can be found at http://www.ossp.org/pkg/lib/l2/.
 **
 **  Permission to use, copy, modify, and distribute this software for
@@ -45,12 +46,12 @@
     exit(1);
 }
 
-static l2_result_t 
+static l2_result_t
 formatter(l2_context_t *ctx, const char id, const char *param,
           char *bufptr, size_t bufsize, size_t *buflen, va_list *ap)
 {
     int i;
-    
+
     i = va_arg(*ap, int);
     sprintf(bufptr, "[%d/%s]", i, param);
     *buflen = strlen(bufptr);
@@ -153,7 +154,7 @@
     /* open channel tree */
     if ((rv = l2_channel_open(ch)) != L2_OK)
         die(env, rv, "failed to open channel tree");
-    
+
     /* perform a few log operations */
     if ((rv = l2_channel_log(ch, L2_LEVEL_PANIC, "1: Checking localhost %s %{myparm}k <%{text}S><%{hex}S><%{base64}S>\n", "foo", 12345, "foo\1bar", 7, "foo\1bar", 7, "foo\1bar", 7)) != L2_OK)
         die(env, rv, "failed to log message #1 to channel");


ossp-pkg/l2/l2_ut_fmtcb.c 1.6 -> 1.7

--- l2_ut_fmtcb.c        2002/07/30 19:08:25     1.6
+++ l2_ut_fmtcb.c        2003/01/06 11:41:52     1.7
@@ -1,9 +1,10 @@
 /*
-**  OSSP l2 - 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/)
+**  OSSP l2 - Flexible Logging
+**  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+**  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+**  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 **
-**  This file is part of OSSP L2, a flexible logging library which
+**  This file is part of OSSP l2, a flexible logging library which
 **  can be found at http://www.ossp.org/pkg/lib/l2/.
 **
 **  Permission to use, copy, modify, and distribute this software for
@@ -32,9 +33,9 @@
 #include "l2.h"
 #include <errno.h>
 
-l2_result_t 
+l2_result_t
 l2_util_fmt_string(
-    l2_context_t *ctx, const char id, const char *param, 
+    l2_context_t *ctx, const char id, const char *param,
     char *bufptr, size_t bufsize, size_t *buflen, va_list *ap)
 {
     char *cpStr;
@@ -51,13 +52,13 @@
     return L2_OK;
 }
 
-l2_result_t 
+l2_result_t
 l2_util_fmt_dump(
-    l2_context_t *ctx, const char id, const char *param, 
+    l2_context_t *ctx, const char id, const char *param,
     char *bufptr, size_t bufsize, size_t *buflen, va_list *ap)
 {
     static const char hex_table[]    = "0123456789abcdef";
-    static const char base64_table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" 
+    static const char base64_table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
                                        "abcdefghijklmnopqrstuvwxyz"
                                        "0123456789+/";
     unsigned char base64_in[3];
@@ -78,7 +79,7 @@
     if (ucpData == NULL)
         return L2_ERR_ARG;
 
-    /* 
+    /*
      * textual dumping: "foo\1bar" -> "foo\x01bar"
      */
     if (strcmp(param, "text") == 0 || param[0] == '\0') {
@@ -102,9 +103,9 @@
                     return L2_ERR_MEM;
                 *cpO++ = '\\';
                 switch ((int)uc) {
-                    case '\t': *cpO++ = 't'; break; 
-                    case '\r': *cpO++ = 'r'; break; 
-                    case '\n': *cpO++ = 'n'; break; 
+                    case '\t': *cpO++ = 't'; break;
+                    case '\r': *cpO++ = 'r'; break;
+                    case '\n': *cpO++ = 'n'; break;
                     default: break;
                 }
             }
@@ -120,7 +121,7 @@
         *buflen = ((char *)cpO - bufptr);
     }
 
-    /* 
+    /*
      * hexadecimal dumping: "foo\1bar" -> "66:6f:6f:01:62:61:72"
      */
     else if (strcmp(param, "hex") == 0) {
@@ -189,12 +190,12 @@
     return L2_OK;
 }
 
-l2_result_t 
+l2_result_t
 l2_util_fmt_errno(
     l2_context_t *ctx, const char id, const char *param,
     char *bufptr, size_t bufsize, size_t *buflen, va_list *ap)
-{   
-    sprintf(bufptr, "(%d) %s", errno, strerror(errno)); 
+{
+    sprintf(bufptr, "(%d) %s", errno, strerror(errno));
     *buflen = strlen(bufptr);
     return L2_OK;
 }


ossp-pkg/l2/l2_ut_format.c 1.7 -> 1.8

--- l2_ut_format.c       2002/09/22 07:35:40     1.7
+++ l2_ut_format.c       2003/01/06 11:41:52     1.8
@@ -1,9 +1,10 @@
 /*
-**  OSSP l2 - 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/)
+**  OSSP l2 - Flexible Logging
+**  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+**  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+**  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 **
-**  This file is part of OSSP L2, a flexible logging library which
+**  This file is part of OSSP l2, a flexible logging library which
 **  can be found at http://www.ossp.org/pkg/lib/l2/.
 **
 **  Permission to use, copy, modify, and distribute this software for
@@ -39,7 +40,7 @@
  * Especially any Apache and network specific kludges were removed again
  * and instead the formatting engine now can be extended by the caller
  * on-the-fly. It was then finally adjusted to be stand-alone for use
- * inside OSSP L2.
+ * inside OSSP l2.
  */
 
 /*
@@ -128,7 +129,7 @@
 #define FLOAT_DIGITS    6
 #define EXPONENT_LENGTH 10
 
-/* NUM_BUF_SIZE is the size of the buffer used for arithmetic 
+/* NUM_BUF_SIZE is the size of the buffer used for arithmetic
    conversions. This is a magic number; do NOT decrease it! */
 #define NUM_BUF_SIZE    512
 #define NDIG            80
@@ -148,7 +149,7 @@
 #define l2_util_islower(c)  (islower(((unsigned char)(c))))
 #define l2_util_tolower(c)  (tolower((unsigned char)(c)))
 
-/* 
+/*
  * Convert decimal number to its string representation. The number of
  * digits is specified by ndigit decpt is set to the position of the
  * decimal point sign is set to 0 for positive, 1 for negative. buf must
@@ -163,10 +164,10 @@
 
 static char *
 l2_util_cvt(
-    double arg, 
-    int ndigits, 
-    int *decpt, 
-    int *sign, 
+    double arg,
+    int ndigits,
+    int *decpt,
+    int *sign,
     int eflag,
     char *buf)
 {
@@ -242,9 +243,9 @@
 
 static char *
 l2_util_gcvt(
-    double number, 
-    int ndigit, 
-    char *buf, 
+    double number,
+    int ndigit,
+    char *buf,
     int altform)
 {
     int sign;
@@ -326,7 +327,7 @@
 }
 
 /*
- * Convert a string to decimal value 
+ * Convert a string to decimal value
  */
 #define NUM(c) ((c) - '0')
 #define STR_TO_DEC(str, num) {    \
@@ -336,7 +337,7 @@
         num += NUM(*str++) ;      \
     }                             \
 }
-     
+
 /*
  * This macro does zero padding so that the precision requirement is
  * satisfied. The padding is done by adding '0's to the left of the
@@ -351,7 +352,7 @@
     }
 
 /*
- * This macro does padding. 
+ * This macro does padding.
  * The padding is done by printing the character ch.
  */
 #define PAD(width, len, ch) \
@@ -385,9 +386,9 @@
  */
 static char *
 conv_10(
-    register long_int num, 
+    register long_int num,
     register int is_unsigned,
-    register int *is_negative, 
+    register int *is_negative,
     char *buf_end,
     register size_t *len)
 {
@@ -400,7 +401,7 @@
     }
     else {
         *is_negative = (num < 0);
-        /* On a 2's complement machine, negating the most negative integer 
+        /* On a 2's complement machine, negating the most negative integer
            results in a number that cannot be represented as a signed integer.
            Here is what we do to obtain the number's magnitude:
                 a. add 1 to the number
@@ -427,9 +428,9 @@
 
 static char *
 conv_10_quad(
-    quad_int num, 
+    quad_int num,
     register int is_unsigned,
-    register int *is_negative, 
+    register int *is_negative,
     char *buf_end,
     register size_t *len)
 {
@@ -442,7 +443,7 @@
     }
     else {
         *is_negative = (num < 0);
-        /* On a 2's complement machine, negating the most negative integer 
+        /* On a 2's complement machine, negating the most negative integer
            result in a number that cannot be represented as a signed integer.
            Here is what we do to obtain the number's magnitude:
                 a. add 1 to the number
@@ -474,12 +475,12 @@
  */
 static char *
 conv_fp(
-    register char format, 
+    register char format,
     register double num,
-    int add_dp, 
-    int precision, 
+    int add_dp,
+    int precision,
     int *is_negative,
-    char *buf, 
+    char *buf,
     size_t *len)
 {
     register char *s = buf;
@@ -535,7 +536,7 @@
         *s++ = format;          /* either e or E */
         decimal_point--;
         if (decimal_point != 0) {
-            p = conv_10((long_int) decimal_point, FALSE, &exponent_is_negative, 
+            p = conv_10((long_int) decimal_point, FALSE, &exponent_is_negative,
                         &temp[EXPONENT_LENGTH], &t_len);
             *s++ = exponent_is_negative ? '-' : '+';
             /* Make sure the exponent has at least 2 digits */
@@ -572,10 +573,10 @@
 
 static char *
 conv_p2(
-    register u_long_int num, 
+    register u_long_int num,
     register int nbits,
-    char format, 
-    char *buf_end, 
+    char format,
+    char *buf_end,
     register size_t *len)
 {
     register int mask = (1 << nbits) - 1;
@@ -592,10 +593,10 @@
 
 static char *
 conv_p2_quad(
-    u_quad_int num, 
+    u_quad_int num,
     register int nbits,
-    char format, 
-    char *buf_end, 
+    char format,
+    char *buf_end,
     register size_t *len)
 {
     register int mask = (1 << nbits) - 1;
@@ -610,14 +611,14 @@
     return p;
 }
 
-/* 
+/*
  * l2_util_format(), the generic printf-style formatting routine
  * and heart of this piece of source.
  */
-int 
+int
 l2_util_format(
-    l2_util_format_t *vbuff, 
-    const char *fmt, 
+    l2_util_format_t *vbuff,
+    const char *fmt,
     va_list ap)
 {
     register char *sp;
@@ -911,7 +912,7 @@
                     else {
                         /* use &num_buf[1], so that we have room for the sign */
                         s = conv_fp(*fmt, fp_num, alternate_form,
-                                    (adjust_precision == FALSE) ? FLOAT_DIGITS : precision, 
+                                    (adjust_precision == FALSE) ? FLOAT_DIGITS : precision,
                                     &is_negative, &num_buf[1], &s_len);
                         if (is_negative)
                             prefix_char = '-';
@@ -986,7 +987,7 @@
                     break;
 
                 /*
-                 * Pointer argument type. 
+                 * Pointer argument type.
                  */
                 case 'p':
 #if defined(SIZEOF_LONG_LONG) && (SIZEOF_LONG_LONG == SIZEOF_VOID_P)
@@ -1020,7 +1021,7 @@
                     s = NULL;
                     if (vbuff->format != NULL) {
                         vbuff->format(vbuff,
-                                      &prefix_char, &pad_char, &s, &s_len, 
+                                      &prefix_char, &pad_char, &s, &s_len,
                                       num_buf, NUM_BUF_SIZE, extinfo, *fmt, &ap);
                         if (s == NULL)
                             return -1;
@@ -1051,7 +1052,7 @@
             }
 
             /*
-             * Print the string s. 
+             * Print the string s.
              */
             for (i = s_len; i != 0; i--) {
                 INS_CHAR(*s, sp, bep, cc);


ossp-pkg/l2/l2_ut_format.h 1.3 -> 1.4

--- l2_ut_format.h       2002/07/30 19:08:25     1.3
+++ l2_ut_format.h       2003/01/06 11:41:52     1.4
@@ -1,8 +1,10 @@
 /*
-**  OSSP l2 - Logging Library
-**  Copyright (c) 2001-2002 Cable & Wireless Deutschland GmbH
+**  OSSP l2 - Flexible Logging
+**  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+**  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+**  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 **
-**  This file is part of OSSP L2, a flexible logging library which
+**  This file is part of OSSP l2, a flexible logging library which
 **  can be found at http://www.ossp.org/pkg/lib/l2/.
 **
 **  Permission to use, copy, modify, and distribute this software for
@@ -49,17 +51,17 @@
         char *num_buf,                   /* input  arg: temporary buffer */
         int num_buf_size,                /* input  arg: temporary buffer len */
         char *extinfo,                   /* input  arg: extension information */
-        char fmt_char,                   /* input  arg: current formatting character */ 
+        char fmt_char,                   /* input  arg: current formatting character */
         va_list *ap                      /* in/out arg: variable argument pointer */
     );
 
     /* arbitrary passed-through application data */
-    union { 
-        int i;                        
-        long l; 
-        double d; 
-        void *vp; 
-    } data[6];                           
+    union {
+        int i;
+        long l;
+        double d;
+        void *vp;
+    } data[6];
 };
 
 typedef struct l2_util_format_st l2_util_format_t;


ossp-pkg/l2/l2_ut_level.c 1.8 -> 1.9

--- l2_ut_level.c        2002/07/30 19:08:25     1.8
+++ l2_ut_level.c        2003/01/06 11:41:52     1.9
@@ -1,9 +1,10 @@
 /*
-**  OSSP l2 - 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/)
+**  OSSP l2 - Flexible Logging
+**  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+**  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+**  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 **
-**  This file is part of OSSP L2, a flexible logging library which
+**  This file is part of OSSP l2, a flexible logging library which
 **  can be found at http://www.ossp.org/pkg/lib/l2/.
 **
 **  Permission to use, copy, modify, and distribute this software for
@@ -77,7 +78,7 @@
     }
     /* remove trailing comma */
     if ((maxlen-len) > 0)
-        string[(maxlen-len)-1] = '\0'; 
+        string[(maxlen-len)-1] = '\0';
 
     return L2_OK;
 }
@@ -90,7 +91,7 @@
     hv = 0;
     while (cpB < cpE) {
         nibble = tolower((unsigned int)(*cpB++));
-        if (isdigit(nibble)) 
+        if (isdigit(nibble))
             nibble = nibble - '0';
         else
             nibble = nibble - 'a';


ossp-pkg/l2/l2_ut_param.c 1.9 -> 1.10

--- l2_ut_param.c        2002/07/30 19:08:25     1.9
+++ l2_ut_param.c        2003/01/06 11:41:52     1.10
@@ -1,9 +1,10 @@
 /*
-**  OSSP l2 - 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/)
+**  OSSP l2 - Flexible Logging
+**  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+**  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+**  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 **
-**  This file is part of OSSP L2, a flexible logging library which
+**  This file is part of OSSP l2, a flexible logging library which
 **  can be found at http://www.ossp.org/pkg/lib/l2/.
 **
 **  Permission to use, copy, modify, and distribute this software for
@@ -41,7 +42,7 @@
     char *cpB, *cpE;
     char *spec;
     int ok;
-    int i; 
+    int i;
     int n;
 
     /* argument sanity check */
@@ -62,7 +63,7 @@
         /* determine end of parameter name */
         cpE = cpB;
         if (!isalpha((int)*cpE)) {
-            l2_env_errorinfo(env, L2_ERR_ARG, 
+            l2_env_errorinfo(env, L2_ERR_ARG,
                              "expected alpha-numerical parameter "
                              "start character, got '%c'", *cpE);
             return L2_ERR_ARG;
@@ -71,7 +72,7 @@
         while (isalnum((int)*cpE))
             cpE++;
         if (*cpE != '=') {
-            l2_env_errorinfo(env, L2_ERR_ARG, 
+            l2_env_errorinfo(env, L2_ERR_ARG,
                              "expected assignment operator ('='), "
                              "got '%c'", *cpE);
             return L2_ERR_ARG;
@@ -134,13 +135,13 @@
                 else
                     val = strtol(cpB, &cpE, 10);
                 if ((val == LONG_MIN || val == LONG_MAX) && errno == ERANGE) {
-                    l2_env_errorinfo(env, L2_ERR_ARG, 
+                    l2_env_errorinfo(env, L2_ERR_ARG,
                                      "numerical parameter value out of range "
                                      "('%s')", cpB);
                     return L2_ERR_ARG;
                 }
                 if (*cpE != '\0') {
-                    l2_env_errorinfo(env, L2_ERR_ARG, 
+                    l2_env_errorinfo(env, L2_ERR_ARG,
                                      "expected valid numerical parameter value, "
                                      "got '%c' character", *cpE);
                     return L2_ERR_ARG;
@@ -152,18 +153,18 @@
                 /* floating point parameter */
                 double val = strtod(cpB, &cpE);
                 if (val == HUGE_VAL && errno == ERANGE) {
-                    l2_env_errorinfo(env, L2_ERR_ARG, 
+                    l2_env_errorinfo(env, L2_ERR_ARG,
                                      "floating point parameter value too huge "
                                      "('%s')", cpB);
                     return L2_ERR_ARG;
                 }
                 if (val == 0 && cpE == cpB) {
-                    l2_env_errorinfo(env, L2_ERR_ARG, 
+                    l2_env_errorinfo(env, L2_ERR_ARG,
                                      "floating point parameter value conversion failed "
                                      "('%s')", cpB);
                 }
                 if (*cpE != '\0') {
-                    l2_env_errorinfo(env, L2_ERR_ARG, 
+                    l2_env_errorinfo(env, L2_ERR_ARG,
                                      "expected valid floating point parameter value, "
                                      "got '%c' character", *cpE);
                     return L2_ERR_ARG;
@@ -173,7 +174,7 @@
             }
             case L2_TYPE_STR: {
                 /* string parameter */
-                if (*(char **)(pa[i].store) != NULL) 
+                if (*(char **)(pa[i].store) != NULL)
                     free(*(char **)(pa[i].store));
                 *(char **)(pa[i].store) = strdup(cpB);
                 break;


ossp-pkg/l2/l2_ut_pcre.c 1.6 -> 1.7

--- l2_ut_pcre.c 2002/01/11 10:36:14     1.6
+++ l2_ut_pcre.c 2003/01/06 11:41:52     1.7
@@ -1,4 +1,4 @@
-/* 
+/*
  *  Perl Compatible Regular Expression (PCRE) Library
  *  Copyright (c) 1997-2001 Philip Hazel <ph10@cam.ac.uk>
  *  Copyright (c) 1997-2001 University of Cambridge
@@ -12,7 +12,7 @@
  *  for this version.
  */
 
-/* 
+/*
    This is a library of functions to support regular expressions whose syntax
    and semantics are as close as possible to those of the Perl 5 language. See
    the file Tech.Notes for some information on the internals.


ossp-pkg/l2/l2tool.c 1.3 -> 1.4

--- l2tool.c     2002/07/30 19:08:25     1.3
+++ l2tool.c     2003/01/06 11:41:52     1.4
@@ -1,9 +1,10 @@
 /*
-**  OSSP l2 - 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/)
+**  OSSP l2 - Flexible Logging
+**  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+**  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+**  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 **
-**  This file is part of OSSP L2, a flexible logging library which
+**  This file is part of OSSP l2, a flexible logging library which
 **  can be found at http://www.ossp.org/pkg/lib/l2/.
 **
 **  Permission to use, copy, modify, and distribute this software for
@@ -24,7 +25,7 @@
 **  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 **  SUCH DAMAGE.
 **
-**  l2tool.c: L2 command line tool
+**  l2tool.c: command line tool
 */
 
 #include <stdio.h>
@@ -76,7 +77,7 @@
     /* open channel tree */
     if ((rv = l2_channel_open(ch)) != L2_OK)
         die(env, rv, "failed to open channel tree");
-    
+
     /* loop over stdin */
     while (fgets(caBuf, sizeof(caBuf), stdin) != NULL) {
         /* strip newline */


ossp-pkg/l2/l2tool.pod 1.3 -> 1.4

--- l2tool.pod   2002/07/30 19:08:25     1.3
+++ l2tool.pod   2003/01/06 11:41:52     1.4
@@ -1,9 +1,10 @@
 ##
-##  OSSP l2 - 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/)
+##  OSSP l2 - Flexible Logging
+##  Copyright (c) 2001-2003 Cable & Wireless Deutschland GmbH
+##  Copyright (c) 2001-2003 The OSSP Project (http://www.ossp.org/)
+##  Copyright (c) 2001-2003 Ralf S. Engelschall <rse@engelschall.com>
 ##
-##  This file is part of OSSP L2, a flexible logging library which
+##  This file is part of OSSP l2, a flexible logging library which
 ##  can be found at http://www.ossp.org/pkg/lib/l2/.
 ##
 ##  Permission to use, copy, modify, and distribute this software for
@@ -24,18 +25,18 @@
 ##  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 ##  SUCH DAMAGE.
 ##
-##  l2tool.pod: L2 tool manual page
+##  l2tool.pod: tool manual page
 ##
 
 =pod
 
 =head1 NAME
 
-B<l2tool> - L2 loggin tool
+B<l2tool> - OSSP l2 logging tool
 
 =head1 VERSION
 
-OSSP L2 L2_VERSION_STR
+OSSP l2 L2_VERSION_STR
 
 =head1 SYNOPSIS
 

CVSTrac 2.0.1