Changeset 18038

Timestamp:

2008-12-03T14:13:06+13:00 (15 years ago)

Author:

mdewsnip

Message:

Code modifications to allow the GDBM library to read both little-endian and big-endian GDBM files, thus hopefully removing all the nasty endianness problems Greenstone has had with collections built on different architectures. By Michael Dewsnip at DL Consulting Ltd.

Location:

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

Files:

• Makefile.in (modified) (3 diffs)
• bucket.c (modified) (2 diffs)
• gdbmopen.c (modified) (4 diffs)
• gsdlmods.c (added)
• gsdlmods.h (added)

gsdl/trunk/common-src/packages/gdbm/gdbm-1.8.3/Makefile.in

@@ -68 +68 @@
     gdbmreorg.c gdbmseq.c gdbmsync.c gdbmerrno.c gdbmexists.c gdbmfdesc.c \
     gdbmsetopt.c bucket.c falloc.c findkey.c global.c hash.c update.c \
-    version.c
+    version.c gsdlmods.c
 
 TEST_CF = testdbm.c testndbm.c testgdbm.c
@@ -81 +81 @@
     gdbmreorg.o gdbmseq.o gdbmsync.o gdbmerrno.o gdbmexists.o gdbmfdesc.o \
     gdbmsetopt.o bucket.o falloc.o findkey.o global.o hash.o update.o \
-    version.o
+    version.o gsdlmods.o
 
 DBM_LOF = dbminit.lo delete.lo fetch.lo store.lo seq.lo close.lo
@@ -91 +91 @@
     gdbmreorg.lo gdbmseq.lo gdbmsync.lo gdbmerrno.lo gdbmexists.lo \
     gdbmfdesc.lo gdbmsetopt.lo bucket.lo falloc.lo findkey.lo global.lo \
-    hash.lo update.lo version.lo
+    hash.lo update.lo version.lo gsdlmods.lo
 
 TEX_F = gdbm.aux gdbm.cp gdbm.dvi gdbm.fn gdbm.ky gdbm.log gdbm.pg \

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

@@ -32 +32 @@
 
 #include "gdbmdefs.h"
+
+#include "gsdlmods.h"
 
 
@@ -115 +117 @@
       if (num_bytes != dbf->header->bucket_size)
     _gdbm_fatal (dbf, "read error");
+
+      // GREENSTONE CUSTOMISATION: Swap each value in the bucket if the GDBM file is the wrong endianness
+      if (wrong_endianness)
+      {
+    endian_swap_array((int*) dbf->bucket, dbf->header->bucket_size);
+      }
     }
 

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

@@ -33 +33 @@
 #include "gdbmdefs.h"
 #include "gdbmerrno.h"
+
+#include "gsdlmods.h"
+
 
 /* Initialize dbm system.  FILE is a pointer to the file name.  If the file
@@ -330 +333 @@
     }
 
+      // GREENSTONE CUSTOMISATION: Check if the magic number is reversed
+      // If it is then the GDBM file is the wrong endianness for the current machine
+      wrong_endianness = (partial_header.header_magic == 0xCE9A5713);
+
+      // GREENSTONE CUSTOMISATION: Swap each value in the partial header if the GDBM file is the wrong endianness
+      if (wrong_endianness)
+      {
+    endian_swap_array((int*) &partial_header, sizeof (gdbm_file_header));
+      }
+
       /* Is the magic number good? */
       if (partial_header.header_magic != 0x13579ace)
@@ -349 +362 @@
       num_bytes = read (dbf->desc, &dbf->header->avail.av_table[1],
             dbf->header->block_size-sizeof (gdbm_file_header));
+
+      // GREENSTONE CUSTOMISATION: Swap each value in the header if the GDBM file is the wrong endianness
+      if (wrong_endianness)
+      {
+    endian_swap_array((int*) &dbf->header->avail.av_table[1],
+              dbf->header->block_size-sizeof(gdbm_file_header));
+      }
+
       if (num_bytes != dbf->header->block_size-sizeof (gdbm_file_header))
     {
@@ -382 +403 @@
     }
 
+      // GREENSTONE CUSTOMISATION: Swap each value in the directory if the GDBM file is the wrong endianness
+      if (wrong_endianness)
+      {
+    endian_swap_array((int*) dbf->dir, dbf->header->dir_size);
+      }
     }