1999-05-03 15:29:11 +08:00
|
|
|
/* Concatenate variable number of strings.
|
2021-01-01 06:58:58 +08:00
|
|
|
Copyright (C) 1991-2021 Free Software Foundation, Inc.
|
1999-05-03 15:29:11 +08:00
|
|
|
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
|
2005-05-10 23:33:34 +08:00
|
|
|
not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
|
|
|
|
Boston, MA 02110-1301, USA. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
libiberty: documentation markup and order fixes.
libiberty/:
* splay-tree.c: Escape wrapping newlines in texinfo markup
with '@', to fix function declaration output rendering.
* gather-docs: Relax and improve macro name matching to actually
match all current names and to allow input line wrapping.
* bsearch.c, concat.c, crc32.c, fnmatch.txh, fopen_unlocked.c,
hashtab.c, insque.c, make-relative-prefix.c, memchr.c, memcmp.c,
memcpy.c, memmem.c, memmove.c, mempcpy.c, memset.c,
pexecute.txh, random.c, setenv.c, setproctitle.c,
simple-object.txh, snprintf.c, stpncpy.c, strncmp.c, strtod.c,
strtol.c, vasprintf.c, vprintf.c, vsnprintf.c, xmemdup.c:
Wrap long texinfo input lines.
* functions.texi: Regenerate.
2011-02-03 15:23:59 +08:00
|
|
|
@deftypefn Extension char* concat (const char *@var{s1}, const char *@var{s2}, @
|
|
|
|
@dots{}, @code{NULL})
|
1999-05-03 15:29:11 +08:00
|
|
|
|
2001-10-16 10:55:31 +08:00
|
|
|
Concatenate zero or more of strings and return the result in freshly
|
2013-10-29 Marc Glisse <marc.glisse@inria.fr>
PR tree-optimization/58689
include/
* ansidecl.h (ATTRIBUTE_RETURNS_NONNULL): New macro.
* libiberty.h (basename, lbasename, dos_lbasename, unix_lbasename,
concat_copy): Mark with attributes nonnull(1) and returns_nonnull.
(concat, reconcat, concat_copy2, choose_temp_base, xstrerror,
xmalloc, xrealloc, xcalloc, xstrdup, xstrndup, xmemdup, pex_init):
Mark with attribute returns_nonnull.
libiberty/
* concat.c: Remove note about xmalloc.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@204159 138bc75d-0d04-0410-961f-82ee72b054a4
2013-10-29 21:15:48 +08:00
|
|
|
@code{xmalloc}ed memory. The argument list is terminated by the first
|
|
|
|
@code{NULL} pointer encountered. Pointers to empty strings are ignored.
|
1999-05-03 15:29:11 +08:00
|
|
|
|
2001-10-16 10:55:31 +08:00
|
|
|
@end deftypefn
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
2001-07-31 04:02:22 +08:00
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
#include "config.h"
|
|
|
|
#endif
|
1999-05-03 15:29:11 +08:00
|
|
|
#include "ansidecl.h"
|
|
|
|
#include "libiberty.h"
|
2001-06-19 05:16:33 +08:00
|
|
|
#include <sys/types.h> /* size_t */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
#include <stdarg.h>
|
|
|
|
|
2001-06-11 08:07:54 +08:00
|
|
|
# if HAVE_STRING_H
|
|
|
|
# include <string.h>
|
|
|
|
# else
|
|
|
|
# if HAVE_STRINGS_H
|
|
|
|
# include <strings.h>
|
|
|
|
# endif
|
|
|
|
# endif
|
1999-05-03 15:29:11 +08:00
|
|
|
|
2001-09-29 11:19:56 +08:00
|
|
|
#if HAVE_STDLIB_H
|
|
|
|
#include <stdlib.h>
|
|
|
|
#endif
|
|
|
|
|
2005-03-27 13:28:42 +08:00
|
|
|
static inline unsigned long vconcat_length (const char *, va_list);
|
2001-09-18 07:11:04 +08:00
|
|
|
static inline unsigned long
|
2005-03-27 13:28:42 +08:00
|
|
|
vconcat_length (const char *first, va_list args)
|
1999-05-03 15:29:11 +08:00
|
|
|
{
|
2001-09-18 07:11:04 +08:00
|
|
|
unsigned long length = 0;
|
|
|
|
const char *arg;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
2001-06-11 08:07:54 +08:00
|
|
|
for (arg = first; arg ; arg = va_arg (args, const char *))
|
|
|
|
length += strlen (arg);
|
|
|
|
|
2001-09-18 07:11:04 +08:00
|
|
|
return length;
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
2001-09-18 07:11:04 +08:00
|
|
|
static inline char *
|
2005-03-27 13:28:42 +08:00
|
|
|
vconcat_copy (char *dst, const char *first, va_list args)
|
2001-09-18 07:11:04 +08:00
|
|
|
{
|
|
|
|
char *end = dst;
|
|
|
|
const char *arg;
|
2001-06-11 08:07:54 +08:00
|
|
|
|
|
|
|
for (arg = first; arg ; arg = va_arg (args, const char *))
|
|
|
|
{
|
2001-09-18 07:11:04 +08:00
|
|
|
unsigned long length = strlen (arg);
|
2001-06-11 08:07:54 +08:00
|
|
|
memcpy (end, arg, length);
|
|
|
|
end += length;
|
1999-05-03 15:29:11 +08:00
|
|
|
}
|
2001-06-11 08:07:54 +08:00
|
|
|
*end = '\000';
|
2001-09-18 07:11:04 +08:00
|
|
|
|
|
|
|
return dst;
|
|
|
|
}
|
|
|
|
|
2001-10-16 10:55:31 +08:00
|
|
|
/* @undocumented concat_length */
|
|
|
|
|
2001-09-18 07:11:04 +08:00
|
|
|
unsigned long
|
2005-03-27 13:28:42 +08:00
|
|
|
concat_length (const char *first, ...)
|
2001-09-18 07:11:04 +08:00
|
|
|
{
|
|
|
|
unsigned long length;
|
[PATCH] include * ansidecl.h (ANSI_PROTOTYPES, PTRCONST, LONG_DOUBLE, PARAMS) (VPARAMS, VA_START, VA_OPEN, VA_CLOSE, VA_FIXEDARG, CONST) (VOLATILE, SIGNED, PROTO, EXFUN, DEFUN, DEFUN_VOID, AND, DOTS) (NOARGS): Don't define. * libiberty.h (expandargv, writeargv): Don't use PARAMS. libiberty * _doprint.c (checkit): Use stdarg, not VA_* macros. * asprintf.c (asprintf): Use stdarg, not VA_* macros. * concat.c (concat_length, concat_copy, concat_copy2, concat) (reconcat): Use stdarg, not VA_* macros. * snprintf.c (snprintf): Use stdarg, not VA_* macros. * vasprintf.c (checkit): Use stdarg, not VA_* macros. * vsnprintf.c (checkit): Use stdarg, not VA_* macros.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206881 138bc75d-0d04-0410-961f-82ee72b054a4
2014-01-21 23:09:10 +08:00
|
|
|
va_list args;
|
2001-09-18 07:11:04 +08:00
|
|
|
|
[PATCH] include * ansidecl.h (ANSI_PROTOTYPES, PTRCONST, LONG_DOUBLE, PARAMS) (VPARAMS, VA_START, VA_OPEN, VA_CLOSE, VA_FIXEDARG, CONST) (VOLATILE, SIGNED, PROTO, EXFUN, DEFUN, DEFUN_VOID, AND, DOTS) (NOARGS): Don't define. * libiberty.h (expandargv, writeargv): Don't use PARAMS. libiberty * _doprint.c (checkit): Use stdarg, not VA_* macros. * asprintf.c (asprintf): Use stdarg, not VA_* macros. * concat.c (concat_length, concat_copy, concat_copy2, concat) (reconcat): Use stdarg, not VA_* macros. * snprintf.c (snprintf): Use stdarg, not VA_* macros. * vasprintf.c (checkit): Use stdarg, not VA_* macros. * vsnprintf.c (checkit): Use stdarg, not VA_* macros.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206881 138bc75d-0d04-0410-961f-82ee72b054a4
2014-01-21 23:09:10 +08:00
|
|
|
va_start (args, first);
|
2001-09-18 07:11:04 +08:00
|
|
|
length = vconcat_length (first, args);
|
[PATCH] include * ansidecl.h (ANSI_PROTOTYPES, PTRCONST, LONG_DOUBLE, PARAMS) (VPARAMS, VA_START, VA_OPEN, VA_CLOSE, VA_FIXEDARG, CONST) (VOLATILE, SIGNED, PROTO, EXFUN, DEFUN, DEFUN_VOID, AND, DOTS) (NOARGS): Don't define. * libiberty.h (expandargv, writeargv): Don't use PARAMS. libiberty * _doprint.c (checkit): Use stdarg, not VA_* macros. * asprintf.c (asprintf): Use stdarg, not VA_* macros. * concat.c (concat_length, concat_copy, concat_copy2, concat) (reconcat): Use stdarg, not VA_* macros. * snprintf.c (snprintf): Use stdarg, not VA_* macros. * vasprintf.c (checkit): Use stdarg, not VA_* macros. * vsnprintf.c (checkit): Use stdarg, not VA_* macros.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206881 138bc75d-0d04-0410-961f-82ee72b054a4
2014-01-21 23:09:10 +08:00
|
|
|
va_end (args);
|
2001-09-18 07:11:04 +08:00
|
|
|
|
|
|
|
return length;
|
|
|
|
}
|
|
|
|
|
2001-10-16 10:55:31 +08:00
|
|
|
/* @undocumented concat_copy */
|
|
|
|
|
2001-09-18 07:11:04 +08:00
|
|
|
char *
|
2005-03-27 13:28:42 +08:00
|
|
|
concat_copy (char *dst, const char *first, ...)
|
2001-09-18 07:11:04 +08:00
|
|
|
{
|
|
|
|
char *save_dst;
|
[PATCH] include * ansidecl.h (ANSI_PROTOTYPES, PTRCONST, LONG_DOUBLE, PARAMS) (VPARAMS, VA_START, VA_OPEN, VA_CLOSE, VA_FIXEDARG, CONST) (VOLATILE, SIGNED, PROTO, EXFUN, DEFUN, DEFUN_VOID, AND, DOTS) (NOARGS): Don't define. * libiberty.h (expandargv, writeargv): Don't use PARAMS. libiberty * _doprint.c (checkit): Use stdarg, not VA_* macros. * asprintf.c (asprintf): Use stdarg, not VA_* macros. * concat.c (concat_length, concat_copy, concat_copy2, concat) (reconcat): Use stdarg, not VA_* macros. * snprintf.c (snprintf): Use stdarg, not VA_* macros. * vasprintf.c (checkit): Use stdarg, not VA_* macros. * vsnprintf.c (checkit): Use stdarg, not VA_* macros.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206881 138bc75d-0d04-0410-961f-82ee72b054a4
2014-01-21 23:09:10 +08:00
|
|
|
va_list args;
|
2001-09-18 07:11:04 +08:00
|
|
|
|
[PATCH] include * ansidecl.h (ANSI_PROTOTYPES, PTRCONST, LONG_DOUBLE, PARAMS) (VPARAMS, VA_START, VA_OPEN, VA_CLOSE, VA_FIXEDARG, CONST) (VOLATILE, SIGNED, PROTO, EXFUN, DEFUN, DEFUN_VOID, AND, DOTS) (NOARGS): Don't define. * libiberty.h (expandargv, writeargv): Don't use PARAMS. libiberty * _doprint.c (checkit): Use stdarg, not VA_* macros. * asprintf.c (asprintf): Use stdarg, not VA_* macros. * concat.c (concat_length, concat_copy, concat_copy2, concat) (reconcat): Use stdarg, not VA_* macros. * snprintf.c (snprintf): Use stdarg, not VA_* macros. * vasprintf.c (checkit): Use stdarg, not VA_* macros. * vsnprintf.c (checkit): Use stdarg, not VA_* macros.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206881 138bc75d-0d04-0410-961f-82ee72b054a4
2014-01-21 23:09:10 +08:00
|
|
|
va_start (args, first);
|
2001-09-18 07:11:04 +08:00
|
|
|
vconcat_copy (dst, first, args);
|
|
|
|
save_dst = dst; /* With K&R C, dst goes out of scope here. */
|
[PATCH] include * ansidecl.h (ANSI_PROTOTYPES, PTRCONST, LONG_DOUBLE, PARAMS) (VPARAMS, VA_START, VA_OPEN, VA_CLOSE, VA_FIXEDARG, CONST) (VOLATILE, SIGNED, PROTO, EXFUN, DEFUN, DEFUN_VOID, AND, DOTS) (NOARGS): Don't define. * libiberty.h (expandargv, writeargv): Don't use PARAMS. libiberty * _doprint.c (checkit): Use stdarg, not VA_* macros. * asprintf.c (asprintf): Use stdarg, not VA_* macros. * concat.c (concat_length, concat_copy, concat_copy2, concat) (reconcat): Use stdarg, not VA_* macros. * snprintf.c (snprintf): Use stdarg, not VA_* macros. * vasprintf.c (checkit): Use stdarg, not VA_* macros. * vsnprintf.c (checkit): Use stdarg, not VA_* macros.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206881 138bc75d-0d04-0410-961f-82ee72b054a4
2014-01-21 23:09:10 +08:00
|
|
|
va_end (args);
|
2001-09-18 07:11:04 +08:00
|
|
|
|
|
|
|
return save_dst;
|
|
|
|
}
|
|
|
|
|
2005-05-25 05:01:33 +08:00
|
|
|
#ifdef __cplusplus
|
|
|
|
extern "C" {
|
|
|
|
#endif /* __cplusplus */
|
2001-09-18 07:11:04 +08:00
|
|
|
char *libiberty_concat_ptr;
|
2005-05-25 05:01:33 +08:00
|
|
|
#ifdef __cplusplus
|
|
|
|
}
|
|
|
|
#endif /* __cplusplus */
|
2001-09-18 07:11:04 +08:00
|
|
|
|
2001-10-16 10:55:31 +08:00
|
|
|
/* @undocumented concat_copy2 */
|
|
|
|
|
2001-09-18 07:11:04 +08:00
|
|
|
char *
|
2005-03-27 13:28:42 +08:00
|
|
|
concat_copy2 (const char *first, ...)
|
2001-09-18 07:11:04 +08:00
|
|
|
{
|
[PATCH] include * ansidecl.h (ANSI_PROTOTYPES, PTRCONST, LONG_DOUBLE, PARAMS) (VPARAMS, VA_START, VA_OPEN, VA_CLOSE, VA_FIXEDARG, CONST) (VOLATILE, SIGNED, PROTO, EXFUN, DEFUN, DEFUN_VOID, AND, DOTS) (NOARGS): Don't define. * libiberty.h (expandargv, writeargv): Don't use PARAMS. libiberty * _doprint.c (checkit): Use stdarg, not VA_* macros. * asprintf.c (asprintf): Use stdarg, not VA_* macros. * concat.c (concat_length, concat_copy, concat_copy2, concat) (reconcat): Use stdarg, not VA_* macros. * snprintf.c (snprintf): Use stdarg, not VA_* macros. * vasprintf.c (checkit): Use stdarg, not VA_* macros. * vsnprintf.c (checkit): Use stdarg, not VA_* macros.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206881 138bc75d-0d04-0410-961f-82ee72b054a4
2014-01-21 23:09:10 +08:00
|
|
|
va_list args;
|
|
|
|
va_start (args, first);
|
2001-09-18 07:11:04 +08:00
|
|
|
vconcat_copy (libiberty_concat_ptr, first, args);
|
[PATCH] include * ansidecl.h (ANSI_PROTOTYPES, PTRCONST, LONG_DOUBLE, PARAMS) (VPARAMS, VA_START, VA_OPEN, VA_CLOSE, VA_FIXEDARG, CONST) (VOLATILE, SIGNED, PROTO, EXFUN, DEFUN, DEFUN_VOID, AND, DOTS) (NOARGS): Don't define. * libiberty.h (expandargv, writeargv): Don't use PARAMS. libiberty * _doprint.c (checkit): Use stdarg, not VA_* macros. * asprintf.c (asprintf): Use stdarg, not VA_* macros. * concat.c (concat_length, concat_copy, concat_copy2, concat) (reconcat): Use stdarg, not VA_* macros. * snprintf.c (snprintf): Use stdarg, not VA_* macros. * vasprintf.c (checkit): Use stdarg, not VA_* macros. * vsnprintf.c (checkit): Use stdarg, not VA_* macros.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206881 138bc75d-0d04-0410-961f-82ee72b054a4
2014-01-21 23:09:10 +08:00
|
|
|
va_end (args);
|
2001-09-18 07:11:04 +08:00
|
|
|
|
|
|
|
return libiberty_concat_ptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
char *
|
2005-03-27 13:28:42 +08:00
|
|
|
concat (const char *first, ...)
|
2001-09-18 07:11:04 +08:00
|
|
|
{
|
|
|
|
char *newstr;
|
[PATCH] include * ansidecl.h (ANSI_PROTOTYPES, PTRCONST, LONG_DOUBLE, PARAMS) (VPARAMS, VA_START, VA_OPEN, VA_CLOSE, VA_FIXEDARG, CONST) (VOLATILE, SIGNED, PROTO, EXFUN, DEFUN, DEFUN_VOID, AND, DOTS) (NOARGS): Don't define. * libiberty.h (expandargv, writeargv): Don't use PARAMS. libiberty * _doprint.c (checkit): Use stdarg, not VA_* macros. * asprintf.c (asprintf): Use stdarg, not VA_* macros. * concat.c (concat_length, concat_copy, concat_copy2, concat) (reconcat): Use stdarg, not VA_* macros. * snprintf.c (snprintf): Use stdarg, not VA_* macros. * vasprintf.c (checkit): Use stdarg, not VA_* macros. * vsnprintf.c (checkit): Use stdarg, not VA_* macros.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206881 138bc75d-0d04-0410-961f-82ee72b054a4
2014-01-21 23:09:10 +08:00
|
|
|
va_list args;
|
2001-09-18 07:11:04 +08:00
|
|
|
|
|
|
|
/* First compute the size of the result and get sufficient memory. */
|
[PATCH] include * ansidecl.h (ANSI_PROTOTYPES, PTRCONST, LONG_DOUBLE, PARAMS) (VPARAMS, VA_START, VA_OPEN, VA_CLOSE, VA_FIXEDARG, CONST) (VOLATILE, SIGNED, PROTO, EXFUN, DEFUN, DEFUN_VOID, AND, DOTS) (NOARGS): Don't define. * libiberty.h (expandargv, writeargv): Don't use PARAMS. libiberty * _doprint.c (checkit): Use stdarg, not VA_* macros. * asprintf.c (asprintf): Use stdarg, not VA_* macros. * concat.c (concat_length, concat_copy, concat_copy2, concat) (reconcat): Use stdarg, not VA_* macros. * snprintf.c (snprintf): Use stdarg, not VA_* macros. * vasprintf.c (checkit): Use stdarg, not VA_* macros. * vsnprintf.c (checkit): Use stdarg, not VA_* macros.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206881 138bc75d-0d04-0410-961f-82ee72b054a4
2014-01-21 23:09:10 +08:00
|
|
|
va_start (args, first);
|
2005-05-25 05:01:33 +08:00
|
|
|
newstr = XNEWVEC (char, vconcat_length (first, args) + 1);
|
[PATCH] include * ansidecl.h (ANSI_PROTOTYPES, PTRCONST, LONG_DOUBLE, PARAMS) (VPARAMS, VA_START, VA_OPEN, VA_CLOSE, VA_FIXEDARG, CONST) (VOLATILE, SIGNED, PROTO, EXFUN, DEFUN, DEFUN_VOID, AND, DOTS) (NOARGS): Don't define. * libiberty.h (expandargv, writeargv): Don't use PARAMS. libiberty * _doprint.c (checkit): Use stdarg, not VA_* macros. * asprintf.c (asprintf): Use stdarg, not VA_* macros. * concat.c (concat_length, concat_copy, concat_copy2, concat) (reconcat): Use stdarg, not VA_* macros. * snprintf.c (snprintf): Use stdarg, not VA_* macros. * vasprintf.c (checkit): Use stdarg, not VA_* macros. * vsnprintf.c (checkit): Use stdarg, not VA_* macros.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206881 138bc75d-0d04-0410-961f-82ee72b054a4
2014-01-21 23:09:10 +08:00
|
|
|
va_end (args);
|
2001-09-18 07:11:04 +08:00
|
|
|
|
|
|
|
/* Now copy the individual pieces to the result string. */
|
[PATCH] include * ansidecl.h (ANSI_PROTOTYPES, PTRCONST, LONG_DOUBLE, PARAMS) (VPARAMS, VA_START, VA_OPEN, VA_CLOSE, VA_FIXEDARG, CONST) (VOLATILE, SIGNED, PROTO, EXFUN, DEFUN, DEFUN_VOID, AND, DOTS) (NOARGS): Don't define. * libiberty.h (expandargv, writeargv): Don't use PARAMS. libiberty * _doprint.c (checkit): Use stdarg, not VA_* macros. * asprintf.c (asprintf): Use stdarg, not VA_* macros. * concat.c (concat_length, concat_copy, concat_copy2, concat) (reconcat): Use stdarg, not VA_* macros. * snprintf.c (snprintf): Use stdarg, not VA_* macros. * vasprintf.c (checkit): Use stdarg, not VA_* macros. * vsnprintf.c (checkit): Use stdarg, not VA_* macros.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206881 138bc75d-0d04-0410-961f-82ee72b054a4
2014-01-21 23:09:10 +08:00
|
|
|
va_start (args, first);
|
2001-09-18 07:11:04 +08:00
|
|
|
vconcat_copy (newstr, first, args);
|
[PATCH] include * ansidecl.h (ANSI_PROTOTYPES, PTRCONST, LONG_DOUBLE, PARAMS) (VPARAMS, VA_START, VA_OPEN, VA_CLOSE, VA_FIXEDARG, CONST) (VOLATILE, SIGNED, PROTO, EXFUN, DEFUN, DEFUN_VOID, AND, DOTS) (NOARGS): Don't define. * libiberty.h (expandargv, writeargv): Don't use PARAMS. libiberty * _doprint.c (checkit): Use stdarg, not VA_* macros. * asprintf.c (asprintf): Use stdarg, not VA_* macros. * concat.c (concat_length, concat_copy, concat_copy2, concat) (reconcat): Use stdarg, not VA_* macros. * snprintf.c (snprintf): Use stdarg, not VA_* macros. * vasprintf.c (checkit): Use stdarg, not VA_* macros. * vsnprintf.c (checkit): Use stdarg, not VA_* macros.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206881 138bc75d-0d04-0410-961f-82ee72b054a4
2014-01-21 23:09:10 +08:00
|
|
|
va_end (args);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
2001-06-11 08:07:54 +08:00
|
|
|
return newstr;
|
1999-05-03 15:29:11 +08:00
|
|
|
}
|
|
|
|
|
2001-10-16 10:55:31 +08:00
|
|
|
/*
|
|
|
|
|
libiberty: documentation markup and order fixes.
libiberty/:
* splay-tree.c: Escape wrapping newlines in texinfo markup
with '@', to fix function declaration output rendering.
* gather-docs: Relax and improve macro name matching to actually
match all current names and to allow input line wrapping.
* bsearch.c, concat.c, crc32.c, fnmatch.txh, fopen_unlocked.c,
hashtab.c, insque.c, make-relative-prefix.c, memchr.c, memcmp.c,
memcpy.c, memmem.c, memmove.c, mempcpy.c, memset.c,
pexecute.txh, random.c, setenv.c, setproctitle.c,
simple-object.txh, snprintf.c, stpncpy.c, strncmp.c, strtod.c,
strtol.c, vasprintf.c, vprintf.c, vsnprintf.c, xmemdup.c:
Wrap long texinfo input lines.
* functions.texi: Regenerate.
2011-02-03 15:23:59 +08:00
|
|
|
@deftypefn Extension char* reconcat (char *@var{optr}, const char *@var{s1}, @
|
|
|
|
@dots{}, @code{NULL})
|
2001-10-16 10:55:31 +08:00
|
|
|
|
|
|
|
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
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
2001-09-25 07:37:52 +08:00
|
|
|
char *
|
2005-03-27 13:28:42 +08:00
|
|
|
reconcat (char *optr, const char *first, ...)
|
2001-09-25 07:37:52 +08:00
|
|
|
{
|
|
|
|
char *newstr;
|
[PATCH] include * ansidecl.h (ANSI_PROTOTYPES, PTRCONST, LONG_DOUBLE, PARAMS) (VPARAMS, VA_START, VA_OPEN, VA_CLOSE, VA_FIXEDARG, CONST) (VOLATILE, SIGNED, PROTO, EXFUN, DEFUN, DEFUN_VOID, AND, DOTS) (NOARGS): Don't define. * libiberty.h (expandargv, writeargv): Don't use PARAMS. libiberty * _doprint.c (checkit): Use stdarg, not VA_* macros. * asprintf.c (asprintf): Use stdarg, not VA_* macros. * concat.c (concat_length, concat_copy, concat_copy2, concat) (reconcat): Use stdarg, not VA_* macros. * snprintf.c (snprintf): Use stdarg, not VA_* macros. * vasprintf.c (checkit): Use stdarg, not VA_* macros. * vsnprintf.c (checkit): Use stdarg, not VA_* macros.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206881 138bc75d-0d04-0410-961f-82ee72b054a4
2014-01-21 23:09:10 +08:00
|
|
|
va_list args;
|
2001-09-25 07:37:52 +08:00
|
|
|
|
|
|
|
/* First compute the size of the result and get sufficient memory. */
|
[PATCH] include * ansidecl.h (ANSI_PROTOTYPES, PTRCONST, LONG_DOUBLE, PARAMS) (VPARAMS, VA_START, VA_OPEN, VA_CLOSE, VA_FIXEDARG, CONST) (VOLATILE, SIGNED, PROTO, EXFUN, DEFUN, DEFUN_VOID, AND, DOTS) (NOARGS): Don't define. * libiberty.h (expandargv, writeargv): Don't use PARAMS. libiberty * _doprint.c (checkit): Use stdarg, not VA_* macros. * asprintf.c (asprintf): Use stdarg, not VA_* macros. * concat.c (concat_length, concat_copy, concat_copy2, concat) (reconcat): Use stdarg, not VA_* macros. * snprintf.c (snprintf): Use stdarg, not VA_* macros. * vasprintf.c (checkit): Use stdarg, not VA_* macros. * vsnprintf.c (checkit): Use stdarg, not VA_* macros.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206881 138bc75d-0d04-0410-961f-82ee72b054a4
2014-01-21 23:09:10 +08:00
|
|
|
va_start (args, first);
|
2005-05-25 05:01:33 +08:00
|
|
|
newstr = XNEWVEC (char, vconcat_length (first, args) + 1);
|
[PATCH] include * ansidecl.h (ANSI_PROTOTYPES, PTRCONST, LONG_DOUBLE, PARAMS) (VPARAMS, VA_START, VA_OPEN, VA_CLOSE, VA_FIXEDARG, CONST) (VOLATILE, SIGNED, PROTO, EXFUN, DEFUN, DEFUN_VOID, AND, DOTS) (NOARGS): Don't define. * libiberty.h (expandargv, writeargv): Don't use PARAMS. libiberty * _doprint.c (checkit): Use stdarg, not VA_* macros. * asprintf.c (asprintf): Use stdarg, not VA_* macros. * concat.c (concat_length, concat_copy, concat_copy2, concat) (reconcat): Use stdarg, not VA_* macros. * snprintf.c (snprintf): Use stdarg, not VA_* macros. * vasprintf.c (checkit): Use stdarg, not VA_* macros. * vsnprintf.c (checkit): Use stdarg, not VA_* macros.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206881 138bc75d-0d04-0410-961f-82ee72b054a4
2014-01-21 23:09:10 +08:00
|
|
|
va_end (args);
|
2001-09-25 07:37:52 +08:00
|
|
|
|
|
|
|
/* Now copy the individual pieces to the result string. */
|
[PATCH] include * ansidecl.h (ANSI_PROTOTYPES, PTRCONST, LONG_DOUBLE, PARAMS) (VPARAMS, VA_START, VA_OPEN, VA_CLOSE, VA_FIXEDARG, CONST) (VOLATILE, SIGNED, PROTO, EXFUN, DEFUN, DEFUN_VOID, AND, DOTS) (NOARGS): Don't define. * libiberty.h (expandargv, writeargv): Don't use PARAMS. libiberty * _doprint.c (checkit): Use stdarg, not VA_* macros. * asprintf.c (asprintf): Use stdarg, not VA_* macros. * concat.c (concat_length, concat_copy, concat_copy2, concat) (reconcat): Use stdarg, not VA_* macros. * snprintf.c (snprintf): Use stdarg, not VA_* macros. * vasprintf.c (checkit): Use stdarg, not VA_* macros. * vsnprintf.c (checkit): Use stdarg, not VA_* macros.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206881 138bc75d-0d04-0410-961f-82ee72b054a4
2014-01-21 23:09:10 +08:00
|
|
|
va_start (args, first);
|
2001-09-25 07:37:52 +08:00
|
|
|
vconcat_copy (newstr, first, args);
|
2001-09-26 07:02:03 +08:00
|
|
|
if (optr) /* Done before VA_CLOSE so optr stays in scope for K&R C. */
|
2001-09-25 07:37:52 +08:00
|
|
|
free (optr);
|
[PATCH] include * ansidecl.h (ANSI_PROTOTYPES, PTRCONST, LONG_DOUBLE, PARAMS) (VPARAMS, VA_START, VA_OPEN, VA_CLOSE, VA_FIXEDARG, CONST) (VOLATILE, SIGNED, PROTO, EXFUN, DEFUN, DEFUN_VOID, AND, DOTS) (NOARGS): Don't define. * libiberty.h (expandargv, writeargv): Don't use PARAMS. libiberty * _doprint.c (checkit): Use stdarg, not VA_* macros. * asprintf.c (asprintf): Use stdarg, not VA_* macros. * concat.c (concat_length, concat_copy, concat_copy2, concat) (reconcat): Use stdarg, not VA_* macros. * snprintf.c (snprintf): Use stdarg, not VA_* macros. * vasprintf.c (checkit): Use stdarg, not VA_* macros. * vsnprintf.c (checkit): Use stdarg, not VA_* macros.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206881 138bc75d-0d04-0410-961f-82ee72b054a4
2014-01-21 23:09:10 +08:00
|
|
|
va_end (args);
|
2001-09-25 07:37:52 +08:00
|
|
|
|
|
|
|
return newstr;
|
|
|
|
}
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
#ifdef MAIN
|
2001-06-11 08:07:54 +08:00
|
|
|
#define NULLP (char *)0
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
/* Simple little test driver. */
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
|
|
|
int
|
2005-03-27 13:28:42 +08:00
|
|
|
main (void)
|
1999-05-03 15:29:11 +08:00
|
|
|
{
|
|
|
|
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
|