2000-06-15 22:56:25 +02:00
|
|
|
/* An abstract string datatype.
|
Update libiberty sources with changes in the gcc mainline.
+2020-01-01 Jakub Jelinek <jakub@redhat.com>
+
+ Update copyright years.
+
+2019-12-06 Tim Ruehsen <tim.ruehsen@gmx.de>
+
+ * make-relative-prefix.c (split_directories):
+ Return early on empty 'name'
+
+2019-11-16 Tim Ruehsen <tim.ruehsen@gmx.de>
+
+ * cp-demangle.c (d_print_init): Remove const from 4th param.
+ (cplus_demangle_fill_name): Initialize d->d_counting.
+ (cplus_demangle_fill_extended_operator): Likewise.
+ (cplus_demangle_fill_ctor): Likewise.
+ (cplus_demangle_fill_dtor): Likewise.
+ (d_make_empty): Likewise.
+ (d_count_templates_scopes): Remobe const from 3rd param,
+ Return on dc->d_counting > 1,
+ Increment dc->d_counting.
+ * cp-demint.c (cplus_demangle_fill_component): Initialize d->d_counting.
+ (cplus_demangle_fill_builtin_type): Likewise.
+ (cplus_demangle_fill_operator): Likewise.
+
+2019-11-16 Eduard-Mihai Burtescu <eddyb@lyken.rs>
+
+ * cplus-dem.c (cplus_demangle): Use rust_demangle directly.
+ (rust_demangle): Remove.
+ * rust-demangle.c (is_prefixed_hash): Rename to is_legacy_prefixed_hash.
+ (parse_lower_hex_nibble): Rename to decode_lower_hex_nibble.
+ (parse_legacy_escape): Rename to decode_legacy_escape.
+ (rust_is_mangled): Remove.
+ (struct rust_demangler): Add.
+ (peek): Add.
+ (next): Add.
+ (struct rust_mangled_ident): Add.
+ (parse_ident): Add.
+ (rust_demangle_sym): Remove.
+ (print_str): Add.
+ (PRINT): Add.
+ (print_ident): Add.
+ (rust_demangle_callback): Add.
+ (struct str_buf): Add.
+ (str_buf_reserve): Add.
+ (str_buf_append): Add.
+ (str_buf_demangle_callback): Add.
+ (rust_demangle): Add.
+ * rust-demangle.h: Remove.
+
+2019-11-15 Miguel Saldivar <saldivarcher@gmail.com>
+
+ * testsuite/demangle-expected: Fix test.
+
+2019-11-04 Kamlesh Kumar <kamleshbhalui@gmail.com>
+
+ * cp-demangle.c (d_expr_primary): Handle
+ nullptr demangling.
+ * testsuite/demangle-expected: Added test.
+
+2019-10-29 Paul Pluzhnikov <ppluzhnikov@google.com>
+
+ * cp-demangle.c (d_number): Avoid signed int overflow.
+
+2019-10-28 Miguel Saldivar <saldivarcher@gmail.com>
+
+ * cp-demangle.c (d_print_mod): Add a space before printing `complex`
+ and `imaginary`, as opposed to after.
+ * testsuite/demangle-expected: Adjust test.
+
+2019-10-03 Eduard-Mihai Burtescu <eddyb@lyken.rs>
+
+ * rust-demangle.c (looks_like_rust): Remove.
+ (rust_is_mangled): Don't check escapes.
+ (is_prefixed_hash): Allow 0-9a-f permutations.
+ (rust_demangle_sym): Don't bail on unknown escapes.
+ * testsuite/rust-demangle-expected: Update 'main::$99$' test.
+
+2019-09-03 Eduard-Mihai Burtescu <eddyb@lyken.rs>
+
+ * rust-demangle.c (unescape): Remove.
+ (parse_lower_hex_nibble): New function.
+ (parse_legacy_escape): New function.
+ (is_prefixed_hash): Use parse_lower_hex_nibble.
+ (looks_like_rust): Use parse_legacy_escape.
+ (rust_demangle_sym): Use parse_legacy_escape.
+ * testsuite/rust-demangle-expected: Add 'llv$u6d$' test.
+
+2019-08-27 Martin Liska <mliska@suse.cz>
+
+ PR lto/91478
+ * simple-object-elf.c (simple_object_elf_copy_lto_debug_sections):
+ First find a WEAK HIDDEN symbol in symbol table that will be
+ preserved. Later, use the symbol name for all removed symbols.
+
+2019-08-12 Martin Liska <mliska@suse.cz>
+
+ * Makefile.in: Add filedescriptor.c.
+ * filedescriptor.c: New file.
+ * lrealpath.c (is_valid_fd): Remove.
diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 0be45b4ae8..fe738d0db4 100644
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -1,7 +1,7 @@
# Makefile for the libiberty library.
# Originally written by K. Richard Pixley <rich@cygnus.com>.
#
-# Copyright (C) 1990-2019 Free Software Foundation, Inc.
+# Copyright (C) 1990-2020 Free Software Foundation, Inc.
#
# This file is part of the libiberty library.
# Libiberty is free software; you can redistribute it and/or
@@ -127,7 +127,7 @@ CFILES = alloca.c argv.c asprintf.c atexit.c \
calloc.c choose-temp.c clock.c concat.c cp-demangle.c \
cp-demint.c cplus-dem.c crc32.c \
d-demangle.c dwarfnames.c dyn-string.c \
- fdmatch.c ffs.c fibheap.c filename_cmp.c floatformat.c \
+ fdmatch.c ffs.c fibheap.c filedescriptor.c filename_cmp.c floatformat.c \
fnmatch.c fopen_unlocked.c \
getcwd.c getopt.c getopt1.c getpagesize.c getpwd.c getruntime.c \
gettimeofday.c \
@@ -171,6 +171,7 @@ REQUIRED_OFILES = \
./cp-demint.$(objext) ./crc32.$(objext) ./d-demangle.$(objext) \
./dwarfnames.$(objext) ./dyn-string.$(objext) \
./fdmatch.$(objext) ./fibheap.$(objext) \
+ ./filedescriptor.$(objext) \
./filename_cmp.$(objext) ./floatformat.$(objext) \
./fnmatch.$(objext) ./fopen_unlocked.$(objext) \
./getopt.$(objext) ./getopt1.$(objext) ./getpwd.$(objext) \
@@ -756,6 +757,17 @@ $(CONFIGURED_OFILES): stamp-picdir stamp-noasandir
else true; fi
$(COMPILE.c) $(srcdir)/fibheap.c $(OUTPUT_OPTION)
+./filedescriptor.$(objext): $(srcdir)/filedescriptor.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/filedescriptor.c -o pic/$@; \
+ else true; fi
+ if [ x"$(NOASANFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(NOASANFLAG) $(srcdir)/filedescriptor.c -o noasan/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/filedescriptor.c $(OUTPUT_OPTION)
+
+
./filename_cmp.$(objext): $(srcdir)/filename_cmp.c config.h $(INCDIR)/ansidecl.h \
$(INCDIR)/filenames.h $(INCDIR)/hashtab.h \
$(INCDIR)/safe-ctype.h
diff --git a/libiberty/_doprnt.c b/libiberty/_doprnt.c
index d44dc415ed..a739f4304f 100644
--- a/libiberty/_doprnt.c
+++ b/libiberty/_doprnt.c
@@ -1,5 +1,5 @@
/* Provide a version of _doprnt in terms of fprintf.
- Copyright (C) 1998-2019 Free Software Foundation, Inc.
+ Copyright (C) 1998-2020 Free Software Foundation, Inc.
Contributed by Kaveh Ghazi (ghazi@caip.rutgers.edu) 3/29/98
This program is free software; you can redistribute it and/or modify it
diff --git a/libiberty/argv.c b/libiberty/argv.c
index 6444896f99..8c9794db6a 100644
--- a/libiberty/argv.c
+++ b/libiberty/argv.c
@@ -1,5 +1,5 @@
/* Create and destroy argument vectors (argv's)
- Copyright (C) 1992-2019 Free Software Foundation, Inc.
+ Copyright (C) 1992-2020 Free Software Foundation, Inc.
Written by Fred Fish @ Cygnus Support
This file is part of the libiberty library.
diff --git a/libiberty/asprintf.c b/libiberty/asprintf.c
index 5718682f69..6e38e2234d 100644
--- a/libiberty/asprintf.c
+++ b/libiberty/asprintf.c
@@ -1,6 +1,6 @@
/* Like sprintf but provides a pointer to malloc'd storage, which must
be freed by the caller.
- Copyright (C) 1997-2019 Free Software Foundation, Inc.
+ Copyright (C) 1997-2020 Free Software Foundation, Inc.
Contributed by Cygnus Solutions.
This file is part of the libiberty library.
diff --git a/libiberty/choose-temp.c b/libiberty/choose-temp.c
index 72c1b710bd..49a2faaa51 100644
--- a/libiberty/choose-temp.c
+++ b/libiberty/choose-temp.c
@@ -1,5 +1,5 @@
/* Utility to pick a temporary filename prefix.
- Copyright (C) 1996-2019 Free Software Foundation, Inc.
+ Copyright (C) 1996-2020 Free Software Foundation, Inc.
This file is part of the libiberty library.
Libiberty is free software; you can redistribute it and/or
diff --git a/libiberty/clock.c b/libiberty/clock.c
index a3730714bd..0de74657d0 100644
--- a/libiberty/clock.c
+++ b/libiberty/clock.c
@@ -1,5 +1,5 @@
/* ANSI-compatible clock function.
- Copyright (C) 1994-2019 Free Software Foundation, Inc.
+ Copyright (C) 1994-2020 Free Software Foundation, Inc.
This file is part of the libiberty library. This library is free
software; you can redistribute it and/or modify it under the
diff --git
2020-01-17 15:13:22 +01:00
|
|
|
Copyright (C) 1998-2020 Free Software Foundation, Inc.
|
2000-06-15 22:56:25 +02:00
|
|
|
Contributed by Mark Mitchell (mark@markmitchell.com).
|
|
|
|
|
|
|
|
This file is part of GNU CC.
|
|
|
|
|
|
|
|
GNU CC is free software; you can redistribute it and/or modify
|
|
|
|
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.
|
|
|
|
|
2002-03-27 20:17:34 +01:00
|
|
|
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.)
|
|
|
|
|
2000-06-15 22:56:25 +02:00
|
|
|
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 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
|
2005-05-10 17:33:34 +02:00
|
|
|
the Free Software Foundation, 51 Franklin Street - Fifth Floor,
|
|
|
|
Boston, MA 02110-1301, USA. */
|
2000-06-15 22:56:25 +02:00
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
#include "config.h"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
|
|
|
#ifdef HAVE_STRING_H
|
|
|
|
#include <string.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef HAVE_STDLIB_H
|
|
|
|
#include <stdlib.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include "libiberty.h"
|
|
|
|
#include "dyn-string.h"
|
|
|
|
|
|
|
|
/* Performs in-place initialization of a dyn_string struct. This
|
|
|
|
function can be used with a dyn_string struct on the stack or
|
|
|
|
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
|
2000-07-20 20:56:16 +02:00
|
|
|
NUL. If SPACE is 0, it will silently be increated to 1.
|
2000-06-15 22:56:25 +02:00
|
|
|
|
2000-07-20 20:56:16 +02:00
|
|
|
If RETURN_ON_ALLOCATION_FAILURE is defined and memory allocation
|
|
|
|
fails, returns 0. Otherwise returns 1. */
|
|
|
|
|
|
|
|
int
|
2005-03-28 04:09:01 +02:00
|
|
|
dyn_string_init (struct dyn_string *ds_struct_ptr, int space)
|
2000-06-15 22:56:25 +02:00
|
|
|
{
|
|
|
|
/* We need at least one byte in which to store the terminating NUL. */
|
|
|
|
if (space == 0)
|
|
|
|
space = 1;
|
|
|
|
|
2000-07-20 20:56:16 +02:00
|
|
|
#ifdef RETURN_ON_ALLOCATION_FAILURE
|
|
|
|
ds_struct_ptr->s = (char *) malloc (space);
|
|
|
|
if (ds_struct_ptr->s == NULL)
|
|
|
|
return 0;
|
|
|
|
#else
|
2005-05-24 23:01:33 +02:00
|
|
|
ds_struct_ptr->s = XNEWVEC (char, space);
|
2000-07-20 20:56:16 +02:00
|
|
|
#endif
|
|
|
|
ds_struct_ptr->allocated = space;
|
2000-06-15 22:56:25 +02:00
|
|
|
ds_struct_ptr->length = 0;
|
|
|
|
ds_struct_ptr->s[0] = '\0';
|
|
|
|
|
2000-07-20 20:56:16 +02:00
|
|
|
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. */
|
2000-06-15 22:56:25 +02:00
|
|
|
|
|
|
|
dyn_string_t
|
2005-03-28 04:09:01 +02:00
|
|
|
dyn_string_new (int space)
|
2000-06-15 22:56:25 +02:00
|
|
|
{
|
2000-07-20 20:56:16 +02:00
|
|
|
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
|
2005-05-24 23:01:33 +02:00
|
|
|
result = XNEW (struct dyn_string);
|
2000-06-15 22:56:25 +02:00
|
|
|
dyn_string_init (result, space);
|
2000-07-20 20:56:16 +02:00
|
|
|
#endif
|
2000-06-15 22:56:25 +02:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Free the memory used by DS. */
|
|
|
|
|
|
|
|
void
|
2005-03-28 04:09:01 +02:00
|
|
|
dyn_string_delete (dyn_string_t ds)
|
2000-06-15 22:56:25 +02:00
|
|
|
{
|
|
|
|
free (ds->s);
|
|
|
|
free (ds);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Returns the contents of DS in a buffer allocated with malloc. It
|
|
|
|
is the caller's responsibility to deallocate the buffer using free.
|
2000-07-20 20:56:16 +02:00
|
|
|
DS is then set to the empty string. Deletes DS itself. */
|
2000-06-15 22:56:25 +02:00
|
|
|
|
|
|
|
char*
|
2005-03-28 04:09:01 +02:00
|
|
|
dyn_string_release (dyn_string_t ds)
|
2000-06-15 22:56:25 +02:00
|
|
|
{
|
|
|
|
/* Store the old buffer. */
|
|
|
|
char* result = ds->s;
|
|
|
|
/* The buffer is no longer owned by DS. */
|
|
|
|
ds->s = NULL;
|
2000-07-20 20:56:16 +02:00
|
|
|
/* Delete DS. */
|
|
|
|
free (ds);
|
2000-06-15 22:56:25 +02:00
|
|
|
/* 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
|
2000-07-20 20:56:16 +02:00
|
|
|
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. */
|
2000-06-15 22:56:25 +02:00
|
|
|
|
|
|
|
dyn_string_t
|
2005-03-28 04:09:01 +02:00
|
|
|
dyn_string_resize (dyn_string_t ds, int space)
|
2000-06-15 22:56:25 +02:00
|
|
|
{
|
|
|
|
int new_allocated = ds->allocated;
|
|
|
|
|
|
|
|
/* Increase SPACE to hold the NUL termination. */
|
|
|
|
++space;
|
|
|
|
|
2000-07-20 20:56:16 +02:00
|
|
|
/* Increase allocation by factors of two. */
|
2000-06-15 22:56:25 +02:00
|
|
|
while (space > new_allocated)
|
|
|
|
new_allocated *= 2;
|
|
|
|
|
|
|
|
if (new_allocated != ds->allocated)
|
|
|
|
{
|
|
|
|
ds->allocated = new_allocated;
|
2000-07-20 20:56:16 +02:00
|
|
|
/* 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
|
2005-05-24 23:01:33 +02:00
|
|
|
ds->s = XRESIZEVEC (char, ds->s, ds->allocated);
|
2000-07-20 20:56:16 +02:00
|
|
|
#endif
|
2000-06-15 22:56:25 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return ds;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Sets the contents of DS to the empty string. */
|
|
|
|
|
|
|
|
void
|
2005-03-28 04:09:01 +02:00
|
|
|
dyn_string_clear (dyn_string_t ds)
|
2000-06-15 22:56:25 +02:00
|
|
|
{
|
|
|
|
/* A dyn_string always has room for at least the NUL terminator. */
|
|
|
|
ds->s[0] = '\0';
|
|
|
|
ds->length = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Makes the contents of DEST the same as the contents of SRC. DEST
|
2000-07-20 20:56:16 +02:00
|
|
|
and SRC must be distinct. Returns 1 on success. On failure, if
|
|
|
|
RETURN_ON_ALLOCATION_FAILURE, deletes DEST and returns 0. */
|
2000-06-15 22:56:25 +02:00
|
|
|
|
2000-07-20 20:56:16 +02:00
|
|
|
int
|
2005-03-28 04:09:01 +02:00
|
|
|
dyn_string_copy (dyn_string_t dest, dyn_string_t src)
|
2000-06-15 22:56:25 +02:00
|
|
|
{
|
|
|
|
if (dest == src)
|
|
|
|
abort ();
|
|
|
|
|
|
|
|
/* Make room in DEST. */
|
2000-07-20 20:56:16 +02:00
|
|
|
if (dyn_string_resize (dest, src->length) == NULL)
|
|
|
|
return 0;
|
2000-06-15 22:56:25 +02:00
|
|
|
/* Copy DEST into SRC. */
|
|
|
|
strcpy (dest->s, src->s);
|
|
|
|
/* Update the size of DEST. */
|
|
|
|
dest->length = src->length;
|
2000-07-20 20:56:16 +02:00
|
|
|
return 1;
|
2000-06-15 22:56:25 +02:00
|
|
|
}
|
|
|
|
|
2000-07-20 20:56:16 +02:00
|
|
|
/* Copies SRC, a NUL-terminated string, into DEST. Returns 1 on
|
|
|
|
success. On failure, if RETURN_ON_ALLOCATION_FAILURE, deletes DEST
|
|
|
|
and returns 0. */
|
2000-06-15 22:56:25 +02:00
|
|
|
|
2000-07-20 20:56:16 +02:00
|
|
|
int
|
2005-03-28 04:09:01 +02:00
|
|
|
dyn_string_copy_cstr (dyn_string_t dest, const char *src)
|
2000-06-15 22:56:25 +02:00
|
|
|
{
|
|
|
|
int length = strlen (src);
|
|
|
|
/* Make room in DEST. */
|
2000-07-20 20:56:16 +02:00
|
|
|
if (dyn_string_resize (dest, length) == NULL)
|
|
|
|
return 0;
|
2000-06-15 22:56:25 +02:00
|
|
|
/* Copy DEST into SRC. */
|
|
|
|
strcpy (dest->s, src);
|
|
|
|
/* Update the size of DEST. */
|
|
|
|
dest->length = length;
|
2000-07-20 20:56:16 +02:00
|
|
|
return 1;
|
2000-06-15 22:56:25 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Inserts SRC at the beginning of DEST. DEST is expanded as
|
2000-07-20 20:56:16 +02:00
|
|
|
necessary. SRC and DEST must be distinct. Returns 1 on success.
|
|
|
|
On failure, if RETURN_ON_ALLOCATION_FAILURE, deletes DEST and
|
|
|
|
returns 0. */
|
2000-06-15 22:56:25 +02:00
|
|
|
|
2000-07-20 20:56:16 +02:00
|
|
|
int
|
2005-03-28 04:09:01 +02:00
|
|
|
dyn_string_prepend (dyn_string_t dest, dyn_string_t src)
|
2000-06-15 22:56:25 +02:00
|
|
|
{
|
2000-07-20 20:56:16 +02:00
|
|
|
return dyn_string_insert (dest, 0, src);
|
2000-06-15 22:56:25 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Inserts SRC, a NUL-terminated string, at the beginning of DEST.
|
2000-07-20 20:56:16 +02:00
|
|
|
DEST is expanded as necessary. Returns 1 on success. On failure,
|
|
|
|
if RETURN_ON_ALLOCATION_FAILURE, deletes DEST and returns 0. */
|
2000-06-15 22:56:25 +02:00
|
|
|
|
2000-07-20 20:56:16 +02:00
|
|
|
int
|
2005-03-28 04:09:01 +02:00
|
|
|
dyn_string_prepend_cstr (dyn_string_t dest, const char *src)
|
2000-06-15 22:56:25 +02:00
|
|
|
{
|
2000-07-20 20:56:16 +02:00
|
|
|
return dyn_string_insert_cstr (dest, 0, src);
|
2000-06-15 22:56:25 +02:00
|
|
|
}
|
|
|
|
|
2000-07-20 20:56:16 +02:00
|
|
|
/* 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. */
|
2000-06-15 22:56:25 +02:00
|
|
|
|
2000-07-20 20:56:16 +02:00
|
|
|
int
|
2005-03-28 04:09:01 +02:00
|
|
|
dyn_string_insert (dyn_string_t dest, int pos, dyn_string_t src)
|
2000-06-15 22:56:25 +02:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (src == dest)
|
|
|
|
abort ();
|
|
|
|
|
2000-07-20 20:56:16 +02:00
|
|
|
if (dyn_string_resize (dest, dest->length + src->length) == NULL)
|
|
|
|
return 0;
|
2000-06-15 22:56:25 +02:00
|
|
|
/* 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];
|
|
|
|
/* Splice in the new stuff. */
|
|
|
|
strncpy (dest->s + pos, src->s, src->length);
|
|
|
|
/* Compute the new length. */
|
|
|
|
dest->length += src->length;
|
2000-07-20 20:56:16 +02:00
|
|
|
return 1;
|
2000-06-15 22:56:25 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Inserts SRC, a NUL-terminated string, into DEST starting at
|
2000-07-20 20:56:16 +02:00
|
|
|
position POS. DEST is expanded as necessary. Returns 1 on
|
|
|
|
success. On failure, RETURN_ON_ALLOCATION_FAILURE, deletes DEST
|
|
|
|
and returns 0. */
|
2000-06-15 22:56:25 +02:00
|
|
|
|
2000-07-20 20:56:16 +02:00
|
|
|
int
|
2005-03-28 04:09:01 +02:00
|
|
|
dyn_string_insert_cstr (dyn_string_t dest, int pos, const char *src)
|
2000-06-15 22:56:25 +02:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
int length = strlen (src);
|
|
|
|
|
2000-07-20 20:56:16 +02:00
|
|
|
if (dyn_string_resize (dest, dest->length + length) == NULL)
|
|
|
|
return 0;
|
2000-06-15 22:56:25 +02:00
|
|
|
/* 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];
|
|
|
|
/* Splice in the new stuff. */
|
|
|
|
strncpy (dest->s + pos, src, length);
|
|
|
|
/* Compute the new length. */
|
|
|
|
dest->length += length;
|
2000-07-20 20:56:16 +02:00
|
|
|
return 1;
|
2000-06-15 22:56:25 +02:00
|
|
|
}
|
|
|
|
|
2000-10-12 04:16:48 +02:00
|
|
|
/* 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. */
|
|
|
|
|
|
|
|
int
|
2005-03-28 04:09:01 +02:00
|
|
|
dyn_string_insert_char (dyn_string_t dest, int pos, int c)
|
2000-10-12 04:16:48 +02:00
|
|
|
{
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2000-07-20 20:56:16 +02:00
|
|
|
/* Append S to DS, resizing DS if necessary. Returns 1 on success.
|
|
|
|
On failure, if RETURN_ON_ALLOCATION_FAILURE, deletes DEST and
|
|
|
|
returns 0. */
|
2000-06-15 22:56:25 +02:00
|
|
|
|
2000-07-20 20:56:16 +02:00
|
|
|
int
|
2005-03-28 04:09:01 +02:00
|
|
|
dyn_string_append (dyn_string_t dest, dyn_string_t s)
|
2000-06-15 22:56:25 +02:00
|
|
|
{
|
2000-07-20 20:56:16 +02:00
|
|
|
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;
|
2000-06-15 22:56:25 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Append the NUL-terminated string S to DS, resizing DS if necessary.
|
2000-07-20 20:56:16 +02:00
|
|
|
Returns 1 on success. On failure, if RETURN_ON_ALLOCATION_FAILURE,
|
|
|
|
deletes DEST and returns 0. */
|
2000-06-15 22:56:25 +02:00
|
|
|
|
2000-07-20 20:56:16 +02:00
|
|
|
int
|
2005-03-28 04:09:01 +02:00
|
|
|
dyn_string_append_cstr (dyn_string_t dest, const char *s)
|
2000-06-15 22:56:25 +02:00
|
|
|
{
|
|
|
|
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. */
|
2000-07-20 20:56:16 +02:00
|
|
|
if (dyn_string_resize (dest, dest->length + len) == NULL)
|
|
|
|
return 0;
|
|
|
|
strcpy (dest->s + dest->length, s);
|
|
|
|
dest->length += len;
|
|
|
|
return 1;
|
2000-06-15 22:56:25 +02:00
|
|
|
}
|
|
|
|
|
2009-11-22 17:58:53 +01:00
|
|
|
/* Appends C to the end of DEST. Returns 1 on success. On failure,
|
2000-07-20 20:56:16 +02:00
|
|
|
if RETURN_ON_ALLOCATION_FAILURE, deletes DEST and returns 0. */
|
2000-06-15 22:56:25 +02:00
|
|
|
|
2000-07-20 20:56:16 +02:00
|
|
|
int
|
2005-03-28 04:09:01 +02:00
|
|
|
dyn_string_append_char (dyn_string_t dest, int c)
|
2000-06-15 22:56:25 +02:00
|
|
|
{
|
|
|
|
/* Make room for the extra character. */
|
2000-07-20 20:56:16 +02:00
|
|
|
if (dyn_string_resize (dest, dest->length + 1) == NULL)
|
|
|
|
return 0;
|
2000-06-15 22:56:25 +02:00
|
|
|
/* Append the character; it will overwrite the old NUL. */
|
2000-07-20 20:56:16 +02:00
|
|
|
dest->s[dest->length] = c;
|
2000-06-15 22:56:25 +02:00
|
|
|
/* Add a new NUL at the end. */
|
2000-07-20 20:56:16 +02:00
|
|
|
dest->s[dest->length + 1] = '\0';
|
2000-06-15 22:56:25 +02:00
|
|
|
/* Update the length. */
|
2000-07-20 20:56:16 +02:00
|
|
|
++(dest->length);
|
|
|
|
return 1;
|
2000-06-15 22:56:25 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* 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,
|
2000-07-20 20:56:16 +02:00
|
|
|
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. */
|
2000-06-15 22:56:25 +02:00
|
|
|
|
2000-07-20 20:56:16 +02:00
|
|
|
int
|
2005-03-28 04:09:01 +02:00
|
|
|
dyn_string_substring (dyn_string_t dest, dyn_string_t src,
|
|
|
|
int start, int end)
|
2000-06-15 22:56:25 +02:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
int length = end - start;
|
|
|
|
|
|
|
|
if (start > end || start > src->length || end > src->length)
|
|
|
|
abort ();
|
|
|
|
|
|
|
|
/* Make room for the substring. */
|
2000-07-20 20:56:16 +02:00
|
|
|
if (dyn_string_resize (dest, length) == NULL)
|
|
|
|
return 0;
|
2000-06-15 22:56:25 +02:00
|
|
|
/* Copy the characters in the substring, */
|
|
|
|
for (i = length; --i >= 0; )
|
|
|
|
dest->s[i] = src->s[start + i];
|
|
|
|
/* NUL-terimate the result. */
|
|
|
|
dest->s[length] = '\0';
|
|
|
|
/* Record the length of the substring. */
|
|
|
|
dest->length = length;
|
2000-07-20 20:56:16 +02:00
|
|
|
|
|
|
|
return 1;
|
2000-06-15 22:56:25 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Returns non-zero if DS1 and DS2 have the same contents. */
|
|
|
|
|
|
|
|
int
|
2005-03-28 04:09:01 +02:00
|
|
|
dyn_string_eq (dyn_string_t ds1, dyn_string_t ds2)
|
2000-06-15 22:56:25 +02:00
|
|
|
{
|
|
|
|
/* If DS1 and DS2 have different lengths, they must not be the same. */
|
|
|
|
if (ds1->length != ds2->length)
|
|
|
|
return 0;
|
|
|
|
else
|
|
|
|
return !strcmp (ds1->s, ds2->s);
|
|
|
|
}
|