Merge branch 'master' into merge-job

[deliverable/binutils-gdb.git] / libiberty / dyn-string.c

diff --git a/libiberty/dyn-string.c b/libiberty/dyn-string.c
index f4a9d9a74f8368c44874145ebeb4a6f469a7bb65..441b36bf2406d69da5d0fc0c869a3bd43bc47bbe 100644 (file)
--- a/libiberty/dyn-string.c
+++ b/libiberty/dyn-string.c
@@ -1,5 +1,5 @@
 /* An abstract string datatype.
 /* An abstract string datatype.

-   Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1998-2019 Free Software Foundation, Inc.

    Contributed by Mark Mitchell (mark@markmitchell.com).
 
 This file is part of GNU CC.
    Contributed by Mark Mitchell (mark@markmitchell.com).
 
 This file is part of GNU CC.


@@ -9,6 +9,15 @@ it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
 

+In addition to the permissions in the GNU General Public License, the
+Free Software Foundation gives you unlimited permission to link the
+compiled version of this file into combinations with other programs,
+and to distribute those combinations without any restriction coming
+from the use of this file.  (The General Public License restrictions
+do apply in other respects; for example, they cover modification of
+the file, and distribution when not linked into a combined
+executable.)
+

 GNU CC 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 CC 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


@@ -16,8 +25,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to

-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */

 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"


@@ -41,41 +50,62 @@ Boston, MA 02111-1307, USA.  */
    embedded in another object.  The contents of of the string itself
    are still dynamically allocated.  The string initially is capable
    of holding at least SPACE characeters, including the terminating
    embedded in another object.  The contents of of the string itself
    are still dynamically allocated.  The string initially is capable
    of holding at least SPACE characeters, including the terminating

-   NUL.  If SPACE is 0, it will silently be increated to 1.  */
+   NUL.  If SPACE is 0, it will silently be increated to 1.  

 
 

-void
-dyn_string_init (ds_struct_ptr, space)
-     struct dyn_string *ds_struct_ptr;
-     int space;
+   If RETURN_ON_ALLOCATION_FAILURE is defined and memory allocation
+   fails, returns 0.  Otherwise returns 1.  */
+
+int
+dyn_string_init (struct dyn_string *ds_struct_ptr, int space)

 {
   /* We need at least one byte in which to store the terminating NUL.  */
   if (space == 0)
     space = 1;
 
 {
   /* We need at least one byte in which to store the terminating NUL.  */
   if (space == 0)
     space = 1;
 

+#ifdef RETURN_ON_ALLOCATION_FAILURE
+  ds_struct_ptr->s = (char *) malloc (space);
+  if (ds_struct_ptr->s == NULL)
+    return 0;
+#else
+  ds_struct_ptr->s = XNEWVEC (char, space);
+#endif

   ds_struct_ptr->allocated = space;
   ds_struct_ptr->allocated = space;

-  ds_struct_ptr->s = (char *) xmalloc (space);

   ds_struct_ptr->length = 0;
   ds_struct_ptr->s[0] = '\0';
   ds_struct_ptr->length = 0;
   ds_struct_ptr->s[0] = '\0';

-}    

 
 

-/* Create a new dynamic string capable of holding at least SPACE characters,
-   including the terminating NUL.  If SPACE is 0, it will be silently
-   increased to 1.  */
+  return 1;
+}
+
+/* Create a new dynamic string capable of holding at least SPACE
+   characters, including the terminating NUL.  If SPACE is 0, it will
+   be silently increased to 1.  If RETURN_ON_ALLOCATION_FAILURE is
+   defined and memory allocation fails, returns NULL.  Otherwise
+   returns the newly allocated string.  */

 
 dyn_string_t 
 
 dyn_string_t 

-dyn_string_new (space)
-     int space;
+dyn_string_new (int space)

 {
 {

-  dyn_string_t result = (dyn_string_t) xmalloc (sizeof (struct dyn_string));
+  dyn_string_t result;
+#ifdef RETURN_ON_ALLOCATION_FAILURE
+  result = (dyn_string_t) malloc (sizeof (struct dyn_string));
+  if (result == NULL)
+    return NULL;
+  if (!dyn_string_init (result, space))
+    {
+      free (result);
+      return NULL;
+    }
+#else
+  result = XNEW (struct dyn_string);

   dyn_string_init (result, space);
   dyn_string_init (result, space);

+#endif

   return result;
 }
 
 /* Free the memory used by DS.  */
 
 void 
   return result;
 }
 
 /* Free the memory used by DS.  */
 
 void 

-dyn_string_delete (ds)
-     dyn_string_t ds;
+dyn_string_delete (dyn_string_t ds)

 {
   free (ds->s);
   free (ds);
 {
   free (ds->s);
   free (ds);


@@ -83,44 +113,54 @@ dyn_string_delete (ds)
 
 /* Returns the contents of DS in a buffer allocated with malloc.  It
    is the caller's responsibility to deallocate the buffer using free.
 
 /* Returns the contents of DS in a buffer allocated with malloc.  It
    is the caller's responsibility to deallocate the buffer using free.

-   DS is then set to the empty string.  */
+   DS is then set to the empty string.  Deletes DS itself.  */

 
 char*
 
 char*

-dyn_string_release (ds)
-     dyn_string_t ds;
+dyn_string_release (dyn_string_t ds)

 {
   /* Store the old buffer.  */
   char* result = ds->s;
   /* The buffer is no longer owned by DS.  */
   ds->s = NULL;
 {
   /* Store the old buffer.  */
   char* result = ds->s;
   /* The buffer is no longer owned by DS.  */
   ds->s = NULL;

-  /* Reinitialize DS to the empty string.  */
-  dyn_string_init (ds, 0);
+  /* Delete DS.  */
+  free (ds);

   /* Return the old buffer.  */
   return result;
 }
 
 /* Increase the capacity of DS so it can hold at least SPACE
    characters, plus the terminating NUL.  This function will not (at
   /* Return the old buffer.  */
   return result;
 }
 
 /* Increase the capacity of DS so it can hold at least SPACE
    characters, plus the terminating NUL.  This function will not (at

-   present) reduce the capacity of DS.  */
+   present) reduce the capacity of DS.  Returns DS on success. 
+
+   If RETURN_ON_ALLOCATION_FAILURE is defined and a memory allocation
+   operation fails, deletes DS and returns NULL.  */

 
 dyn_string_t 
 
 dyn_string_t 

-dyn_string_resize (ds, space)
-     dyn_string_t ds;
-     int space;
+dyn_string_resize (dyn_string_t ds, int space)

 {
   int new_allocated = ds->allocated;
 
   /* Increase SPACE to hold the NUL termination.  */
   ++space;
 
 {
   int new_allocated = ds->allocated;
 
   /* Increase SPACE to hold the NUL termination.  */
   ++space;
 

+  /* Increase allocation by factors of two.  */

   while (space > new_allocated)
     new_allocated *= 2;
     
   if (new_allocated != ds->allocated)
     {
   while (space > new_allocated)
     new_allocated *= 2;
     
   if (new_allocated != ds->allocated)
     {

-      /* We actually need more space.  */

       ds->allocated = new_allocated;
       ds->allocated = new_allocated;

-      ds->s = (char *) xrealloc (ds->s, ds->allocated);
+      /* We actually need more space.  */
+#ifdef RETURN_ON_ALLOCATION_FAILURE
+      ds->s = (char *) realloc (ds->s, ds->allocated);
+      if (ds->s == NULL)
+       {
+         free (ds);
+         return NULL;
+       }
+#else
+      ds->s = XRESIZEVEC (char, ds->s, ds->allocated);
+#endif

     }
 
   return ds;
     }
 
   return ds;


@@ -129,8 +169,7 @@ dyn_string_resize (ds, space)
 /* Sets the contents of DS to the empty string.  */
 
 void
 /* Sets the contents of DS to the empty string.  */
 
 void

-dyn_string_clear (ds)
-     dyn_string_t ds;
+dyn_string_clear (dyn_string_t ds)

 {
   /* A dyn_string always has room for at least the NUL terminator.  */
   ds->s[0] = '\0';
 {
   /* A dyn_string always has room for at least the NUL terminator.  */
   ds->s[0] = '\0';


@@ -138,77 +177,79 @@ dyn_string_clear (ds)
 }
 
 /* Makes the contents of DEST the same as the contents of SRC.  DEST
 }
 
 /* Makes the contents of DEST the same as the contents of SRC.  DEST

-   and SRC must be distinct.  */
+   and SRC must be distinct.  Returns 1 on success.  On failure, if
+   RETURN_ON_ALLOCATION_FAILURE, deletes DEST and returns 0.  */

 
 

-void
-dyn_string_copy (dest, src)
-     dyn_string_t dest;
-     dyn_string_t src;
+int
+dyn_string_copy (dyn_string_t dest, dyn_string_t src)

 {
   if (dest == src)
     abort ();
 
   /* Make room in DEST.  */
 {
   if (dest == src)
     abort ();
 
   /* Make room in DEST.  */

-  dyn_string_resize (dest, src->length);
+  if (dyn_string_resize (dest, src->length) == NULL)
+    return 0;

   /* Copy DEST into SRC.  */
   strcpy (dest->s, src->s);
   /* Update the size of DEST.  */
   dest->length = src->length;
   /* Copy DEST into SRC.  */
   strcpy (dest->s, src->s);
   /* Update the size of DEST.  */
   dest->length = src->length;

+  return 1;

 }
 
 }
 

-/* Copies SRC, a NUL-terminated string, into DEST.  */
+/* Copies SRC, a NUL-terminated string, into DEST.  Returns 1 on
+   success.  On failure, if RETURN_ON_ALLOCATION_FAILURE, deletes DEST
+   and returns 0.  */

 
 

-void
-dyn_string_copy_cstr (dest, src)
-     dyn_string_t dest;
-     const char *src;
+int
+dyn_string_copy_cstr (dyn_string_t dest, const char *src)

 {
   int length = strlen (src);
   /* Make room in DEST.  */
 {
   int length = strlen (src);
   /* Make room in DEST.  */

-  dyn_string_resize (dest, length);
+  if (dyn_string_resize (dest, length) == NULL)
+    return 0;

   /* Copy DEST into SRC.  */
   strcpy (dest->s, src);
   /* Update the size of DEST.  */
   dest->length = length;
   /* Copy DEST into SRC.  */
   strcpy (dest->s, src);
   /* Update the size of DEST.  */
   dest->length = length;

+  return 1;

 }
 
 /* Inserts SRC at the beginning of DEST.  DEST is expanded as
 }
 
 /* Inserts SRC at the beginning of DEST.  DEST is expanded as

-   necessary.  SRC and DEST must be distinct.  */
+   necessary.  SRC and DEST must be distinct.  Returns 1 on success.
+   On failure, if RETURN_ON_ALLOCATION_FAILURE, deletes DEST and
+   returns 0.  */

 
 

-void 
-dyn_string_prepend (dest, src)
-     dyn_string_t dest;
-     dyn_string_t src;
+int
+dyn_string_prepend (dyn_string_t dest, dyn_string_t src)

 {
 {

-  dyn_string_insert (dest, 0, src);
+  return dyn_string_insert (dest, 0, src);

 }
 
 /* Inserts SRC, a NUL-terminated string, at the beginning of DEST.
 }
 
 /* Inserts SRC, a NUL-terminated string, at the beginning of DEST.

-   DEST is expanded as necessary.  */
+   DEST is expanded as necessary.  Returns 1 on success.  On failure,
+   if RETURN_ON_ALLOCATION_FAILURE, deletes DEST and returns 0. */

 
 

-void 
-dyn_string_prepend_cstr (dest, src)
-     dyn_string_t dest;
-     const char *src;
+int
+dyn_string_prepend_cstr (dyn_string_t dest, const char *src)

 {
 {

-  dyn_string_insert_cstr (dest, 0, src);
+  return dyn_string_insert_cstr (dest, 0, src);

 }
 
 }
 

-/* Inserts SRC into DEST starting at position POS.  DEST is expanded as
-   necessary.  SRC and DEST must be distinct.  */
+/* Inserts SRC into DEST starting at position POS.  DEST is expanded
+   as necessary.  SRC and DEST must be distinct.  Returns 1 on
+   success.  On failure, if RETURN_ON_ALLOCATION_FAILURE, deletes DEST
+   and returns 0.  */

 
 

-void 
-dyn_string_insert (dest, pos, src)
-     dyn_string_t dest;
-     int pos;
-     dyn_string_t src;
+int
+dyn_string_insert (dyn_string_t dest, int pos, dyn_string_t src)

 {
   int i;
 
   if (src == dest)
     abort ();
 
 {
   int i;
 
   if (src == dest)
     abort ();
 

-  dyn_string_resize (dest, dest->length + src->length);
+  if (dyn_string_resize (dest, dest->length + src->length) == NULL)
+    return 0;

   /* Make room for the insertion.  Be sure to copy the NUL.  */
   for (i = dest->length; i >= pos; --i)
     dest->s[i + src->length] = dest->s[i];
   /* Make room for the insertion.  Be sure to copy the NUL.  */
   for (i = dest->length; i >= pos; --i)
     dest->s[i + src->length] = dest->s[i];


@@ -216,21 +257,22 @@ dyn_string_insert (dest, pos, src)
   strncpy (dest->s + pos, src->s, src->length);
   /* Compute the new length.  */
   dest->length += src->length;
   strncpy (dest->s + pos, src->s, src->length);
   /* Compute the new length.  */
   dest->length += src->length;

+  return 1;

 }
 
 /* Inserts SRC, a NUL-terminated string, into DEST starting at
 }
 
 /* Inserts SRC, a NUL-terminated string, into DEST starting at

-   position POS.  DEST is expanded as necessary.  */
+   position POS.  DEST is expanded as necessary.  Returns 1 on
+   success.  On failure, RETURN_ON_ALLOCATION_FAILURE, deletes DEST
+   and returns 0.  */

 
 

-void 
-dyn_string_insert_cstr (dest, pos, src)
-     dyn_string_t dest;
-     int pos;
-     const char *src;
+int
+dyn_string_insert_cstr (dyn_string_t dest, int pos, const char *src)

 {
   int i;
   int length = strlen (src);
 
 {
   int i;
   int length = strlen (src);
 

-  dyn_string_resize (dest, dest->length + length);
+  if (dyn_string_resize (dest, dest->length + length) == NULL)
+    return 0;

   /* Make room for the insertion.  Be sure to copy the NUL.  */
   for (i = dest->length; i >= pos; --i)
     dest->s[i + length] = dest->s[i];
   /* Make room for the insertion.  Be sure to copy the NUL.  */
   for (i = dest->length; i >= pos; --i)
     dest->s[i + length] = dest->s[i];


@@ -238,68 +280,89 @@ dyn_string_insert_cstr (dest, pos, src)
   strncpy (dest->s + pos, src, length);
   /* Compute the new length.  */
   dest->length += length;
   strncpy (dest->s + pos, src, length);
   /* Compute the new length.  */
   dest->length += length;

+  return 1;

 }
 
 }
 

-/* Append S to DS, resizing DS if necessary.  Returns DS.  */
+/* Inserts character C into DEST starting at position POS.  DEST is
+   expanded as necessary.  Returns 1 on success.  On failure,
+   RETURN_ON_ALLOCATION_FAILURE, deletes DEST and returns 0.  */

 
 

-dyn_string_t
-dyn_string_append (ds, s)
-     dyn_string_t ds;
-     dyn_string_t s;
+int
+dyn_string_insert_char (dyn_string_t dest, int pos, int c)

 {
 {

-  dyn_string_resize (ds, ds->length + s->length);
-  strcpy (ds->s + ds->length, s->s);
-  ds->length += s->length;
-  return ds;
+  int i;
+
+  if (dyn_string_resize (dest, dest->length + 1) == NULL)
+    return 0;
+  /* Make room for the insertion.  Be sure to copy the NUL.  */
+  for (i = dest->length; i >= pos; --i)
+    dest->s[i + 1] = dest->s[i];
+  /* Add the new character.  */
+  dest->s[pos] = c;
+  /* Compute the new length.  */
+  ++dest->length;
+  return 1;
+}
+     
+/* Append S to DS, resizing DS if necessary.  Returns 1 on success.
+   On failure, if RETURN_ON_ALLOCATION_FAILURE, deletes DEST and
+   returns 0.  */
+
+int
+dyn_string_append (dyn_string_t dest, dyn_string_t s)
+{
+  if (dyn_string_resize (dest, dest->length + s->length) == 0)
+    return 0;
+  strcpy (dest->s + dest->length, s->s);
+  dest->length += s->length;
+  return 1;

 }
 
 /* Append the NUL-terminated string S to DS, resizing DS if necessary.
 }
 
 /* Append the NUL-terminated string S to DS, resizing DS if necessary.

-   Returns DS.  */
+   Returns 1 on success.  On failure, if RETURN_ON_ALLOCATION_FAILURE,
+   deletes DEST and returns 0.  */

 
 

-dyn_string_t 
-dyn_string_append_cstr (ds, s)
-     dyn_string_t ds;
-     const char *s;
+int
+dyn_string_append_cstr (dyn_string_t dest, const char *s)

 {
   int len = strlen (s);
 
   /* The new length is the old length plus the size of our string, plus
      one for the null at the end.  */
 {
   int len = strlen (s);
 
   /* The new length is the old length plus the size of our string, plus
      one for the null at the end.  */

-  dyn_string_resize (ds, ds->length + len);
-  strcpy (ds->s + ds->length, s);
-  ds->length += len;
-
-  return ds;
+  if (dyn_string_resize (dest, dest->length + len) == NULL)
+    return 0;
+  strcpy (dest->s + dest->length, s);
+  dest->length += len;
+  return 1;

 }
 
 }
 

-/* Appends C to the end of DS.  */
+/* Appends C to the end of DEST.  Returns 1 on success.  On failure,
+   if RETURN_ON_ALLOCATION_FAILURE, deletes DEST and returns 0.  */

 
 

-dyn_string_t 
-dyn_string_append_char (ds, c)
-     dyn_string_t ds;
-     int c;
+int
+dyn_string_append_char (dyn_string_t dest, int c)

 {
   /* Make room for the extra character.  */
 {
   /* Make room for the extra character.  */

-  dyn_string_resize (ds, ds->length + 1);
+  if (dyn_string_resize (dest, dest->length + 1) == NULL)
+    return 0;

   /* Append the character; it will overwrite the old NUL.  */
   /* Append the character; it will overwrite the old NUL.  */

-  ds->s[ds->length] = c;
+  dest->s[dest->length] = c;

   /* Add a new NUL at the end.  */
   /* Add a new NUL at the end.  */

-  ds->s[ds->length + 1] = '\0';
+  dest->s[dest->length + 1] = '\0';

   /* Update the length.  */
   /* Update the length.  */

-  ++(ds->length);
-  return ds;
+  ++(dest->length);
+  return 1;

 }
 
 /* Sets the contents of DEST to the substring of SRC starting at START
    and ending before END.  START must be less than or equal to END,
 }
 
 /* Sets the contents of DEST to the substring of SRC starting at START
    and ending before END.  START must be less than or equal to END,

-   and both must be between zero and the length of SRC, inclusive.  */
+   and both must be between zero and the length of SRC, inclusive.
+   Returns 1 on success.  On failure, if RETURN_ON_ALLOCATION_FAILURE,
+   deletes DEST and returns 0.  */

 
 

-void
-dyn_string_substring (dest, src, start, end)
-     dyn_string_t dest;
-     dyn_string_t src;
-     int start;
-     int end;
+int
+dyn_string_substring (dyn_string_t dest, dyn_string_t src,
+                      int start, int end)

 {
   int i;
   int length = end - start;
 {
   int i;
   int length = end - start;


@@ -308,7 +371,8 @@ dyn_string_substring (dest, src, start, end)
     abort ();
 
   /* Make room for the substring.  */
     abort ();
 
   /* Make room for the substring.  */

-  dyn_string_resize (dest, length);
+  if (dyn_string_resize (dest, length) == NULL)
+    return 0;

   /* Copy the characters in the substring,  */
   for (i = length; --i >= 0; )
     dest->s[i] = src->s[start + i];
   /* Copy the characters in the substring,  */
   for (i = length; --i >= 0; )
     dest->s[i] = src->s[start + i];


@@ -316,14 +380,14 @@ dyn_string_substring (dest, src, start, end)
   dest->s[length] = '\0';
   /* Record the length of the substring.  */
   dest->length = length;
   dest->s[length] = '\0';
   /* Record the length of the substring.  */
   dest->length = length;

+
+  return 1;

 }
 
 /* Returns non-zero if DS1 and DS2 have the same contents.  */
 
 int
 }
 
 /* Returns non-zero if DS1 and DS2 have the same contents.  */
 
 int

-dyn_string_eq (ds1, ds2)
-     dyn_string_t ds1;
-     dyn_string_t ds2;
+dyn_string_eq (dyn_string_t ds1, dyn_string_t ds2)

 {
   /* If DS1 and DS2 have different lengths, they must not be the same.  */
   if (ds1->length != ds2->length)
 {
   /* If DS1 and DS2 have different lengths, they must not be the same.  */
   if (ds1->length != ds2->length)