debian/control: Don't require `valgrind' on `armel'.

[catacomb] / key / key-io.c

diff --git a/key/key-io.c b/key/key-io.c
index df7cd53..c79c8e0 100644 (file)
--- a/key/key-io.c
+++ b/key/key-io.c
@@ -352,7 +352,7 @@ int key_extract(key_file *f, key *k, FILE *fp, const key_filter *kf)
 
   key_fulltag(k, &d);
   DPUTC(&d, ' ');
-  key_write(k->k, &d, kf);
+  if (!key_write(k->k, &d, kf)) dstr_puts(&d, "struct:[]");
   DPUTC(&d, ' ');
   dstr_write(&d, fp);
   DRESET(&d);
@@ -439,7 +439,7 @@ int key_open(key_file *f, const char *file, unsigned how,
 
   if ((how & KOPEN_MASK) == KOPEN_READ) {
     f->f &= ~KF_WRITE;
-    fclose(f->fp);
+    if (f->fp) fclose(f->fp);
     f->fp = 0;
   }