merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index 157dbff4db3e33144920b19efb561f5ecb157c5d..99bd9320278820f1f331e083212afaee8b46e8c8 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-24  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       * libiberty.h (reconcat): New function.
+
 2001-09-18  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        * libiberty.h (concat, concat_length, concat_copy, concat_copy2,

diff --git a/include/libiberty.h b/include/libiberty.h
index a54e3adf05e096a7f28c5033f9f320cc8354c2e8..315d3106c4b52b19eed34a9773e32ef18241db01 100644 (file)
--- a/include/libiberty.h
+++ b/include/libiberty.h
@@ -91,6 +91,15 @@ extern const char *lbasename PARAMS ((const char *));
 
 extern char *concat PARAMS ((const char *, ...)) ATTRIBUTE_MALLOC;
 
+/* Concatenate an arbitrary number of strings.  You must pass NULL as
+   the last argument of this function, to terminate the list of
+   strings.  Allocates memory using xmalloc.  The first argument is
+   not one of the strings to be concatenated, but if not NULL is a
+   pointer to be freed after the new string is created, similar to the
+   way xrealloc works.  */
+
+extern char *reconcat PARAMS ((char *, const char *, ...)) ATTRIBUTE_MALLOC;
+
 /* Determine the length of concatenating an arbitrary number of
    strings.  You must pass NULL as the last argument of this function,
    to terminate the list of strings.  */

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index d9dc3dcb8b3d5783692195d00f422c5cf61d35fc..22bf58cfad8cdd72387c78c5cbb237f4c4e51844 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-24  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       * concat.c (reconcat): New function.
+
 2001-09-17  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        * concat.c (vconcat_length, vconcat_copy, concat_length,

diff --git a/libiberty/concat.c b/libiberty/concat.c
index feed0df819bbce9a73ec303855de7d09ad7208b4..136e8be866ebee04f7cf2e0536708d332b910778 100644 (file)
--- a/libiberty/concat.c
+++ b/libiberty/concat.c
@@ -171,6 +171,31 @@ concat VPARAMS ((const char *first, ...))
   return newstr;
 }
 
+char *
+reconcat VPARAMS ((char *optr, const char *first, ...))
+{
+  char *newstr;
+
+  /* First compute the size of the result and get sufficient memory.  */
+  VA_OPEN (args, first);
+  VA_FIXEDARG (args, char *, optr);
+  VA_FIXEDARG (args, const char *, first);
+  newstr = (char *) xmalloc (vconcat_length (first, args) + 1);
+  VA_CLOSE (args);
+
+  /* Now copy the individual pieces to the result string. */
+  VA_OPEN (args, first);
+  VA_FIXEDARG (args, char *, optr);
+  VA_FIXEDARG (args, const char *, first);
+  vconcat_copy (newstr, first, args);
+  VA_CLOSE (args);
+
+  if (optr)
+    free (optr);
+
+  return newstr;
+}
+
 #ifdef MAIN
 #define NULLP (char *)0