General utilities cleanup. Add signature support to catcrypt. Throw in

[u/mdw/catacomb] / key-io.c

diff --git a/key-io.c b/key-io.c
index dbe8bdf..c78b967 100644 (file)
--- a/key-io.c
+++ b/key-io.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: key-io.c,v 1.4 2001/02/03 11:57:38 mdw Exp $
+ * $Id: key-io.c,v 1.6 2004/04/08 01:36:15 mdw Exp $
  *
  * Adding new keys to a key file
  *
@@ -27,23 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: key-io.c,v $
- * Revision 1.4  2001/02/03 11:57:38  mdw
- * Allow creating keyfiles with no file attached.
- *
- * Revision 1.3  2001/01/20 11:56:48  mdw
- * Use mLib exported tuning parameters for hashtable.
- *
- * Revision 1.2  2000/02/12 18:21:02  mdw
- * Overhaul of key management (again).
- *
- * Revision 1.1  1999/12/22 15:47:48  mdw
- * Major key-management revision.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include <ctype.h>
@@ -440,9 +423,10 @@ int key_extract(key_file *f, key *k, FILE *fp, const key_filter *kf)
 int key_open(key_file *f, const char *file, unsigned how,
             key_reporter *rep, void *arg)
 {
-  if (key_lockfile(f, file, how))
+  if (key_lockfile(f, file, how)) {
+    rep(file, 0, strerror(errno), arg);
     return (-1);
-
+  }
   f->f = 0;
   f->name = xstrdup(file);