Various bugfixes.

* compat/dbmopen.c (ndbm_open_dir_file0): Ignore ENOENT.
* src/falloc.c (push_avail_block): Free temporary storage no matter
what return status.
* src/gdbm.h.in (GDBM_FILE_TRUNCATE_ERROR): New error code.
* src/gdbmdump.c (_gdbm_dump_ascii): Initialize rc.
* src/gdbmerrno.c: Handle new error.code
* src/gdbmload.c (gdbm_load_bdb_dump): Initialize rc
* src/gdbmopen.c (_gdbm_ftruncate): New function.
(gdbm_fd_open): Use _gdbm_ftruncate. Check its return.
* src/gdbmseq.c (gdbm_firstkey): Initialize dsize
* src/gdbmtool.c (command_generator): Check if cmd is NULL.
(shouldn't happen, but anyways).
* src/mmap.c (_gdbm_mapped_lseek): Check for vailidity of the 'whence'
parameter.
* src/systems.h (TRUNCATE): Remove macro.
* src/util.c (vgetyn): Remove unnecessary assignment.

11 files changed, 75 insertions, 39 deletions

diff --git a/src/falloc.c b/src/falloc.c
index 09b40d4..7a94afb 100644
--- a/src/falloc.c
+++ b/src/falloc.c
@@ -310,39 +310,49 @@ push_avail_block (GDBM_FILE dbf)
       dbf->header->avail.av_table[index>>1]
         = dbf->header->avail.av_table[index];
 
   /* Update the header avail count to previous size divided by 2. */
   dbf->header->avail.count >>= 1;
 
-  /* Free the unneeded space. */
-  new_loc.av_adr += av_size;
-  new_loc.av_size -= av_size;
-  _gdbm_free (dbf, new_loc.av_adr, new_loc.av_size);
-
-  /* Update the disk. */
-  file_pos = gdbm_file_seek (dbf, av_adr, SEEK_SET);
-  if (file_pos != av_adr)
+  rc = 0;
+  do
     {
-      GDBM_SET_ERRNO (dbf, GDBM_FILE_SEEK_ERROR, TRUE);
-      _gdbm_fatal (dbf, _("lseek error"));
-      return -1;
-    }
+      /* Free the unneeded space. */
+      new_loc.av_adr += av_size;
+      new_loc.av_size -= av_size;
+      if (_gdbm_free (dbf, new_loc.av_adr, new_loc.av_size))
+        {
+          rc = -1;
+          break;
+        }
+  
+      /* Update the disk. */
+      file_pos = gdbm_file_seek (dbf, av_adr, SEEK_SET);
+      if (file_pos != av_adr)
+        {
+          GDBM_SET_ERRNO (dbf, GDBM_FILE_SEEK_ERROR, TRUE);
+          _gdbm_fatal (dbf, _("lseek error"));
+          rc = -1;
+          break;
+        }
 
-  rc = _gdbm_full_write (dbf, temp, av_size);
-  if (rc)
-    {
-      GDBM_DEBUG (GDBM_DEBUG_STORE|GDBM_DEBUG_ERR,
-                  "%s: error writing avail data: %s",
-                  dbf->name, gdbm_db_strerror (dbf));     
-      _gdbm_fatal (dbf, gdbm_db_strerror (dbf));
-      return -1;
+      rc = _gdbm_full_write (dbf, temp, av_size);
+      if (rc)
+        {
+          GDBM_DEBUG (GDBM_DEBUG_STORE|GDBM_DEBUG_ERR,
+                      "%s: error writing avail data: %s",
+                      dbf->name, gdbm_db_strerror (dbf));         
+          _gdbm_fatal (dbf, gdbm_db_strerror (dbf));
+          rc = -1;
+        }
     }
-
+  while (0);
+  
   free (temp);
 
-  return 0;
+  return rc;
 }
 
 /* AV_TABLE contains COUNT entries sorted by AV_SIZE in ascending order.
    Avail_lookup returns index of an item whose AV_SIZE member is greater
    than or equal to SIZE. */
 static int
diff --git a/src/gdbm.h.in b/src/gdbm.h.in
index 6318ad8..f5eadc5 100644
--- a/src/gdbm.h.in
+++ b/src/gdbm.h.in
@@ -224,15 +224,16 @@ extern int gdbm_copy_meta (GDBM_FILE dst, GDBM_FILE src);
 # define GDBM_BAD_HEADER                33
 # define GDBM_BAD_AVAIL                 34
 # define GDBM_BAD_HASH_TABLE            35
 # define GDBM_BAD_DIR_ENTRY             36
 # define GDBM_FILE_CLOSE_ERROR          37  
 # define GDBM_FILE_SYNC_ERROR           38
+# define GDBM_FILE_TRUNCATE_ERROR       39
   
 # define _GDBM_MIN_ERRNO        0
-# define _GDBM_MAX_ERRNO        GDBM_FILE_SYNC_ERROR
+# define _GDBM_MAX_ERRNO        GDBM_FILE_TRUNCATE_ERROR
 
 /* This one was never used and will be removed in the future */
 # define GDBM_UNKNOWN_UPDATE GDBM_UNKNOWN_ERROR
   
 typedef int gdbm_error;
 extern int *gdbm_errno_location (void);
diff --git a/src/gdbmdump.c b/src/gdbmdump.c
index 2e6f5b0..a8c4ec5 100644
--- a/src/gdbmdump.c
+++ b/src/gdbmdump.c
@@ -59,13 +59,13 @@ _gdbm_dump_ascii (GDBM_FILE dbf, FILE *fp)
   struct passwd *pw;
   struct group *gr;
   datum key;
   size_t count = 0;
   unsigned char *buffer = NULL;
   size_t bufsize = 0;
-  int rc;
+  int rc = 0;
 
   fd = gdbm_fdesc (dbf);
   if (fstat (fd, &st))
     return GDBM_FILE_STAT_ERROR;
 
   /* Print header */
diff --git a/src/gdbmerrno.c b/src/gdbmerrno.c
index 4ce7f9d..6758272 100644
--- a/src/gdbmerrno.c
+++ b/src/gdbmerrno.c
@@ -135,13 +135,14 @@ const char * const gdbm_errlist[_GDBM_MAX_ERRNO+1] = {
   [GDBM_BAD_BUCKET]             = N_("Malformed bucket header"),
   [GDBM_BAD_HEADER]             = N_("Malformed database file header"),
   [GDBM_BAD_AVAIL]              = N_("Malformed avail_block"),
   [GDBM_BAD_HASH_TABLE]         = N_("Malformed hash table"),
   [GDBM_BAD_DIR_ENTRY]          = N_("Invalid directory entry"),
   [GDBM_FILE_CLOSE_ERROR]       = N_("Error closing file"),
-  [GDBM_FILE_SYNC_ERROR]        = N_("Error synchronizing file")
+  [GDBM_FILE_SYNC_ERROR]        = N_("Error synchronizing file"),
+  [GDBM_FILE_TRUNCATE_ERROR]    = N_("Error truncating file")
 };
 
 const char *
 gdbm_strerror (gdbm_error error)
 {
   if (error < _GDBM_MIN_ERRNO || error > _GDBM_MAX_ERRNO)
@@ -179,13 +180,14 @@ int const gdbm_syserr[_GDBM_MAX_ERRNO+1] = {
   [GDBM_FILE_WRITE_ERROR]       = 1,
   [GDBM_FILE_SEEK_ERROR]        = 1,
   [GDBM_FILE_READ_ERROR]        = 1,
   [GDBM_FILE_STAT_ERROR]        = 1,
   [GDBM_BACKUP_FAILED]          = 1,
   [GDBM_FILE_CLOSE_ERROR]       = 1,
-  [GDBM_FILE_SYNC_ERROR]        = 1
+  [GDBM_FILE_SYNC_ERROR]        = 1,
+  [GDBM_FILE_TRUNCATE_ERROR]    = 1
 };
 
 /* Returns true if system errno value is meaningful for GDBM error
    code N. */
 int
 gdbm_check_syserr (gdbm_error n)
diff --git a/src/gdbmload.c b/src/gdbmload.c
index 008bcb9..f5b7869 100644
--- a/src/gdbmload.c
+++ b/src/gdbmload.c
@@ -539,12 +539,13 @@ gdbm_load_bdb_dump (struct dump_file *file, GDBM_FILE dbf, int replace)
   
   if (read_bdb_header (file))
     return -1;
   memset (&xd, 0, sizeof (xd));
   xs[0] = xs[1] = 0;
   i = 0;
+  rc = 0;
   while ((c = fgetc (file->fp)) == ' ')
     {
       rc = xdatum_read (file->fp, &xd[i], &xs[i]);
       if (rc)
         break;
       ++file->line;
diff --git a/src/gdbmopen.c b/src/gdbmopen.c
index 908887c..7ec57e7 100644
--- a/src/gdbmopen.c
+++ b/src/gdbmopen.c
@@ -196,12 +196,27 @@ validate_header (gdbm_file_header const *hdr, struct stat const *st)
       != hdr->avail.size)
     return GDBM_BAD_HEADER;    
   
   return 0;
 }
   
+/* Do we have ftruncate? */
+static inline int
+_gdbm_ftruncate (GDBM_FILE dbf)
+{
+#if HAVE_FTRUNCATE
+  return ftruncate (dbf->desc, 0);
+#else
+  int fd;
+  fd = open (dbf->name, O_RDWR|O_TRUNC, mode);
+  if (fd == -1)
+    return -1;
+  return close (fd);
+#endif
+}
+
 GDBM_FILE 
 gdbm_fd_open (int fd, const char *file_name, int block_size,
               int flags, void (*fatal_func) (const char *))
 {