Fix cpplib memory leaks

[Neil Booth <neil at daikokuya dot demon dot co dot uk>]

I've been playing with NJAMD after Daniel mentioned it, and since I'd
re-enabled memory cleanup for stand-alone CPP.  It found a few memory
leaks.  The good news is that there aren't many; the bad news is that
most of the ones that do exist are large. :-) The biggies are that
since merging hash table implementations, we weren't freeing the hash
table properly, nor was I freeing the allocation pools properly
either.  I want to get rid of the allocation pools eventually, but
that can't happen until I fix the macro expander to work with pointers
to tokens rather than tokens themselves.

It also found what appears to be 3 small leaks in GLIBC's <intl.h>
implementation of textdomain and bindtextdomain, and a bunch of small
leaks in prefix.c.  I'll come back to the prefix.c leaks in a followup
patch, since it's a little tricky and I don't have write privileges
there.

This also contains Matt Kraai's one-liner fix to the previous patch,
since I'd committed the previous patch before reading his email.

Bootstrapping and making check x86 Linux.

Neil.

	* cpphash.c (_cpp_destroy_hashtable): Use ht_destroy.
	* cpphash.h (CPP_IN_SYSTEM_HEADER): Fix.
	(struct cpp_pool): New member first.
	* cppinit.c (append_include_chain): Plug memory leaks.
	* cpplib.c (cpp_register_pragma, cpp_register_pragma_space):
	Allocate pragma structures from the (aligned) macro pool to
	avoid leaking memory.
	* cpplex.c (_cpp_init_pool, _cpp_free_pool): Use pool->first
	so we don't leak memory.
	* hashtable.c (ht_destroy): New.
	* hashtable.h (ht_destroy): New.

Index: cpphash.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cpphash.c,v
retrieving revision 1.113
diff -u -p -r1.113 cpphash.c
--- cpphash.c	2001/05/30 21:09:15	1.113
+++ cpphash.c	2001/08/11 08:51:00
@@ -73,7 +73,7 @@ _cpp_destroy_hashtable (pfile)
 {
   if (pfile->our_hashtable)
     {
-      free (pfile->hash_table);
+      ht_destroy (pfile->hash_table);
       obstack_free (&pfile->hash_ob, 0);
     }
 }
Index: cpphash.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cpphash.h,v
retrieving revision 1.116
diff -u -p -r1.116 cpphash.h
--- cpphash.h	2001/08/11 08:02:54	1.116
+++ cpphash.h	2001/08/11 08:51:00
@@ -66,7 +66,7 @@ struct cpp_chunk
 typedef struct cpp_pool cpp_pool;
 struct cpp_pool
 {
-  struct cpp_chunk *cur, *locked;
+  struct cpp_chunk *cur, *locked, *first;
   unsigned char *pos;		/* Current position.  */
   unsigned int align;
   unsigned int locks;
@@ -368,7 +368,7 @@ extern unsigned char _cpp_trigraph_map[U
 /* Macros.  */
 
 #define CPP_PRINT_DEPS(PFILE) CPP_OPTION (PFILE, print_deps)
-#define CPP_IN_SYSTEM_HEADER(PFILE) (pfile->map && pfile->map->sysp)
+#define CPP_IN_SYSTEM_HEADER(PFILE) ((PFILE)->map && (PFILE)->map->sysp)
 #define CPP_PEDANTIC(PF) CPP_OPTION (PF, pedantic)
 #define CPP_WTRADITIONAL(PF) CPP_OPTION (PF, warn_traditional)
 
Index: cppinit.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cppinit.c,v
retrieving revision 1.169
diff -u -p -r1.169 cppinit.c
--- cppinit.c	2001/08/07 20:37:25	1.169
+++ cppinit.c	2001/08/11 08:51:06
@@ -197,8 +197,8 @@ path_include (pfile, list, path)
   while (1);
 }
 
-/* Append DIR to include path PATH.  DIR must be permanently allocated
-   and writable.  */
+/* Append DIR to include path PATH.  DIR must be allocated on the
+   heap; this routine takes responsibility for freeing it.  */
 static void
 append_include_chain (pfile, dir, path, cxx_aware)
      cpp_reader *pfile;
@@ -212,8 +212,12 @@ append_include_chain (pfile, dir, path, 
   unsigned int len;
 
   if (*dir == '\0')
-    dir = xstrdup (".");
+    {
+      free (dir);
+      dir = xstrdup (".");
+    }
   _cpp_simplify_pathname (dir);
+
   if (stat (dir, &st))
     {
       /* Dirs that don't exist are silently ignored.  */
@@ -221,12 +225,14 @@ append_include_chain (pfile, dir, path, 
 	cpp_notice_from_errno (pfile, dir);
       else if (CPP_OPTION (pfile, verbose))
 	fprintf (stderr, _("ignoring nonexistent directory \"%s\"\n"), dir);
+      free (dir);
       return;
     }
 
   if (!S_ISDIR (st.st_mode))
     {
       cpp_notice (pfile, "%s: Not a directory", dir);
+      free (dir);
       return;
     }
 
@@ -375,7 +381,7 @@ merge_include_chains (pfile)
 	brack = remove_dup_dir (pfile, qtail);
     }
   else
-      quote = brack;
+    quote = brack;
 
   CPP_OPTION (pfile, quote_include) = quote;
   CPP_OPTION (pfile, bracket_include) = brack;
Index: cpplex.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cpplex.c,v
retrieving revision 1.153
diff -u -p -r1.153 cpplex.c
--- cpplex.c	2001/08/07 20:37:25	1.153
+++ cpplex.c	2001/08/11 08:51:18
@@ -2109,7 +2109,8 @@ _cpp_init_pool (pool, size, align, temp)
   if (align & (align - 1))
     abort ();
   pool->align = align;
-  pool->cur = new_chunk (size);
+  pool->first = new_chunk (size);
+  pool->cur = pool->first;
   pool->locked = 0;
   pool->locks = 0;
   if (temp)
@@ -2136,7 +2137,7 @@ void
 _cpp_free_pool (pool)
      cpp_pool *pool;
 {
-  cpp_chunk *chunk = pool->cur, *next;
+  cpp_chunk *chunk = pool->first, *next;
 
   do
     {
@@ -2144,7 +2145,7 @@ _cpp_free_pool (pool)
       free (chunk->base);
       chunk = next;
     }
-  while (chunk && chunk != pool->cur);
+  while (chunk && chunk != pool->first);
 }
 
 /* Reserve LEN bytes from a memory pool.  */
Index: cpplib.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cpplib.c,v
retrieving revision 1.266
diff -u -p -r1.266 cpplib.c
--- cpplib.c	2001/08/11 08:02:54	1.266
+++ cpplib.c	2001/08/11 08:51:18
@@ -901,7 +901,8 @@ cpp_register_pragma (pfile, space, name,
     }
 
  found:
-  new = xnew (struct pragma_entry);
+  new = (struct pragma_entry *)
+    _cpp_pool_alloc (&pfile->macro_pool, sizeof (struct pragma_entry));
   new->name = name;
   new->len = strlen (name);
   new->isnspace = 0;
@@ -929,7 +930,8 @@ cpp_register_pragma_space (pfile, space)
       p = p->next;
     }
 
-  new = xnew (struct pragma_entry);
+  new = (struct pragma_entry *)
+    _cpp_pool_alloc (&pfile->macro_pool, sizeof (struct pragma_entry));
   new->name = space;
   new->len = len;
   new->isnspace = 1;
Index: hashtable.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/hashtable.c,v
retrieving revision 1.2
diff -u -p -r1.2 hashtable.c
--- hashtable.c	2001/05/20 08:13:32	1.2
+++ hashtable.c	2001/08/11 08:51:18
@@ -94,6 +94,17 @@ ht_create (order)
   return table;
 }
 
+/* Frees all memory associated with a hash table.  */
+
+void
+ht_destroy (table)
+     hash_table *table;
+{
+  obstack_free (&table->stack, NULL);
+  free (table->entries);
+  free (table);
+}
+
 /* Returns the hash entry for the a STR of length LEN.  If that string
    already exists in the table, returns the existing entry, and, if
    INSERT is CPP_ALLOCED, frees the last obstack object.  If the
Index: hashtable.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/hashtable.h,v
retrieving revision 1.1
diff -u -p -r1.1 hashtable.h
--- hashtable.h	2001/05/20 06:26:37	1.1
+++ hashtable.h	2001/08/11 08:51:18
@@ -64,8 +64,13 @@ struct ht
 };
 
 extern void gcc_obstack_init PARAMS ((struct obstack *));
+
 /* Initialise the hashtable with 2 ^ order entries.  */
 extern hash_table *ht_create PARAMS ((unsigned int order));
+
+/* Frees all memory associated with a hash table.  */
+extern void ht_destroy PARAMS ((hash_table *));
+
 extern hashnode ht_lookup PARAMS ((hash_table *, const unsigned char *,
 				   unsigned int, enum ht_lookup_option));