mirror of
https://sourceware.org/git/glibc.git
synced 2025-12-05 00:02:41 +03:00
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
111 lines
3.1 KiB
C
111 lines
3.1 KiB
C
/* Capture output from a subprocess.
|
|
Copyright (C) 2017-2019 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
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 <support/subprocess.h>
|
|
#include <support/capture_subprocess.h>
|
|
|
|
#include <errno.h>
|
|
#include <stdlib.h>
|
|
#include <support/check.h>
|
|
#include <support/xunistd.h>
|
|
#include <support/xsocket.h>
|
|
#include <support/xspawn.h>
|
|
|
|
static void
|
|
transfer (const char *what, struct pollfd *pfd, struct xmemstream *stream)
|
|
{
|
|
if (pfd->revents != 0)
|
|
{
|
|
char buf[1024];
|
|
ssize_t ret = TEMP_FAILURE_RETRY (read (pfd->fd, buf, sizeof (buf)));
|
|
if (ret < 0)
|
|
{
|
|
support_record_failure ();
|
|
printf ("error: reading from subprocess %s: %m", what);
|
|
pfd->events = 0;
|
|
pfd->revents = 0;
|
|
}
|
|
else if (ret == 0)
|
|
{
|
|
/* EOF reached. Stop listening. */
|
|
pfd->events = 0;
|
|
pfd->revents = 0;
|
|
}
|
|
else
|
|
/* Store the data just read. */
|
|
TEST_VERIFY (fwrite (buf, ret, 1, stream->out) == 1);
|
|
}
|
|
}
|
|
|
|
static void
|
|
support_capture_poll (struct support_capture_subprocess *result,
|
|
struct support_subprocess *proc)
|
|
{
|
|
struct pollfd fds[2] =
|
|
{
|
|
{ .fd = proc->stdout_pipe[0], .events = POLLIN },
|
|
{ .fd = proc->stderr_pipe[0], .events = POLLIN },
|
|
};
|
|
|
|
do
|
|
{
|
|
xpoll (fds, 2, -1);
|
|
transfer ("stdout", &fds[0], &result->out);
|
|
transfer ("stderr", &fds[1], &result->err);
|
|
}
|
|
while (fds[0].events != 0 || fds[1].events != 0);
|
|
|
|
xfclose_memstream (&result->out);
|
|
xfclose_memstream (&result->err);
|
|
|
|
result->status = support_process_wait (proc);
|
|
}
|
|
|
|
struct support_capture_subprocess
|
|
support_capture_subprocess (void (*callback) (void *), void *closure)
|
|
{
|
|
struct support_capture_subprocess result;
|
|
xopen_memstream (&result.out);
|
|
xopen_memstream (&result.err);
|
|
|
|
struct support_subprocess proc = support_subprocess (callback, closure);
|
|
|
|
support_capture_poll (&result, &proc);
|
|
return result;
|
|
}
|
|
|
|
struct support_capture_subprocess
|
|
support_capture_subprogram (const char *file, char *const argv[])
|
|
{
|
|
struct support_capture_subprocess result;
|
|
xopen_memstream (&result.out);
|
|
xopen_memstream (&result.err);
|
|
|
|
struct support_subprocess proc = support_subprogram (file, argv);
|
|
|
|
support_capture_poll (&result, &proc);
|
|
return result;
|
|
}
|
|
|
|
void
|
|
support_capture_subprocess_free (struct support_capture_subprocess *p)
|
|
{
|
|
free (p->out.buffer);
|
|
free (p->err.buffer);
|
|
}
|