Changeset 22259 for main

Timestamp:

2010-06-12T23:33:27+12:00 (14 years ago)

Author:

davidb

Message:

Tie Makefile and source code in with -DMSDOS so MinGW/MSys compilation works with GDBM

Location:

main/trunk/greenstone2/common-src/packages/gdbm/gdbm-1.8.3

Files:

• Makefile.in (modified) (1 diff)
• dbminit.c (modified) (1 diff)
• dbmopen.c (modified) (2 diffs)
• gdbmreorg.c (modified) (1 diff)

main/trunk/greenstone2/common-src/packages/gdbm/gdbm-1.8.3/Makefile.in

@@ -29 +29 @@
 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@
 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
+
+ifeq ($(GSDLOS), "windows")
+  # Let MinGW/MSys tap into Windows code for GDBM
+  CFLAGS += -DMSDOS
+endif
 
 # Common prefix for installation directories

main/trunk/greenstone2/common-src/packages/gdbm/gdbm-1.8.3/dbminit.c

@@ -76 +76 @@
 
   /* Try to open the file as a writer.  DBM never created a file. */
+#ifdef MSDOS
+  /* Not clear if final argument for Windows should be to obtain a
+     file lock or not.  Play it safe for now and ask for a lock
+  */
+  _gdbm_file = gdbm_open (pag_file, 0, GDBM_WRITER, 0, NULL, TRUE);
+#else
   _gdbm_file = gdbm_open (pag_file, 0, GDBM_WRITER, 0, NULL);
+#endif
 
   /* If it was not opened, try opening it as a reader. */
   if (_gdbm_file == NULL)
     {
+#ifdef MSDOS
+      _gdbm_file = gdbm_open (pag_file, 0, GDBM_READER, 0, NULL, TRUE);
+#else
       _gdbm_file = gdbm_open (pag_file, 0, GDBM_READER, 0, NULL);
-  
+#endif  
       /* Did we successfully open the file? */
       if (_gdbm_file == NULL)

main/trunk/greenstone2/common-src/packages/gdbm/gdbm-1.8.3/dbmopen.c

@@ -54 +54 @@
 
 gdbm_file_info *
+#ifdef MSDOS
+dbm_open (file, flags, mode, need_filelock)
+#else
 dbm_open (file, flags, mode)
+#endif
      char *file;
      int flags;
      int mode;
+#ifdef MSDOS
+     int need_filelock;
+#endif
+
 {
   char* pag_file;       /* Used to construct "file.pag". */
@@ -84 +92 @@
   if (flags == O_RDONLY)
     {
+#ifdef MSDOS
+      temp_dbf = gdbm_open (pag_file, 0, GDBM_READER, 0, NULL, need_filelock);
+#else
       temp_dbf = gdbm_open (pag_file, 0, GDBM_READER, 0, NULL);
+#endif
     }
   else if (flags == (O_RDWR | O_CREAT))
     {
+#ifdef MSDOS
+      temp_dbf = gdbm_open (pag_file, 0, GDBM_WRCREAT, mode, NULL, need_filelock);
+#else
       temp_dbf = gdbm_open (pag_file, 0, GDBM_WRCREAT, mode, NULL);
+#endif
     }
   else if ( (flags & O_TRUNC) == O_TRUNC)
     {
+#ifdef MSDOS
+      temp_dbf = gdbm_open (pag_file, 0, GDBM_NEWDB, mode, NULL, need_filelock);
+#else
       temp_dbf = gdbm_open (pag_file, 0, GDBM_NEWDB, mode, NULL);
+#endif
     }
   else
     {
+#ifdef MSDOS
+      temp_dbf = gdbm_open (pag_file, 0, GDBM_WRITER, 0, NULL, need_filelock);
+#else
       temp_dbf = gdbm_open (pag_file, 0, GDBM_WRITER, 0, NULL);
+#endif
     }
 

main/trunk/greenstone2/common-src/packages/gdbm/gdbm-1.8.3/gdbmreorg.c

@@ -113 +113 @@
   /* Get the mode for the old file and open the new database. */
   fstat (dbf->desc, &fileinfo);
+#ifdef MSDOS
+  /* Not clear if final argument for Windows should be to obtain a
+     file lock or not.  Play it safe for now and ask for a lock
+  */
+  new_dbf = gdbm_open (new_name, dbf->header->block_size, GDBM_WRCREAT,
+               fileinfo.st_mode, dbf->fatal_err,dbf->need_filelock);
+#else
   new_dbf = gdbm_open (new_name, dbf->header->block_size, GDBM_WRCREAT,
                fileinfo.st_mode, dbf->fatal_err);
+#endif
 
   if (new_dbf == NULL)