cc-hash.c (fhash): The FILE name may be null.

[u/mdw/catacomb] / lmem.c

diff --git a/lmem.c b/lmem.c
index e443aa6..a7033d0 100644 (file)
--- a/lmem.c
+++ b/lmem.c
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: lmem.c,v 1.1 1999/12/22 16:02:52 mdw Exp $
+ * $Id$
  *
  * Locked memory allocation (Unix-specific)
  *
  * (c) 1999 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,26 +15,18 @@
  * it under the terms of the GNU Library General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- * 
+ *
  * Catacomb is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Library General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Library General Public
  * License along with Catacomb; if not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: lmem.c,v $
- * Revision 1.1  1999/12/22 16:02:52  mdw
- * Interface to allocating `locked' memory (which isn't paged out).
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include "config.h"
@@ -52,11 +44,20 @@
 #  include <sys/mman.h>
 #endif
 
+#include <mLib/arena.h>
 #include <mLib/dstr.h>
 #include <mLib/sub.h>
 
 #include "lmem.h"
 
+/*----- Arena operations --------------------------------------------------*/
+
+static void *aalloc(arena *a, size_t sz) { return l_alloc((lmem *)a, sz); }
+static void afree(arena *a, void *p) { l_free((lmem *)a, p); }
+static void apurge(arena *a) { l_purge((lmem *)a); }
+
+static const arena_ops l_ops = { aalloc, arena_fakerealloc, afree, apurge };
+
 /*----- Main code ---------------------------------------------------------*/
 
 /* --- @l_init@ --- *
@@ -83,7 +84,9 @@ int l_init(lmem *lm, size_t sz)
 
   /* --- Preliminaries --- */
 
+  lm->a.ops = &l_ops;
   lm->err = 0;
+  lm->f = 0;
 
   /* --- Try making a secure locked passphrase buffer --- *
    *
@@ -120,7 +123,8 @@ int l_init(lmem *lm, size_t sz)
     lm->err = errno;
     munmap(p, sz);
     p = 0;
-  }
+  } else
+    lm->f |= LF_LOCKED;
 
 #endif
 
@@ -129,8 +133,8 @@ int l_init(lmem *lm, size_t sz)
 #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) {
@@ -282,6 +286,35 @@ void l_purge(lmem *lm)
   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);
+
+#ifdef HAVE_MLOCK
+  if (lm->f & LF_LOCKED)
+    munmap(lm->p, lm->sz);
+  else
+#endif
+    free(lm->p); /*sic*/
+}
+
 /* --- @l_report@ --- *
  *
  * Arguments:  @lmem *lm@ = pointer to locked memory descriptor