mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-25 12:11:10 +00:00
5a82c74822
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
64 lines
2.2 KiB
C
64 lines
2.2 KiB
C
/* Routines for dealing with '\0' separated arg vectors.
|
|
Copyright (C) 1995-2019 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
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 Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
#include <argz.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
|
|
/* Insert ENTRY into ARGZ & ARGZ_LEN before BEFORE, which should be an
|
|
existing entry in ARGZ; if BEFORE is NULL, ENTRY is appended to the end.
|
|
Since ARGZ's first entry is the same as ARGZ, argz_insert (ARGZ, ARGZ_LEN,
|
|
ARGZ, ENTRY) will insert ENTRY at the beginning of ARGZ. If BEFORE is not
|
|
in ARGZ, EINVAL is returned, else if memory can't be allocated for the new
|
|
ARGZ, ENOMEM is returned, else 0. */
|
|
error_t
|
|
__argz_insert (char **argz, size_t *argz_len, char *before, const char *entry)
|
|
{
|
|
if (! before)
|
|
return __argz_add (argz, argz_len, entry);
|
|
|
|
if (before < *argz || before >= *argz + *argz_len)
|
|
return EINVAL;
|
|
|
|
if (before > *argz)
|
|
/* Make sure before is actually the beginning of an entry. */
|
|
while (before[-1])
|
|
before--;
|
|
|
|
{
|
|
size_t after_before = *argz_len - (before - *argz);
|
|
size_t entry_len = strlen (entry) + 1;
|
|
size_t new_argz_len = *argz_len + entry_len;
|
|
char *new_argz = realloc (*argz, new_argz_len);
|
|
|
|
if (new_argz)
|
|
{
|
|
before = new_argz + (before - *argz);
|
|
memmove (before + entry_len, before, after_before);
|
|
memmove (before, entry, entry_len);
|
|
*argz = new_argz;
|
|
*argz_len = new_argz_len;
|
|
return 0;
|
|
}
|
|
else
|
|
return ENOMEM;
|
|
}
|
|
}
|
|
weak_alias (__argz_insert, argz_insert)
|