Add delim_string_to_char_ptr_vec.

[deliverable/binutils-gdb.git] / gdb / common / gdb_vecs.c

diff --git a/gdb/common/gdb_vecs.c b/gdb/common/gdb_vecs.c
index b25698627c35c8f57f7d738eed0de3c5719b1c04..4a3330f596959322e3cc2751eac4a9790f74e152 100644 (file)
--- a/gdb/common/gdb_vecs.c
+++ b/gdb/common/gdb_vecs.c
@@ -44,35 +44,60 @@ free_char_ptr_vec (VEC (char_ptr) *char_ptr_vec)
   VEC_free (char_ptr, char_ptr_vec);
 }
 
-/* Extended version of dirnames_to_char_ptr_vec - additionally if *VECP is
-   non-NULL the new list elements from DIRNAMES are appended to the existing
-   *VECP list of entries.  *VECP address will be updated by this call.  */
+/* Worker function to split character delimiter separated string of fields
+   STR into a CHAR_PTR_VEC.  */
 
-void
-dirnames_to_char_ptr_vec_append (VEC (char_ptr) **vecp, const char *dirnames)
+static void
+delim_string_to_char_ptr_vec_append (VEC (char_ptr) **vecp,
+                                    const char *str, char delimiter)
 {
   do
     {
       size_t this_len;
-      char *next_dir, *this_dir;
+      char *next_field, *this_field;
 
-      next_dir = strchr (dirnames, DIRNAME_SEPARATOR);
-      if (next_dir == NULL)
-       this_len = strlen (dirnames);
+      next_field = strchr (str, delimiter);
+      if (next_field == NULL)
+       this_len = strlen (str);
       else
        {
-         this_len = next_dir - dirnames;
-         next_dir++;
+         this_len = next_field - str;
+         next_field++;
        }
 
-      this_dir = xmalloc (this_len + 1);
-      memcpy (this_dir, dirnames, this_len);
-      this_dir[this_len] = '\0';
-      VEC_safe_push (char_ptr, *vecp, this_dir);
+      this_field = xmalloc (this_len + 1);
+      memcpy (this_field, str, this_len);
+      this_field[this_len] = '\0';
+      VEC_safe_push (char_ptr, *vecp, this_field);
 
-      dirnames = next_dir;
+      str = next_field;
     }
-  while (dirnames != NULL);
+  while (str != NULL);
+}
+
+/* Split STR, a list of DELIMITER-separated fields, into a CHAR_PTR_VEC.
+
+   You may modify the returned strings.
+   Read free_char_ptr_vec for its cleanup.  */
+
+VEC (char_ptr) *
+delim_string_to_char_ptr_vec (const char *str, char delimiter)
+{
+  VEC (char_ptr) *retval = NULL;
+  
+  delim_string_to_char_ptr_vec_append (&retval, str, delimiter);
+
+  return retval;
+}
+
+/* Extended version of dirnames_to_char_ptr_vec - additionally if *VECP is
+   non-NULL the new list elements from DIRNAMES are appended to the existing
+   *VECP list of entries.  *VECP address will be updated by this call.  */
+
+void
+dirnames_to_char_ptr_vec_append (VEC (char_ptr) **vecp, const char *dirnames)
+{
+  delim_string_to_char_ptr_vec_append (vecp, dirnames, DIRNAME_SEPARATOR);
 }
 
 /* Split DIRNAMES by DIRNAME_SEPARATOR delimiter and return a list of all the