From aa2828dbdd761411104b9996fbf1b2b7c1fdfe1b Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 1 Dec 1995 12:41:00 +0000
Subject: [PATCH] Bug fix.

---
 include/gw-log.h      |   21 ++++++++++++++++-----
 res+log/gw-log-test.c |   12 +++++++++++-
 res+log/gw-log.c      |    6 +++++-
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/include/gw-log.h b/include/gw-log.h
index 9c8b207..d2f10f2 100644
--- a/include/gw-log.h
+++ b/include/gw-log.h
@@ -48,7 +48,10 @@
  * Europagate, 1994-1995.
  *
  * $Log: gw-log.h,v $
- * Revision 1.8  1995/12/01 12:24:14  adam
+ * Revision 1.9  1995/12/01 12:41:00  adam
+ * Bug fix.
+ *
+ * Revision 1.8  1995/12/01  12:24:14  adam
  * New function: gw_log_mask_str.
  *
  * Revision 1.7  1995/05/16  09:39:39  adam
@@ -147,8 +150,8 @@ unsigned gw_log_mask_str (const char *str);
 /*
    Return the log level corresponding to str.
     str is a comma separated sequence of tokens. A token is one of:
-     "all", "default", "def", "fatal", "warn", "stat", "debug", "none"
-     or "debug"<n> where n is 0..9.
+     "all", "default", "def", "fatal", "warn", "stat", "notice", "debug",
+     "none" or "debug"<n> where n is 0..9.
     The level of each token are ORed with initial level being GW_LOG_DEFAULT
     unless first token is "none" in which case the initial level is 0 (none).
  */
@@ -161,13 +164,21 @@ char *gw_strdup (const char *s);
 
 
 /* log file format:
-   <appname> <session> <date> <level> <type> <parameter>
+   <appname> <session> <time> <level> <type> <parameter>
 
    Assuming that a 'token' is separated by one or more blanks we have:
 
    <appname>   one token
    <session>   one token
-   <date>      one token yymmddhhmmss
+   <time>      three tokens yymmdd hhmmss sss
+                            | | |  | | |   |_ milliseconds
+                            | | |  | | |_____ seconds
+                            | | |  | |_______ minutes
+                            | | |  |_________ hours
+                            | | |____________ day
+                            | |______________ month
+                            |________________ year
+
    <level>     one token
    <type>      one token
 
diff --git a/res+log/gw-log-test.c b/res+log/gw-log-test.c
index 4cadd56..244a759 100644
--- a/res+log/gw-log-test.c
+++ b/res+log/gw-log-test.c
@@ -47,7 +47,10 @@
  * Europagate, 1994-1995.
  *
  * $Log: gw-log-test.c,v $
- * Revision 1.5  1995/05/16 09:40:48  adam
+ * Revision 1.6  1995/12/01 12:41:03  adam
+ * Bug fix.
+ *
+ * Revision 1.5  1995/05/16  09:40:48  adam
  * LICENSE.
  *
  * Revision 1.4  1995/04/10  13:20:25  adam
@@ -71,8 +74,15 @@
 
 int main (int argc, char **argv)
 {
+    int i;
     gw_log_init (*argv);
 
+    for (i = 1; i<argc; i++)
+    {
+        printf ("level %s -> %u\n", argv[i], gw_log_mask_str (argv[i]));
+        fflush (stdout);
+    }
+    
     gw_log_file (GW_LOG_ALL, "all.log");
     gw_log_file (GW_LOG_WARN, "warn.log");
 
diff --git a/res+log/gw-log.c b/res+log/gw-log.c
index 3a5e6f5..2c5b5e1 100644
--- a/res+log/gw-log.c
+++ b/res+log/gw-log.c
@@ -47,7 +47,10 @@
  * Europagate, 1994-1995.
  *
  * $Log: gw-log.c,v $
- * Revision 1.12  1995/12/01 12:24:17  adam
+ * Revision 1.13  1995/12/01 12:41:03  adam
+ * Bug fix.
+ *
+ * Revision 1.12  1995/12/01  12:24:17  adam
  * New function: gw_log_mask_str.
  *
  * Revision 1.11  1995/11/09  09:54:28  adam
@@ -254,6 +257,7 @@ static struct {
     { GW_LOG_WARN,      "warn"   },
     { GW_LOG_ACCT,      "acct"   },
     { GW_LOG_STAT,      "stat"   },
+    { GW_LOG_NOTICE,    "notice"   },
     { GW_LOG_DEBUG,     "debug"  },
     { GW_LOG_DEBUGN(0), "debug0" },
     { GW_LOG_DEBUGN(1), "debug1" },
-- 
1.7.10.4