Correct handling of separators after last non-separator.
[glibc.git] / string / argz-addsep.c
blob38f3138ec145396eca664707b8a8bef408004866
1 /* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
2 This file is part of the GNU C Library.
3 Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996.
5 The GNU C Library is free software; you can redistribute it and/or
6 modify it under the terms of the GNU Library General Public License as
7 published by the Free Software Foundation; either version 2 of the
8 License, or (at your option) any later version.
10 The GNU C Library is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 Library General Public License for more details.
15 You should have received a copy of the GNU Library General Public
16 License along with the GNU C Library; see the file COPYING.LIB. If not,
17 write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
18 Boston, MA 02111-1307, USA. */
20 #include <argz.h>
21 #include <errno.h>
22 #include <stdlib.h>
23 #include <string.h>
26 error_t
27 __argz_add_sep (char **argz, size_t *argz_len, const char *string, int delim)
29 size_t nlen = strlen (string) + 1;
31 if (nlen > 1)
33 const char *rp;
34 char *wp;
36 *argz = (char *) realloc (*argz, *argz_len + nlen);
37 if (*argz == NULL)
38 return ENOMEM;
40 wp = *argz + *argz_len;
41 rp = string;
43 if (*rp == delim)
45 if (wp > *argz && wp[-1] != '\0')
46 *wp++ = '\0';
47 else
48 --nlen;
50 else
51 *wp++ = *rp;
52 while (*rp++ != '\0');
54 *argz_len += nlen;
57 return 0;
59 weak_alias (__argz_add_sep, argz_add_sep)