Changeset 18074

Timestamp:

2008-12-04T14:08:23+13:00 (15 years ago)

Author:

mdewsnip

Message:

Added "need_filelock" stuff from old Windows GDBM port -- not sure if it is still necessary, but I'm not taking the chance.

Location:

gsdl/trunk/common-src/packages/gdbm/gdbm-1.8.3

Files:

• gdbmclose.c (modified) (1 diff)
• gdbmdefs.h (modified) (1 diff)
• gdbmopen.c (modified) (5 diffs)
• gdbmreorg.c (modified) (1 diff)
• proto.h (modified) (1 diff)
• windows/gdbm.h (modified) (1 diff)

gsdl/trunk/common-src/packages/gdbm/gdbm-1.8.3/gdbmclose.c

@@ -50 +50 @@
   if (dbf->file_locking)
     {
+#ifdef MSDOS
+      if (dbf->need_filelock) {
+    UNLOCK_FILE(dbf);
+      }
+#else
       UNLOCK_FILE(dbf);
+#endif
     }
   close (dbf->desc);

gsdl/trunk/common-src/packages/gdbm/gdbm-1.8.3/gdbmdefs.h

@@ -170 +170 @@
     void (*fatal_err) ();
 
+#ifdef MSDOS
+        int need_filelock;
+#endif
+
     /* The gdbm file descriptor which is set in gdbm_open.  */
     int desc;

gsdl/trunk/common-src/packages/gdbm/gdbm-1.8.3/gdbmopen.c

@@ -58 +58 @@
 
 gdbm_file_info *
+#ifdef MSDOS
+gdbm_open (file, block_size, flags, mode, fatal_func, need_filelock)
+#else
 gdbm_open (file, block_size, flags, mode, fatal_func)
+#endif
      char *file;
      int  block_size;
@@ -64 +68 @@
      int  mode;
      void (*fatal_func) ();
+#ifdef MSDOS
+     int need_filelock;
+#endif
 {
   gdbm_file_info *dbf;      /* The record to return. */
@@ -89 +96 @@
   /* Initialize some fields for known values.  This is done so gdbm_close
      will work if called before allocating some structures. */
+#ifdef MSDOS
+  dbf->need_filelock = need_filelock;
+#endif
   dbf->dir  = NULL;
   dbf->bucket = NULL;
@@ -187 +197 @@
       if (dbf->file_locking)
     {
-          /* Sets lock_val to 0 for success.  See systems.h. */
-          READLOCK_FILE(dbf);
+      /* Sets lock_val to 0 for success.  See systems.h. */
+#ifdef MSDOS
+      if (dbf->need_filelock) {
+        READLOCK_FILE(dbf);
+      }
+      else {
+        lock_val = 0;
+      }
+#else
+      READLOCK_FILE(dbf);
+#endif
     }
     }
@@ -194 +213 @@
     {
       /* Sets lock_val to 0 for success.  See systems.h. */
+#ifdef MSDOS
+      if (dbf->need_filelock) {
+    WRITELOCK_FILE(dbf);
+      }
+      else {
+    lock_val = 0;
+      }
+#else
       WRITELOCK_FILE(dbf);
+#endif
     }
   if (dbf->file_locking && (lock_val != 0))

gsdl/trunk/common-src/packages/gdbm/gdbm-1.8.3/gdbmreorg.c

@@ -182 +182 @@
   if (dbf->file_locking)
     {
+#ifdef MSDOS
+      if (dbf->need_filelock) {
+    UNLOCK_FILE(dbf);
+      }
+#else
       UNLOCK_FILE(dbf);
+#endif
     }
   close (dbf->desc);

gsdl/trunk/common-src/packages/gdbm/gdbm-1.8.3/proto.h

@@ -65 +65 @@
 int   gdbm_delete     __P((gdbm_file_info *, datum));
 datum gdbm_fetch      __P((gdbm_file_info *, datum));
+#ifdef MSDOS
+gdbm_file_info *gdbm_open __P((char *, int, int, int, void (*) (void), int));
+#else
 gdbm_file_info *gdbm_open __P((char *, int, int, int, void (*) (void)));
+#endif
 int   gdbm_reorganize     __P((gdbm_file_info *));
 datum gdbm_firstkey       __P((gdbm_file_info *));

gsdl/trunk/common-src/packages/gdbm/gdbm-1.8.3/windows/gdbm.h

@@ -83 +83 @@
 /* These are the routines! */
 
+#ifdef MSDOS
+extern GDBM_FILE gdbm_open __P((char *, int, int, int, void (*)(), int));
+#else
 extern GDBM_FILE gdbm_open __P((char *, int, int, int, void (*)()));
+#endif
 extern void gdbm_close __P((GDBM_FILE));
 extern int gdbm_store __P((GDBM_FILE, datum, datum, int));