X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fgw-db.c;h=6ee26ee84ad679ee1ecaceb8843d305cfb548fb2;hb=25db261b6bbbfcc7bc26f679f195b51d31b9d7d7;hp=0b84d8c38916d51922839c2d0974571121d1dffb;hpb=03764a355d7c83d58dc7129680faed15a7353346;p=egate.git

diff --git a/util/gw-db.c b/util/gw-db.c
index 0b84d8c..6ee26ee 100644
--- a/util/gw-db.c
+++ b/util/gw-db.c
@@ -1,8 +1,62 @@
+/*
+ * 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.
+ *
+ */
 /* Gateway utility
  * Europagate, 1995
  *
  * $Log: gw-db.c,v $
- * Revision 1.2  1995/05/01 12:43:57  adam
+ * Revision 1.5  1996/01/24 17:00:12  adam
+ * Bug fix: missing argument to gw_log-call.
+ *
+ * Revision 1.4  1995/12/20  16:28:07  adam
+ * Extra parameter block to gw_db_open. If block is 0 gw_db_open
+ * returns NULL if lock couldn't be satisfied.
+ * Minor changes in iso2709.c.
+ *
+ * Revision 1.3  1995/05/16  09:40:53  adam
+ * LICENSE.
+ *
+ * Revision 1.2  1995/05/01  12:43:57  adam
  * lgets function moved from kernel to util.
  *
  * Revision 1.1  1995/03/27  08:25:01  adam
@@ -18,6 +72,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
+#include <gw-log.h>
 #include <gw-db.h>
 
 #define FILE_HEAD_LEN 128
@@ -41,6 +96,8 @@ struct db_bucket {         /* information about individual entries */
     int  prev;             /* prev in hach chain - possibly 0 */
 };
 
+static char *mod = "gwdb";
+
 /*
  * write_head: write header of table
  */
@@ -76,16 +133,17 @@ static unsigned hash (const char *name, int length)
 /*
  * lock_file: lock entire file 
  */
-static void lock_file (int fd, int type)
+static int lock_file (int fd, int block, int type)
 {
     struct flock area;
     area.l_type = type;
     area.l_whence = SEEK_SET;
     area.l_start = 0L;
     area.l_len = 0L;
-    fcntl (fd, F_SETLKW, &area);
+    return fcntl (fd, block ? F_SETLKW : F_SETLK, &area);
 }
 
+
 /*
  * gw_db_lookup: table lookup
  */
@@ -241,24 +299,52 @@ static GW_DB gw_db_free (GW_DB db)
 /*
  * gw_db_open: open and lock table for reading (and writing)
  */
-GW_DB gw_db_open (const char *fname, int write_flag)
+GW_DB gw_db_open (const char *fname, int write_flag, int block)
 {
     char file_head_buf[FILE_HEAD_LEN];
     GW_DB db;
     int r;
 
-    if (!(db = malloc (sizeof(*db))))
-        return NULL;
+    db = malloc (sizeof(*db));
+    if (!db)
+    {
+        gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "malloc");
+        exit (1);
+    }
     db->dirty = 0;
     if (!(db->hash_array = malloc (DB_HASH * sizeof(*db->hash_array))))
-        return gw_db_free (db);
+    {
+        gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "malloc");
+        exit (1);
+    }
     if (write_flag)
-        db->fd = open (fname, O_RDWR|O_CREAT, 0666);
+    {
+        if ((db->fd = open (fname, O_RDWR|O_CREAT, 0666)) == -1)
+        {
+            gw_log (GW_LOG_FATAL|GW_LOG_ERRNO, mod, "open %s", fname);
+            exit (1);
+        }
+    }
     else
-        db->fd = open (fname, O_RDONLY);
-    if (db->fd == -1)
-        return gw_db_free (db);
-    lock_file (db->fd, write_flag ? F_WRLCK : F_RDLCK);
+    {
+        if ((db->fd = open (fname, O_RDONLY)) == -1)
+        {
+            gw_log (GW_LOG_WARN|GW_LOG_ERRNO, mod, " open %s", fname);
+            return gw_db_free (db);
+        }
+    }
+    if (block)
+        lock_file (db->fd, 1, write_flag ? F_WRLCK : F_RDLCK);
+    else
+    {
+        r = lock_file (db->fd, 0, write_flag ? F_WRLCK : F_RDLCK);
+        if (r == -1)
+        {
+            gw_log (GW_LOG_WARN|GW_LOG_ERRNO, mod, "flock %s", fname);
+            close (db->fd);
+            return gw_db_free (db);
+        }
+    }
     r = read (db->fd, file_head_buf, FILE_HEAD_LEN);
     if (r == -1)
         return gw_db_free (db);
@@ -294,7 +380,7 @@ int gw_db_close (GW_DB db)
 
     if (db->dirty) 
         r = write_head (db);
-    lock_file (db->fd, F_UNLCK);
+    lock_file (db->fd, 1, F_UNLCK);
     if (close (db->fd) == -1)
     {
         gw_db_free (db);