bres: Use mdup to duplicate file descriptors for the child.

[mLib] / assoc.c

diff --git a/assoc.c b/assoc.c
index 26fe2c941a8af6c67baf2c0a56d5e549052d9bc9..05f27370e7a291f03f4ef61421c668417c85e6ee 100644 (file)
--- a/assoc.c
+++ b/assoc.c
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: assoc.c,v 1.1 2001/01/20 11:50:58 mdw Exp $
+ * $Id: assoc.c,v 1.4 2004/04/08 01:36:11 mdw Exp $
  *
  * Assocation tables
  *
  * (c) 2000 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of the mLib utilities library.
  *
@@ -15,27 +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.
- * 
+ *
  * mLib 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 mLib; if not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: assoc.c,v $
- * Revision 1.1  2001/01/20 11:50:58  mdw
- * Hash tables indexed by atoms, to avoid expense of hashing keys on each
- * lookup, and to reduce storage used by key texts.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include "alloc.h"
@@ -77,6 +68,8 @@ void assoc_destroy(assoc_table *t)
   for (;;) {
     hash_base *p;
     HASH_NEXT(&i, p);
+    if (!p)
+      break;
     x_free(t->t.a, p);
   }
   hash_destroy(&t->t);
@@ -98,12 +91,12 @@ void assoc_destroy(assoc_table *t)
  *             the pointer returned.  The flag @*f@ is cleared if the item
  *             couldn't be found, or set if it was.
  *
- *             All the atoms used in a particular table should 
+ *             All the atoms used in a particular table should
  */
 
 void *assoc_find(assoc_table *t, atom *a, size_t sz, unsigned *f)
 {
-  hash_base **bin = HASH_BIN(&t->t, a->b.b.hash), **p;
+  hash_base **bin = HASH_BIN(&t->t, ATOM_HASH(a)), **p;
   assoc_base *q;
 
   /* --- Try to find the association --- */
@@ -127,6 +120,7 @@ void *assoc_find(assoc_table *t, atom *a, size_t sz, unsigned *f)
   /* --- Make a new assoication --- */
 
   q = x_alloc(t->t.a, sz);
+  q->a = a;
   q->b.next = *bin;
   q->b.hash = ATOM_HASH(a);
   *bin = &q->b;