X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/b817bfc642225b8c3c0b6a7e42d1fb949b61a606..02dfbd5b7af7816959dbd39c1fe628451204e35f:/key-attr.c

diff --git a/key-attr.c b/key-attr.c
index 7057570..61b12d5 100644
--- a/key-attr.c
+++ b/key-attr.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: key-attr.c,v 1.5 2004/04/08 01:36:15 mdw Exp $
+ * $Id$
  *
  * Key attribute manipulation
  *
@@ -117,8 +117,8 @@ int key_nextattr(key_attriter *i, const char **n, const char **v)
   key_attr *a = sym_next(&i->i);
   if (!a)
     return (0);
-  *n = SYM_NAME(a);
-  *v = a->p;
+  if (n) *n = SYM_NAME(a);
+  if (v) *v = a->p;
   return (1);
 }
 
@@ -168,10 +168,10 @@ int key_putattr(key_file *f, key *k, const char *n, const char *v)
   if (v) {
     a = sym_find(&k->a, n, -1, sizeof(*a), &found);
     if (found)
-      free(a->p);
+      xfree(a->p);
     a->p = xstrdup(v);
   } else if ((a = sym_find(&k->a, n, -1, 0, 0)) != 0) {
-    free(a->p);
+    xfree(a->p);
     sym_remove(&k->a, a);
   }
 
@@ -179,6 +179,28 @@ int key_putattr(key_file *f, key *k, const char *n, const char *v)
   return (0);
 }
 
+/* --- @key_setkeydata@ --- *
+ *
+ * Arguments:	@key_file *kf@ = pointer to key file
+ *		@key *k@ = pointer to key
+ *		@key_data *kd@ = new key data
+ *
+ * Returns:	Zero on success, or a @KERR_@ error code on failure.
+ *
+ * Use:		Sets the key data for a key.
+ */
+
+int key_setkeydata(key_file *kf, key *k, key_data *kd)
+{
+  if (!(kf->f & KF_WRITE))
+    return (KERR_READONLY);
+  key_drop(k->k);
+  key_incref(kd);
+  k->k = kd;
+  kf->f |= KF_MODIFIED;
+  return (0);
+}
+
 /* --- @key_setcomment@ --- *
  *
  * Arguments:	@key_file *f@ = pointer to key file block
@@ -197,7 +219,7 @@ int key_setcomment(key_file *f, key *k, const char *c)
   if (key_chkcomment(c))
     return (KERR_BADCOMMENT);
   if (k->c)
-    free(k->c);
+    xfree(k->c);
   if (c)
     k->c = xstrdup(c);
   else
@@ -251,7 +273,7 @@ int key_settag(key_file *f, key *k, const char *tag)
     kr = sym_find(&f->bytag, k->tag, -1, 0, 0);
     assert(((void)"No bytag link", kr));
     sym_remove(&f->bytag, kr);
-    free(k->tag);
+    xfree(k->tag);
   }
 
   /* --- Done --- */