diff options
author | Ulrich Drepper <drepper@redhat.com> | 1996-12-02 04:00:15 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1996-12-02 04:00:15 +0000 |
commit | e4cf5070694529a8779d5e1581567bcfb9307da0 (patch) | |
tree | a0ea63fe9d81e75431c6c37340810c850e53c736 /string/argz-addsep.c | |
parent | update from main archive 961127 (diff) | |
download | glibc-e4cf5070694529a8779d5e1581567bcfb9307da0.tar.gz glibc-e4cf5070694529a8779d5e1581567bcfb9307da0.tar.bz2 glibc-e4cf5070694529a8779d5e1581567bcfb9307da0.zip |
update from main archive 961201cvs/libc-961202
Mon Dec 2 03:59:38 1996 Ulrich Drepper <drepper@cygnus.com>
* grp/initgroups.c: Update and reformat copyright.
Use __getgrent_r instead of getgrent.
* inet/rcmd.c: Update and reformat copyright.
Use __gethostbyname_r instead of gethostbyname.
* inet/rexec.c: Likewise.
* intl/finddomain.c: Correct comment about CEN sponsor and revision.
* locale/findlocale.c: Likewise.
* intl/l10nflist.c: Correct handling of CEN sponsor and revision.
* locale/Makefile (CPPFLAGS): Add definition of LOCALEDIR.
* locale/setlocale.c (setlocale): Correctly split value of
LOCALE_PATH.
* locale/programs/localedef.c: Use LOCALEDIR not LOCALE_PATH to
find output directory.
* nss/getXXbyYY.c [NEED_H_ERRNO]: Before enlarging buffer test
h_errno_tmp variable.
Save error value from being changed during `free' call.
* nss/getXXent.c: Likewise.
* nss/nss_files/files-XXX.c: Set h_errno variable to NETDB_INTERNAL
before returning ERANGE error.
* posix/glob.c: Use getlogin_r and getpwnam_r function when available
or in GNU libc.
* pwd/getpw.c: Use getpwuid_r instead of getpwuid.
* sunrpc/clnt_gen.c: Use gethostbyname_r and getprotobyname_r.
* sunrpc/clnt_simp.c: Likewise.
* sunrpc/getrpcport.c: Likewise.
* sysdeps/unix/sysv/linux/gethostid.c: Likewise.
* posix/getconf.c: Treat _SC_UNIT_MAX and _SC_ULONG_MAX separately
since the value might be outsode the range of the `long int'.
Print string `undefined' when a value is undefined.
* stdlib/l64a.c: Return correct pointer.
Patch by NIIBE Yutaka <gniibe@mri.co.jp>.
* string/Makefile (routines): Add argz-addsep.
* string/argz-addsep.c: New file.
* string/argz.h: Add prototypes for argz_add_sep.
* string/argz-ctsep.c: Prevent memory leak.
* string/strcoll.c: Correct typo in comment.
Sat Nov 30 02:53:59 1996 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/sys/serial.h: Removed again. The file is
not general enough to be part of the libc.
* sysdeps/unix/sysv/linux/Dist: Remove sys/serial.h.
* sysdeps/unix/sysv/linux/Makefile: Don't install sys/serial.h.
Thu Nov 28 20:04:41 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* login/Makefile: Fix typo.
* nss/Makefile (generated): Filter out db-alias.c.
Thu Nov 28 14:44:01 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* time/Makefile (echo-zonenames): Don't depend on non-existing
target `zonenames'.
Thu Nov 28 12:34:05 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* link.h: New file.
* nss/nsswitch.c: Use it.
* printf.h: Fix file name.
* stdlib/strfmon.c: Use it.
Diffstat (limited to 'string/argz-addsep.c')
-rw-r--r-- | string/argz-addsep.c | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/string/argz-addsep.c b/string/argz-addsep.c new file mode 100644 index 0000000000..7405e9ad1a --- /dev/null +++ b/string/argz-addsep.c @@ -0,0 +1,59 @@ +/* Copyright (C) 1996 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996. + + The GNU C Library 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. + + The GNU C Library 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 the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <argz.h> +#include <errno.h> +#include <stdlib.h> +#include <string.h> + + +error_t +__argz_add_sep (char **argz, size_t *argz_len, const char *string, int delim) +{ + size_t nlen = strlen (string) + 1; + + if (nlen > 1) + { + const char *rp; + char *wp; + + *argz = (char *) realloc (*argz, *argz_len + nlen); + if (*argz == NULL) + return ENOMEM; + + wp = *argz + *argz_len; + rp = string; + do + if (*rp == delim) + { + if (wp > *argz && wp[-1] != '\0') + *wp++ = '\0'; + else + --nlen; + } + else + *wp++ = *rp; + while (*rp++ != '\0'); + + *argz_len += nlen; + } + + return 0; +} +weak_alias (__argz_create_sep, argz_create_sep) |