/* -*-c-*-
*
- * $Id: lmem.c,v 1.2 2000/06/17 11:29:20 mdw Exp $
+ * $Id: lmem.c,v 1.5 2004/04/02 01:03:49 mdw Exp $
*
* Locked memory allocation (Unix-specific)
*
/*----- Revision history --------------------------------------------------*
*
* $Log: lmem.c,v $
+ * Revision 1.5 2004/04/02 01:03:49 mdw
+ * Miscellaneous constification.
+ *
+ * Revision 1.4 2002/01/24 22:26:11 mdw
+ * Fix build failure when @mlock@ not available.
+ *
+ * Revision 1.3 2000/07/29 21:58:15 mdw
+ * (l_destroy): New function for destroying locked memory blocks.
+ *
* Revision 1.2 2000/06/17 11:29:20 mdw
* Add arena support.
*
static void afree(arena *a, void *p) { l_free((lmem *)a, p); }
static void apurge(arena *a) { l_purge((lmem *)a); }
-static arena_ops l_ops = { aalloc, arena_fakerealloc, afree, apurge };
+static const arena_ops l_ops = { aalloc, arena_fakerealloc, afree, apurge };
/*----- Main code ---------------------------------------------------------*/
lm->a.ops = &l_ops;
lm->err = 0;
+ lm->f = 0;
/* --- Try making a secure locked passphrase buffer --- *
*
lm->err = errno;
munmap(p, sz);
p = 0;
- }
+ } else
+ lm->f |= LF_LOCKED;
#endif
#ifdef HAVE_MLOCK
if (!p)
#else
- ll->err = 0;
- ll->emsg = "locked memory not available on this system";
+ lm->err = 0;
+ lm->emsg = "locked memory not available on this system";
#endif
{
if ((p = malloc(sz)) == 0) {
lm->free = l->sz;
}
+/* --- @l_destroy@ --- *
+ *
+ * Arguments: @lmem *lm@ = pointer to locked memory descriptor
+ *
+ * Returns: ---
+ *
+ * Use: Disposes of a locked memory arena permanently.
+ */
+
+void l_destroy(lmem *lm)
+{
+ l_node *l;
+
+ l = lm->l;
+ while (l) {
+ l_node *ll = l->next;
+ DESTROY(l);
+ l = ll;
+ }
+ memset(lm->p, 0, lm->sz);
+
+ if (lm->f & LF_LOCKED)
+ munmap(lm->p, lm->sz);
+ else
+ free(lm->p);
+}
+
/* --- @l_report@ --- *
*
* Arguments: @lmem *lm@ = pointer to locked memory descriptor