mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-20 01:40:26 +00:00
86187531d3
1997-11-06 00:06 Ulrich Drepper <drepper@cygnus.com> * argp/argp-help.c: Optimize a bit by using mempcpy. * elf/dl-load.c: Likewise. * elf/dl-lookup.c: Likewise. * inet/rcmd.c: Likewise. * io/ftw.c: Likewise. * libio/fileops.c: Likewise. * libio/genops.c: Likewise. * libio/obprintf.c: Likewise. * nss/nsswitch.c: Likewise. * posix/execvp.c: Likewise. * posix/getopt.c: Likewise. * posix/glob.c: Likewise. * posix/wordexp.c: Likewise. * stdio-common/vfprintf.c: Likewise. * stdlib/canonicalize.c: Likewise. * stdlib/msort.c: Likewise. * string/argz-replace.c: Likewise. * sysdeps/generic/putenv.c: Likewise. * sysdeps/generic/setenv.c: Likewise. * sysdeps/posix/getcwd.c: Likewise. * sysdeps/posix/ttyname.c: Likewise. * sysdeps/posix/writev.c: Likewise. * time/strftime.c: Likewise. * time/tzfile.c: Likewise. * login/utmp_daemon.c: Use memcpy instead of strcpy where possible. * sunrpc/svcauth_des.c: Likewise. * sysdeps/unix/sysv/linux/gethostname.c: Likewise. * misc/tsearch.c: Use memcpy return value if possible. * posix/regex.c: Likewise. * sysdeps/unix/readdir_r.c: Likewise. * wcsmbc/wcsdup.c: Likewise. * nss/digits_dots.c: Little optimization. * inet/ruserpass.c (ruserpass): Optimize by using stpcpy. (struct toktab): Make tokstr field a const char *. * elf/dl-profile.c: Fix typo. * inet/ether_ntoh.c: Don't use relative #include path. * inet/gethstbynm.c: Likewise. * resolv/inet_pton.c: Likewise. * shadow/sgetspent_r.c: Likewise. * libio/oldfileops.c (_IO_old_file_jumps): Use correct sync and write callbacks. Patch by NIIBE Yutaka <gniibe@mri.co.jp>. * posix/confstr.c: Correct string for _CS_LFS_CFLAGS. Handle _CS_XBS5_* constants. * posix/unistd.h: Add comment describing _XBS5_* constants. * sysdeps/generic/bits/confname.h: Add _CS_XBS5_* constants. * posix/regex.c: Indent preprocessor code. * posix/wordexp.c: Using _itoa_word instead of sprintf. * stdlib/canonicalize.c: Avoid unnecessary copying. Handle NULL and "" arguments correctly according to SUS. * stdlib/test-canon.c: Test "" and NULL argument handling. * sysdeps/posix/writev.c: Correct condition to leave the loop. 1997-11-05 18:13 Ulrich Drepper <drepper@cygnus.com> * nss/getXXbyYY.c: Set buffer to NULL if realloc fails so that possible next call starts with malloc again. Proposed by Joe Keane <jgk@jgk.org>. 1997-11-04 23:57 Ulrich Drepper <drepper@cygnus.com> * configure.in: Correct gcc -pipe test. Patch by Zack Weinberg <zack@rabi.phys.columbia.edu>. * posix/glob.c: Cleanups. Patch by H.J. Lu <hjl@lucon.org>. 1997-11-04 Andreas Jaeger <aj@arthur.rhein-neckar.de> * manual/creature.texi (Feature Test Macros): Add _POSIX_C_SOURCE definition.
136 lines
3.6 KiB
C
136 lines
3.6 KiB
C
/* String replacement in an argz vector
|
|
Copyright (C) 1997 Free Software Foundation, Inc.
|
|
Written by Miles Bader <miles@gnu.ai.mit.edu>
|
|
|
|
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 <stdlib.h>
|
|
#include <string.h>
|
|
#include <argz.h>
|
|
|
|
/* Append BUF, of length BUF_LEN to *TO, of length *TO_LEN, reallocating and
|
|
updating *TO & *TO_LEN appropriately. If an allocation error occurs,
|
|
*TO's old value is freed, and *TO is set to 0. */
|
|
static void
|
|
str_append (char **to, size_t *to_len, const char *buf, const size_t buf_len)
|
|
{
|
|
size_t new_len = *to_len + buf_len;
|
|
char *new_to = realloc (*to, new_len + 1);
|
|
|
|
if (new_to)
|
|
{
|
|
*((char *) __mempcpy (new_to + *to_len, buf, buf_len)) = '\0';
|
|
*to = new_to;
|
|
*to_len = new_len;
|
|
}
|
|
else
|
|
{
|
|
free (*to);
|
|
*to = 0;
|
|
}
|
|
}
|
|
|
|
/* Replace any occurances of the string STR in ARGZ with WITH, reallocating
|
|
ARGZ as necessary. If REPLACE_COUNT is non-zero, *REPLACE_COUNT will be
|
|
incremented by number of replacements performed. */
|
|
error_t
|
|
__argz_replace (char **argz, size_t *argz_len, const char *str, const char *with,
|
|
unsigned *replace_count)
|
|
{
|
|
error_t err = 0;
|
|
|
|
if (str && *str)
|
|
{
|
|
char *arg = 0;
|
|
char *src = *argz;
|
|
size_t src_len = *argz_len;
|
|
char *dst = 0;
|
|
size_t dst_len = 0;
|
|
int delayed_copy = 1; /* True while we've avoided copying anything. */
|
|
size_t str_len = strlen (str), with_len = strlen (with);
|
|
|
|
while (!err && (arg = argz_next (src, src_len, arg)))
|
|
{
|
|
char *match = strstr (arg, str);
|
|
if (match)
|
|
{
|
|
char *from = match + str_len;
|
|
size_t to_len = match - arg;
|
|
char *to = strndup (arg, to_len);
|
|
|
|
while (to && from)
|
|
{
|
|
str_append (&to, &to_len, with, with_len);
|
|
if (to)
|
|
{
|
|
match = strstr (from, str);
|
|
if (match)
|
|
{
|
|
str_append (&to, &to_len, from, match - from);
|
|
from = match + str_len;
|
|
}
|
|
else
|
|
{
|
|
str_append (&to, &to_len, from, strlen (from));
|
|
from = 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (to)
|
|
{
|
|
if (delayed_copy)
|
|
/* We avoided copying SRC to DST until we found a match;
|
|
now that we've done so, copy everything from the start
|
|
of SRC. */
|
|
{
|
|
if (arg > src)
|
|
err = argz_append (&dst, &dst_len, src, (arg - src));
|
|
delayed_copy = 0;
|
|
}
|
|
if (! err)
|
|
err = argz_add (&dst, &dst_len, to);
|
|
free (to);
|
|
}
|
|
else
|
|
err = ENOMEM;
|
|
|
|
if (replace_count)
|
|
(*replace_count)++;
|
|
}
|
|
else if (! delayed_copy)
|
|
err = argz_add (&dst, &dst_len, arg);
|
|
}
|
|
|
|
if (! err)
|
|
{
|
|
if (! delayed_copy)
|
|
/* We never found any instances of str. */
|
|
{
|
|
if (src)
|
|
free (src);
|
|
*argz = dst;
|
|
*argz_len = dst_len;
|
|
}
|
|
}
|
|
else if (dst_len > 0)
|
|
free (dst);
|
|
}
|
|
|
|
return err;
|
|
}
|
|
weak_alias (__argz_replace, argz_replace)
|