X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=res%2Blog%2Fgw-res.c;h=68b6b331d90e7a377699193e0a8895a4016011e0;hb=373495ef158d123d95ab44465d4249e65847492b;hp=3e43e77514b7d2dabbfa80301cb92d77f3f37dd1;hpb=5bc115d3b598f5ad198411dcd033a91a8356c9be;p=egate.git

diff --git a/res+log/gw-res.c b/res+log/gw-res.c
index 3e43e77..68b6b33 100644
--- a/res+log/gw-res.c
+++ b/res+log/gw-res.c
@@ -1,16 +1,71 @@
 /*
-   gw-res.c: Implementation of resource management.
-
-   Europagate, 1994-1995.
-
-   $Log: gw-res.c,v $
-   Revision 1.1  1995/02/09 17:27:11  adam
-   Initial revision
-
-
-   Initial:       Dec  8, 94 (Adam Dickmeiss)
-   Last update:   Dec 19, 94 (Adam Dickmeiss)
-
+ * Copyright (c) 1995, the EUROPAGATE consortium (see below).
+ *
+ * The EUROPAGATE consortium members are:
+ *
+ *    University College Dublin
+ *    Danmarks Teknologiske Videnscenter
+ *    An Chomhairle Leabharlanna
+ *    Consejo Superior de Investigaciones Cientificas
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation, in whole or in part, for any purpose, is hereby granted,
+ * provided that:
+ *
+ * 1. This copyright and permission notice appear in all copies of the
+ * software and its documentation. Notices of copyright or attribution
+ * which appear at the beginning of any file must remain unchanged.
+ *
+ * 2. The names of EUROPAGATE or the project partners may not be used to
+ * endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * 3. Users of this software (implementors and gateway operators) agree to
+ * inform the EUROPAGATE consortium of their use of the software. This
+ * information will be used to evaluate the EUROPAGATE project and the
+ * software, and to plan further developments. The consortium may use
+ * the information in later publications.
+ * 
+ * 4. Users of this software agree to make their best efforts, when
+ * documenting their use of the software, to acknowledge the EUROPAGATE
+ * consortium, and the role played by the software in their work.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ * IN NO EVENT SHALL THE EUROPAGATE CONSORTIUM OR ITS MEMBERS BE LIABLE
+ * FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF
+ * ANY KIND, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+ * OR PROFITS, WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND
+ * ON ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE
+ * USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+/*
+ * Implementation of resource management.
+ *
+ * Europagate, 1994-1995.
+ *
+ * $Log: gw-res.c,v $
+ * Revision 1.7  1995/05/16 09:40:49  adam
+ * LICENSE.
+ *
+ * Revision 1.6  1995/04/19  12:12:07  adam
+ * Resource system uses only one log debug level.
+ *
+ * Revision 1.5  1995/02/23  08:32:22  adam
+ * Changed header.
+ *
+ * Revision 1.3  1995/02/21  14:00:11  adam
+ * Minor changes.
+ *
+ * Revision 1.2  1995/02/16  13:21:30  adam
+ * A few logging messages added.
+ *
+ * Revision 1.1.1.1  1995/02/09  17:27:12  adam
+ * Initial version of email gateway under CVS control.
+ *
+ * Initial:       Dec  8, 94 (Adam Dickmeiss)
  */
 #include <assert.h>
 #include <stdio.h>
@@ -220,9 +275,9 @@ int gw_res_merge (GwRes id, const char *filename)
     int err = 0;
 
     assert (id);
-    
-    gw_log (GW_LOG_DEBUG, "res", "gw_res_merge");
-    gw_log (GW_LOG_DEBUG, "res", "checking %s", filename);
+    assert (filename);
+    gw_log (RES_DEBUG, "res", "gw_res_merge");
+    gw_log (RES_DEBUG, "res", "checking %s", filename);
     if (!(inf = fopen (filename, "r")))
         return -1;
 #if HAVE_FLOCK
@@ -241,7 +296,7 @@ int gw_res_merge (GwRes id, const char *filename)
         fclose (inf);
         return -2;
     }
-    gw_log (GW_LOG_DEBUG, "res", "reading %s", filename);
+    gw_log (RES_DEBUG, "res", "reading %s", filename);
     ri->next = id->files;
     id->files = ri;
     rlp = &ri->lines;
@@ -343,27 +398,27 @@ int gw_res_merge (GwRes id, const char *filename)
     lock_file (fileno (inf), F_UNLCK);
 #endif
     fclose (inf);
-    gw_log (GW_LOG_DEBUG, "res", "close of %s", filename);
+    gw_log (RES_DEBUG, "res", "close of %s", filename);
     for (rl = ri->lines; rl; rl = rl->next)
     {
         switch (rl->kind)
         {
         case comment:
-            gw_log (GW_LOG_DEBUG, "res", "%s", rl->value);
+            gw_log (RES_DEBUG, "res", "%s", rl->value);
             break;
         case resource:
-            gw_log (GW_LOG_DEBUG, "res", "%s: %s", rl->name, rl->value);
+            gw_log (RES_DEBUG, "res", "%s: %s", rl->name, rl->value);
             if (symtab_override (id->symtab, rl) < 0)
                 err = -2;
             break;
         case blank:
-            gw_log (GW_LOG_DEBUG, "res", "");
+            gw_log (RES_DEBUG, "res", "");
             break;
         default:
             assert (0);
         }
     }
-    gw_log (GW_LOG_DEBUG, "res", "gw_res_merge returned %d", err);
+    gw_log (RES_DEBUG, "res", "gw_res_merge returned %d", err);
     return err;
 }
 
@@ -478,7 +533,7 @@ int gw_res_commit (GwRes id, const char *fname)
             while (1)
             {
                 int left = 78-pos;
-                if (strlen(rl->value+i) <= left)
+                if ((int) strlen(rl->value+i) <= left)
                     break;
                 while (left > 0)
                 {