1 files changed, 24 insertions, 8 deletions

diff --git a/src/recover.c b/src/recover.c
index d6d4ff9..721c23f 100644
--- a/src/recover.c
+++ b/src/recover.c
@@ -303,33 +303,48 @@ run_recovery (GDBM_FILE dbf, GDBM_FILE new_dbf, gdbm_recovery *rcvr, int flags)
 		    return -1;
 		  continue;
 		}
 
 	      key.dptr   = dptr;
 	      key.dsize  = dbf->bucket->h_table[i].key_size;
 
 	      data.dptr  = dptr + key.dsize;
 	      data.dsize = dbf->bucket->h_table[i].data_size;
 	    
 	      if (gdbm_store (new_dbf, key, data, GDBM_INSERT) != 0)
 		{
-		  if (flags & GDBM_RCVR_ERRFUN)
-		    rcvr->errfun (rcvr->data,
-				  _("fatal: can't store element %d:%d (%lu:%d): %s"),
-				  bucket_dir, i,
-				  (unsigned long) dbf->bucket->h_table[i].data_pointer,
-				  dbf->bucket->h_table[i].key_size
+		  switch (gdbm_last_errno (new_dbf))
+		    {
+		    case GDBM_CANNOT_REPLACE:
+		      rcvr->duplicate_keys++;
+		      if (flags & GDBM_RCVR_ERRFUN)
+			rcvr->errfun (rcvr->data,
+		          _("ignoring duplicate key %d:%d (%lu:%d)"),
+			  bucket_dir, i,
+			  (unsigned long) dbf->bucket->h_table[i].data_pointer,
+			  dbf->bucket->h_table[i].key_size
+				      + dbf->bucket->h_table[i].data_size);
+		      break;
+		      
+		    default:
+		      if (flags & GDBM_RCVR_ERRFUN)
+			rcvr->errfun (rcvr->data,
+			  _("fatal: can't store element %d:%d (%lu:%d): %s"),
+			  bucket_dir, i,
+			  (unsigned long) dbf->bucket->h_table[i].data_pointer,
+			  dbf->bucket->h_table[i].key_size
 				    + dbf->bucket->h_table[i].data_size,
-				  gdbm_db_strerror (new_dbf));
-		  return -1;
+			  gdbm_db_strerror (new_dbf));
+		      return -1;
+		    }
 		}	
 	    }
 	}
     }
   
   return 0;
 }
 
 int
 gdbm_recover (GDBM_FILE dbf, gdbm_recovery *rcvr, int flags)
 { 
   GDBM_FILE new_dbf;	     /* The new file. */
@@ -347,24 +362,25 @@ gdbm_recover (GDBM_FILE dbf, gdbm_recovery *rcvr, int flags)
     }
 
   /* Initialize gdbm_recovery structure */
   if (!rcvr)
     {
       rcvr  = &rs;
       flags = 0;
     }
   rcvr->recovered_keys = 0;
   rcvr->recovered_buckets = 0;
   rcvr->failed_keys = 0;
   rcvr->failed_buckets = 0;
+  rcvr->duplicate_keys = 0;
   rcvr->backup_name = NULL;
 
   rc = 0;
   if ((flags & GDBM_RCVR_FORCE) || check_db (dbf))
     {
       len = strlen (dbf->name);
       new_name = malloc (len + sizeof (TMPSUF));
       if (!new_name)
 	{
 	  GDBM_SET_ERRNO (NULL, GDBM_MALLOC_ERROR, FALSE);
 	  return -1;
 	}