9486db4fb6
include/ 2005-03-26 Gabriel Dos Reis <gdr@integrable-solutions.net> * demangle.h: Remove uses of PARAMS. * libiberty.h (ANSI_PROTOTYPES): Remove guard since ANSI_PROTOTYPES is always assumed. Remove uses of PARAMS throughout. libiberty/ 2005-03-26 Gabriel Dos Reis <gdr@integrable-solutions.net> Convert libiberty to use ISO C prototype style 2/n. * cp-demangle.h: Remove uses of PARAMS. * cp-demangle.c: Likewise. (d_dump, cplus_demangle_fill_name, cplus_demangle_fill_extended_operator, cplus_demangle_fill_ctor, cplus_demangle_fill_dtor, d_make_empty, d_make_comp, d_make_name, d_make_builtin_type, d_make_operator, d_make_extended_operator, d_make_ctor, d_make_dtor, d_make_template_param, d_make_sub, cplus_demangle_mangled_name, has_return_type, is_ctor_dtor_or_conversion, d_encoding, d_name, d_nested_name, d_prefix, d_unqualified_name, d_source_name, d_number, d_identifier, d_operator_name, d_special_name, d_call_offset, d_ctor_dtor_name, cplus_demangle_type, d_cv_qualifiers, d_function_type, d_bare_function_type, d_class_enum_type, d_array_type, d_pointer_to_member_type, d_template_param, d_template_args, d_template_arg, d_expression, d_expr_primary, d_local_name, d_discriminator, d_add_substitution, d_substitution, d_print_resize, d_print_append_char, d_print_append_buffer, d_print_error, cplus_demangle_print, d_print_comp, d_print_java_identifier, d_print_mod_list, d_print_mod, d_print_function_type, d_print_array_type, d_print_expr_op, d_print_cast, cplus_demangle_init_info, d_demangle, __cxa_demangle, cplus_demangle_v3, java_demangle_v3, is_ctor_or_dtor, is_gnu_v3_mangled_ctor, is_gnu_v3_mangled_dtor, print_usage, main): 2005-03-26 Gabriel Dos Reis <gdr@integrable-solutions.net> Convert libiberty to ISO C prototype style 1/n. * _doprnt.c: Remove conditional #include <varargs.h> on ANSI_PROTOTYPES as the latter is always assumed. (_doprnt, checkit, main): Use ISO C prototype. * alloca.c (find_stack_direction, C_alloca): Use ISO C prototype. * argv.c: Remove conditional #includes on ANSI_PROTOTYPES. (dupargv, freeargv, buildargv, main): Use ISO C prototype. * atexit.c (atexit): Likewise * asprintf.c: Remove conditional include on ANSI_PROTOTYPES. (asprintf): Use ISO C prototype. * basename.c (basename): Likewise * bcmp.c (bcmp): Likewise. * bcopy.c (bcopy): Likewise. * bzero.c (bzero): Likewise. * bsearch.c (bsearch): Likewise. Improve const-correctness. * choose-temp.c (choose_temp_base): Likewise. * calloc.c: Remove conditional #include on ANSI_PROTOTYPES. (calloc): Use ISO C prototype. * clock.c (clock): Likewise. * concat.c: Remove conditional #include on ANSI_PROTOTYPES. (vconcat_length, vconcat_copy, concat_length, concat_copy, concat_copy2, concat, reconcat, main): Use ISO C prototype. * copysign.c (copysign): Likewise. From-SVN: r97085
227 lines
5.6 KiB
C
227 lines
5.6 KiB
C
/* Concatenate variable number of strings.
|
|
Copyright (C) 1991, 1994, 2001 Free Software Foundation, Inc.
|
|
Written by Fred Fish @ Cygnus Support
|
|
|
|
This file is part of the libiberty library.
|
|
Libiberty is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
Libiberty 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with libiberty; see the file COPYING.LIB. If
|
|
not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
|
|
/*
|
|
|
|
@deftypefn Extension char* concat (const char *@var{s1}, const char *@var{s2}, @dots{}, @code{NULL})
|
|
|
|
Concatenate zero or more of strings and return the result in freshly
|
|
@code{xmalloc}ed memory. Returns @code{NULL} if insufficient memory is
|
|
available. The argument list is terminated by the first @code{NULL}
|
|
pointer encountered. Pointers to empty strings are ignored.
|
|
|
|
@end deftypefn
|
|
|
|
NOTES
|
|
|
|
This function uses xmalloc() which is expected to be a front end
|
|
function to malloc() that deals with low memory situations. In
|
|
typical use, if malloc() returns NULL then xmalloc() diverts to an
|
|
error handler routine which never returns, and thus xmalloc will
|
|
never return a NULL pointer. If the client application wishes to
|
|
deal with low memory situations itself, it should supply an xmalloc
|
|
that just directly invokes malloc and blindly returns whatever
|
|
malloc returns.
|
|
|
|
*/
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
#include "ansidecl.h"
|
|
#include "libiberty.h"
|
|
#include <sys/types.h> /* size_t */
|
|
|
|
#include <stdarg.h>
|
|
|
|
# if HAVE_STRING_H
|
|
# include <string.h>
|
|
# else
|
|
# if HAVE_STRINGS_H
|
|
# include <strings.h>
|
|
# endif
|
|
# endif
|
|
|
|
#if HAVE_STDLIB_H
|
|
#include <stdlib.h>
|
|
#endif
|
|
|
|
static inline unsigned long vconcat_length (const char *, va_list);
|
|
static inline unsigned long
|
|
vconcat_length (const char *first, va_list args)
|
|
{
|
|
unsigned long length = 0;
|
|
const char *arg;
|
|
|
|
for (arg = first; arg ; arg = va_arg (args, const char *))
|
|
length += strlen (arg);
|
|
|
|
return length;
|
|
}
|
|
|
|
static inline char *
|
|
vconcat_copy (char *dst, const char *first, va_list args)
|
|
{
|
|
char *end = dst;
|
|
const char *arg;
|
|
|
|
for (arg = first; arg ; arg = va_arg (args, const char *))
|
|
{
|
|
unsigned long length = strlen (arg);
|
|
memcpy (end, arg, length);
|
|
end += length;
|
|
}
|
|
*end = '\000';
|
|
|
|
return dst;
|
|
}
|
|
|
|
/* @undocumented concat_length */
|
|
|
|
unsigned long
|
|
concat_length (const char *first, ...)
|
|
{
|
|
unsigned long length;
|
|
|
|
VA_OPEN (args, first);
|
|
VA_FIXEDARG (args, const char *, first);
|
|
length = vconcat_length (first, args);
|
|
VA_CLOSE (args);
|
|
|
|
return length;
|
|
}
|
|
|
|
/* @undocumented concat_copy */
|
|
|
|
char *
|
|
concat_copy (char *dst, const char *first, ...)
|
|
{
|
|
char *save_dst;
|
|
|
|
VA_OPEN (args, first);
|
|
VA_FIXEDARG (args, char *, dst);
|
|
VA_FIXEDARG (args, const char *, first);
|
|
vconcat_copy (dst, first, args);
|
|
save_dst = dst; /* With K&R C, dst goes out of scope here. */
|
|
VA_CLOSE (args);
|
|
|
|
return save_dst;
|
|
}
|
|
|
|
char *libiberty_concat_ptr;
|
|
|
|
/* @undocumented concat_copy2 */
|
|
|
|
char *
|
|
concat_copy2 (const char *first, ...)
|
|
{
|
|
VA_OPEN (args, first);
|
|
VA_FIXEDARG (args, const char *, first);
|
|
vconcat_copy (libiberty_concat_ptr, first, args);
|
|
VA_CLOSE (args);
|
|
|
|
return libiberty_concat_ptr;
|
|
}
|
|
|
|
char *
|
|
concat (const char *first, ...)
|
|
{
|
|
char *newstr;
|
|
|
|
/* First compute the size of the result and get sufficient memory. */
|
|
VA_OPEN (args, first);
|
|
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, const char *, first);
|
|
vconcat_copy (newstr, first, args);
|
|
VA_CLOSE (args);
|
|
|
|
return newstr;
|
|
}
|
|
|
|
/*
|
|
|
|
@deftypefn Extension char* reconcat (char *@var{optr}, const char *@var{s1}, @dots{}, @code{NULL})
|
|
|
|
Same as @code{concat}, except that if @var{optr} is not @code{NULL} it
|
|
is freed after the string is created. This is intended to be useful
|
|
when you're extending an existing string or building up a string in a
|
|
loop:
|
|
|
|
@example
|
|
str = reconcat (str, "pre-", str, NULL);
|
|
@end example
|
|
|
|
@end deftypefn
|
|
|
|
*/
|
|
|
|
char *
|
|
reconcat (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);
|
|
if (optr) /* Done before VA_CLOSE so optr stays in scope for K&R C. */
|
|
free (optr);
|
|
VA_CLOSE (args);
|
|
|
|
return newstr;
|
|
}
|
|
|
|
#ifdef MAIN
|
|
#define NULLP (char *)0
|
|
|
|
/* Simple little test driver. */
|
|
|
|
#include <stdio.h>
|
|
|
|
int
|
|
main (void)
|
|
{
|
|
printf ("\"\" = \"%s\"\n", concat (NULLP));
|
|
printf ("\"a\" = \"%s\"\n", concat ("a", NULLP));
|
|
printf ("\"ab\" = \"%s\"\n", concat ("a", "b", NULLP));
|
|
printf ("\"abc\" = \"%s\"\n", concat ("a", "b", "c", NULLP));
|
|
printf ("\"abcd\" = \"%s\"\n", concat ("ab", "cd", NULLP));
|
|
printf ("\"abcde\" = \"%s\"\n", concat ("ab", "c", "de", NULLP));
|
|
printf ("\"abcdef\" = \"%s\"\n", concat ("", "a", "", "bcd", "ef", NULLP));
|
|
return 0;
|
|
}
|
|
|
|
#endif
|