This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch release/2.27/master updated. glibc-2.27-69-g4492721
- From: fw at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 3 Jul 2018 16:12:24 -0000
- Subject: GNU C Library master sources branch release/2.27/master updated. glibc-2.27-69-g4492721
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, release/2.27/master has been updated
via 44927211651adde42bbd431ef5ebe568186125e5 (commit)
via 060eb7c3b5db70a1b03b031965b2f44792a3b07a (commit)
from 3bb748257405e94e13de76573a4e9da1cfd961d0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=44927211651adde42bbd431ef5ebe568186125e5
commit 44927211651adde42bbd431ef5ebe568186125e5
Author: Florian Weimer <fweimer@redhat.com>
Date: Tue Jul 3 17:57:14 2018 +0200
libio: Add tst-vtables, tst-vtables-interposed
(cherry picked from commit 29055464a03c72762969a2e8734d0d05d4d70e58)
Some adjustments were needed for a tricky multi-inclusion issue related
to libioP.h.
diff --git a/ChangeLog b/ChangeLog
index c096ba3..0934df9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2018-06-26 Florian Weimer <fweimer@redhat.com>
+ * libio/Makefile (tests-internal): Add tst-vtables,
+ tst-vtables-interposed.
+ * libio/tst-vtables.c: New file.
+ * libio/tst-vtables-common.c: Likewise.
+ * libio/tst-vtables-interposed.c: Likewise.
+
+2018-06-26 Florian Weimer <fweimer@redhat.com>
+
[BZ #23313]
* libio/vtables.c (check_stdfiles_vtables): New ELF constructor.
diff --git a/libio/Makefile b/libio/Makefile
index 918a86b..81bd179 100644
--- a/libio/Makefile
+++ b/libio/Makefile
@@ -64,6 +64,9 @@ tests = tst_swprintf tst_wprintf tst_swscanf tst_wscanf tst_getwc tst_putwc \
tst-setvbuf1 tst-popen1 tst-fgetwc bug-wsetpos tst-fseek \
tst-fwrite-error tst-ftell-partial-wide tst-ftell-active-handler \
tst-ftell-append tst-fputws tst-bz22415
+
+tests-internal = tst-vtables tst-vtables-interposed
+
ifeq (yes,$(build-shared))
# Add test-fopenloc only if shared library is enabled since it depends on
# shared localedata objects.
diff --git a/libio/tst-vtables-common.c b/libio/tst-vtables-common.c
new file mode 100644
index 0000000..dc8d89c
--- /dev/null
+++ b/libio/tst-vtables-common.c
@@ -0,0 +1,511 @@
+/* Test for libio vtables and their validation. Common code.
+ Copyright (C) 2018 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
+ <http://www.gnu.org/licenses/>. */
+
+/* This test provides some coverage for how various stdio functions
+ use the vtables in FILE * objects. The focus is mostly on which
+ functions call which methods, not so much on validating data
+ processing. An initial series of tests check that custom vtables
+ do not work without activation through _IO_init.
+
+ Note: libio vtables are deprecated feature. Do not use this test
+ as a documentation source for writing custom vtables. See
+ fopencookie for a different way of creating custom stdio
+ streams. */
+
+#include <stdbool.h>
+#include <string.h>
+#include <support/capture_subprocess.h>
+#include <support/check.h>
+#include <support/namespace.h>
+#include <support/support.h>
+#include <support/test-driver.h>
+#include <support/xunistd.h>
+
+/* Data shared between the test subprocess and the test driver in the
+ parent. Note that *shared is reset at the start of the check_call
+ function. */
+struct shared
+{
+ /* Expected file pointer for method calls. */
+ FILE *fp;
+
+ /* If true, assume that a call to _IO_init is needed to enable
+ custom vtables. */
+ bool initially_disabled;
+
+ /* Requested return value for the methods which have one. */
+ int return_value;
+
+ /* A value (usually a character) recorded by some of the methods
+ below. */
+ int value;
+
+ /* Likewise, for some data. */
+ char buffer[16];
+ size_t buffer_length;
+
+ /* Total number of method calls. */
+ unsigned int calls;
+
+ /* Individual method call counts. */
+ unsigned int calls_finish;
+ unsigned int calls_overflow;
+ unsigned int calls_underflow;
+ unsigned int calls_uflow;
+ unsigned int calls_pbackfail;
+ unsigned int calls_xsputn;
+ unsigned int calls_xsgetn;
+ unsigned int calls_seekoff;
+ unsigned int calls_seekpos;
+ unsigned int calls_setbuf;
+ unsigned int calls_sync;
+ unsigned int calls_doallocate;
+ unsigned int calls_read;
+ unsigned int calls_write;
+ unsigned int calls_seek;
+ unsigned int calls_close;
+ unsigned int calls_stat;
+ unsigned int calls_showmanyc;
+ unsigned int calls_imbue;
+} *shared;
+
+/* Method implementations which increment the counters in *shared. */
+
+static void
+log_method (FILE *fp, const char *name)
+{
+ if (test_verbose > 0)
+ printf ("info: %s (%p) called\n", name, fp);
+}
+
+static void
+method_finish (FILE *fp, int dummy)
+{
+ log_method (fp, __func__);
+ TEST_VERIFY (fp == shared->fp);
+ ++shared->calls;
+ ++shared->calls_finish;
+}
+
+static int
+method_overflow (FILE *fp, int ch)
+{
+ log_method (fp, __func__);
+ TEST_VERIFY (fp == shared->fp);
+ ++shared->calls;
+ ++shared->calls_overflow;
+ shared->value = ch;
+ return shared->return_value;
+}
+
+static int
+method_underflow (FILE *fp)
+{
+ log_method (fp, __func__);
+ TEST_VERIFY (fp == shared->fp);
+ ++shared->calls;
+ ++shared->calls_underflow;
+ return shared->return_value;
+}
+
+static int
+method_uflow (FILE *fp)
+{
+ log_method (fp, __func__);
+ TEST_VERIFY (fp == shared->fp);
+ ++shared->calls;
+ ++shared->calls_uflow;
+ return shared->return_value;
+}
+
+static int
+method_pbackfail (FILE *fp, int ch)
+{
+ log_method (fp, __func__);
+ TEST_VERIFY (fp == shared->fp);
+ ++shared->calls;
+ ++shared->calls_pbackfail;
+ shared->value = ch;
+ return shared->return_value;
+}
+
+static size_t
+method_xsputn (FILE *fp, const void *data, size_t n)
+{
+ log_method (fp, __func__);
+ TEST_VERIFY (fp == shared->fp);
+ ++shared->calls;
+ ++shared->calls_xsputn;
+
+ size_t to_copy = n;
+ if (n > sizeof (shared->buffer))
+ to_copy = sizeof (shared->buffer);
+ memcpy (shared->buffer, data, to_copy);
+ shared->buffer_length = to_copy;
+ return to_copy;
+}
+
+static size_t
+method_xsgetn (FILE *fp, void *data, size_t n)
+{
+ log_method (fp, __func__);
+ TEST_VERIFY (fp == shared->fp);
+ ++shared->calls;
+ ++shared->calls_xsgetn;
+ return 0;
+}
+
+static off64_t
+method_seekoff (FILE *fp, off64_t offset, int dir, int mode)
+{
+ log_method (fp, __func__);
+ TEST_VERIFY (fp == shared->fp);
+ ++shared->calls;
+ ++shared->calls_seekoff;
+ return shared->return_value;
+}
+
+static off64_t
+method_seekpos (FILE *fp, off64_t offset, int mode)
+{
+ log_method (fp, __func__);
+ TEST_VERIFY (fp == shared->fp);
+ ++shared->calls;
+ ++shared->calls_seekpos;
+ return shared->return_value;
+}
+
+static FILE *
+method_setbuf (FILE *fp, char *buffer, ssize_t length)
+{
+ log_method (fp, __func__);
+ TEST_VERIFY (fp == shared->fp);
+ ++shared->calls;
+ ++shared->calls_setbuf;
+ return fp;
+}
+
+static int
+method_sync (FILE *fp)
+{
+ log_method (fp, __func__);
+ TEST_VERIFY (fp == shared->fp);
+ ++shared->calls;
+ ++shared->calls_sync;
+ return shared->return_value;
+}
+
+static int
+method_doallocate (FILE *fp)
+{
+ log_method (fp, __func__);
+ TEST_VERIFY (fp == shared->fp);
+ ++shared->calls;
+ ++shared->calls_doallocate;
+ return shared->return_value;
+}
+
+static ssize_t
+method_read (FILE *fp, void *data, ssize_t length)
+{
+ log_method (fp, __func__);
+ TEST_VERIFY (fp == shared->fp);
+ ++shared->calls;
+ ++shared->calls_read;
+ return shared->return_value;
+}
+
+static ssize_t
+method_write (FILE *fp, const void *data, ssize_t length)
+{
+ log_method (fp, __func__);
+ TEST_VERIFY (fp == shared->fp);
+ ++shared->calls;
+ ++shared->calls_write;
+ return shared->return_value;
+}
+
+static off64_t
+method_seek (FILE *fp, off64_t offset, int mode)
+{
+ log_method (fp, __func__);
+ TEST_VERIFY (fp == shared->fp);
+ ++shared->calls;
+ ++shared->calls_seek;
+ return shared->return_value;
+}
+
+static int
+method_close (FILE *fp)
+{
+ log_method (fp, __func__);
+ TEST_VERIFY (fp == shared->fp);
+ ++shared->calls;
+ ++shared->calls_close;
+ return shared->return_value;
+}
+
+static int
+method_stat (FILE *fp, void *buffer)
+{
+ log_method (fp, __func__);
+ TEST_VERIFY (fp == shared->fp);
+ ++shared->calls;
+ ++shared->calls_stat;
+ return shared->return_value;
+}
+
+static int
+method_showmanyc (FILE *fp)
+{
+ log_method (fp, __func__);
+ TEST_VERIFY (fp == shared->fp);
+ ++shared->calls;
+ ++shared->calls_showmanyc;
+ return shared->return_value;
+}
+
+static void
+method_imbue (FILE *fp, void *locale)
+{
+ log_method (fp, __func__);
+ TEST_VERIFY (fp == shared->fp);
+ ++shared->calls;
+ ++shared->calls_imbue;
+}
+
+/* Our custom vtable. */
+
+static const struct _IO_jump_t jumps =
+{
+ JUMP_INIT_DUMMY,
+ JUMP_INIT (finish, method_finish),
+ JUMP_INIT (overflow, method_overflow),
+ JUMP_INIT (underflow, method_underflow),
+ JUMP_INIT (uflow, method_uflow),
+ JUMP_INIT (pbackfail, method_pbackfail),
+ JUMP_INIT (xsputn, method_xsputn),
+ JUMP_INIT (xsgetn, method_xsgetn),
+ JUMP_INIT (seekoff, method_seekoff),
+ JUMP_INIT (seekpos, method_seekpos),
+ JUMP_INIT (setbuf, method_setbuf),
+ JUMP_INIT (sync, method_sync),
+ JUMP_INIT (doallocate, method_doallocate),
+ JUMP_INIT (read, method_read),
+ JUMP_INIT (write, method_write),
+ JUMP_INIT (seek, method_seek),
+ JUMP_INIT (close, method_close),
+ JUMP_INIT (stat, method_stat),
+ JUMP_INIT (showmanyc, method_showmanyc),
+ JUMP_INIT (imbue, method_imbue)
+};
+
+/* Our file implementation. */
+
+struct my_file
+{
+ FILE f;
+ const struct _IO_jump_t *vtable;
+};
+
+struct my_file
+my_file_create (void)
+{
+ return (struct my_file)
+ {
+ /* Disable locking, so that we do not have to set up a lock
+ pointer. */
+ .f._flags = _IO_USER_LOCK,
+
+ /* Copy the offset from the an initialized handle, instead of
+ figuring it out from scratch. */
+ .f._vtable_offset = stdin->_vtable_offset,
+
+ .vtable = &jumps,
+ };
+}
+
+/* Initial tests which do not enable vtable compatibility. */
+
+/* Inhibit GCC optimization of fprintf. */
+typedef int (*fprintf_type) (FILE *, const char *, ...);
+static const volatile fprintf_type fprintf_ptr = &fprintf;
+
+static void
+without_compatibility_fprintf (void *closure)
+{
+ /* This call should abort. */
+ fprintf_ptr (shared->fp, " ");
+ _exit (1);
+}
+
+static void
+without_compatibility_fputc (void *closure)
+{
+ /* This call should abort. */
+ fputc (' ', shared->fp);
+ _exit (1);
+}
+
+static void
+without_compatibility_fgetc (void *closure)
+{
+ /* This call should abort. */
+ fgetc (shared->fp);
+ _exit (1);
+}
+
+static void
+without_compatibility_fflush (void *closure)
+{
+ /* This call should abort. */
+ fflush (shared->fp);
+ _exit (1);
+}
+
+/* Exit status after abnormal termination. */
+static int termination_status;
+
+static void
+init_termination_status (void)
+{
+ pid_t pid = xfork ();
+ if (pid == 0)
+ abort ();
+ xwaitpid (pid, &termination_status, 0);
+
+ TEST_VERIFY (WIFSIGNALED (termination_status));
+ TEST_COMPARE (WTERMSIG (termination_status), SIGABRT);
+}
+
+static void
+check_for_termination (const char *name, void (*callback) (void *))
+{
+ struct my_file file = my_file_create ();
+ shared->fp = &file.f;
+ shared->return_value = -1;
+ shared->calls = 0;
+ struct support_capture_subprocess proc
+ = support_capture_subprocess (callback, NULL);
+ support_capture_subprocess_check (&proc, name, termination_status,
+ sc_allow_stderr);
+ const char *message
+ = "Fatal error: glibc detected an invalid stdio handle\n";
+ TEST_COMPARE_BLOB (proc.err.buffer, proc.err.length,
+ message, strlen (message));
+ TEST_COMPARE (shared->calls, 0);
+ support_capture_subprocess_free (&proc);
+}
+
+/* The test with vtable validation disabled. */
+
+/* This function does not have a prototype in libioP.h to prevent
+ accidental use from within the library (which would disable vtable
+ verification). */
+void _IO_init (FILE *fp, int flags);
+
+static void
+with_compatibility_fprintf (void *closure)
+{
+ TEST_COMPARE (fprintf_ptr (shared->fp, "A%sCD", "B"), 4);
+ TEST_COMPARE (shared->calls, 3);
+ TEST_COMPARE (shared->calls_xsputn, 3);
+ TEST_COMPARE_BLOB (shared->buffer, shared->buffer_length,
+ "CD", 2);
+}
+
+static void
+with_compatibility_fputc (void *closure)
+{
+ shared->return_value = '@';
+ TEST_COMPARE (fputc ('@', shared->fp), '@');
+ TEST_COMPARE (shared->calls, 1);
+ TEST_COMPARE (shared->calls_overflow, 1);
+ TEST_COMPARE (shared->value, '@');
+}
+
+static void
+with_compatibility_fgetc (void *closure)
+{
+ shared->return_value = 'X';
+ TEST_COMPARE (fgetc (shared->fp), 'X');
+ TEST_COMPARE (shared->calls, 1);
+ TEST_COMPARE (shared->calls_uflow, 1);
+}
+
+static void
+with_compatibility_fflush (void *closure)
+{
+ TEST_COMPARE (fflush (shared->fp), 0);
+ TEST_COMPARE (shared->calls, 1);
+ TEST_COMPARE (shared->calls_sync, 1);
+}
+
+/* Call CALLBACK in a subprocess, after setting up a custom file
+ object and updating shared->fp. */
+static void
+check_call (const char *name, void (*callback) (void *),
+ bool initially_disabled)
+{
+ *shared = (struct shared)
+ {
+ .initially_disabled = initially_disabled,
+ };
+
+ /* Set up a custom file object. */
+ struct my_file file = my_file_create ();
+ shared->fp = &file.f;
+ if (shared->initially_disabled)
+ _IO_init (shared->fp, file.f._flags);
+
+ if (test_verbose > 0)
+ printf ("info: calling test %s\n", name);
+ support_isolate_in_subprocess (callback, NULL);
+}
+
+/* Run the tests. INITIALLY_DISABLED indicates whether custom vtables
+ are disabled when the test starts. */
+static int
+run_tests (bool initially_disabled)
+{
+ /* The test relies on fatal error messages being printed to standard
+ error. */
+ setenv ("LIBC_FATAL_STDERR_", "1", 1);
+
+ shared = support_shared_allocate (sizeof (*shared));
+ shared->initially_disabled = initially_disabled;
+ init_termination_status ();
+
+ if (initially_disabled)
+ {
+ check_for_termination ("fprintf", without_compatibility_fprintf);
+ check_for_termination ("fputc", without_compatibility_fputc);
+ check_for_termination ("fgetc", without_compatibility_fgetc);
+ check_for_termination ("fflush", without_compatibility_fflush);
+ }
+
+ check_call ("fprintf", with_compatibility_fprintf, initially_disabled);
+ check_call ("fputc", with_compatibility_fputc, initially_disabled);
+ check_call ("fgetc", with_compatibility_fgetc, initially_disabled);
+ check_call ("fflush", with_compatibility_fflush, initially_disabled);
+
+ support_shared_free (shared);
+ shared = NULL;
+
+ return 0;
+}
diff --git a/libio/tst-vtables-interposed.c b/libio/tst-vtables-interposed.c
new file mode 100644
index 0000000..c8f4e8c
--- /dev/null
+++ b/libio/tst-vtables-interposed.c
@@ -0,0 +1,37 @@
+/* Test for libio vtables and their validation. Enabled through interposition.
+ Copyright (C) 2018 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
+ <http://www.gnu.org/licenses/>. */
+
+/* Provide an interposed definition of the standard file handles with
+ our own vtable. stdout/stdin/stderr will not work as a result, but
+ a succesful test does not print anything, so this is fine. */
+static const struct _IO_jump_t jumps;
+#define _IO_file_jumps jumps
+#include "stdfiles.c"
+
+#include "tst-vtables-common.c"
+
+static int
+do_test (void)
+{
+ return run_tests (false);
+}
+
+/* Calling setvbuf in the test driver is not supported with our
+ interposed file handles. */
+#define TEST_NO_SETVBUF
+#include <support/test-driver.c>
diff --git a/libio/tst-vtables.c b/libio/tst-vtables.c
new file mode 100644
index 0000000..f16acf5
--- /dev/null
+++ b/libio/tst-vtables.c
@@ -0,0 +1,29 @@
+/* Test for libio vtables and their validation. Initially disabled case.
+ Copyright (C) 2018 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
+ <http://www.gnu.org/licenses/>. */
+
+#include "libioP.h"
+
+#include "tst-vtables-common.c"
+
+static int
+do_test (void)
+{
+ return run_tests (true);
+}
+
+#include <support/test-driver.c>
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=060eb7c3b5db70a1b03b031965b2f44792a3b07a
commit 060eb7c3b5db70a1b03b031965b2f44792a3b07a
Author: Florian Weimer <fweimer@redhat.com>
Date: Tue Jul 3 17:42:59 2018 +0200
Synchronize support/ infrastructure with master
This commit updates the support/ subdirectory to
commit 5c0202af4b3d588c04bcec7baf05706b21cd7416
on the master branch.
diff --git a/support/Makefile b/support/Makefile
index 1bda81e..652d2cd 100644
--- a/support/Makefile
+++ b/support/Makefile
@@ -52,9 +52,12 @@ libsupport-routines = \
support_format_hostent \
support_format_netent \
support_isolate_in_subprocess \
+ support_openpty \
+ support_quote_blob \
support_record_failure \
support_run_diff \
support_shared_allocate \
+ support_test_compare_blob \
support_test_compare_failure \
support_write_file_string \
support_test_main \
@@ -95,6 +98,9 @@ libsupport-routines = \
xpthread_barrier_destroy \
xpthread_barrier_init \
xpthread_barrier_wait \
+ xpthread_barrierattr_destroy \
+ xpthread_barrierattr_init \
+ xpthread_barrierattr_setpshared \
xpthread_cancel \
xpthread_check_return \
xpthread_cond_wait \
@@ -150,8 +156,10 @@ tests = \
tst-support-namespace \
tst-support_capture_subprocess \
tst-support_format_dns_packet \
+ tst-support_quote_blob \
tst-support_record_failure \
tst-test_compare \
+ tst-test_compare_blob \
tst-xreadlink \
ifeq ($(run-built-tests),yes)
diff --git a/support/check.h b/support/check.h
index 2192f38..b3a4645 100644
--- a/support/check.h
+++ b/support/check.h
@@ -64,6 +64,8 @@ __BEGIN_DECLS
(1, __FILE__, __LINE__, #expr); \
})
+
+
int support_print_failure_impl (const char *file, int line,
const char *format, ...)
__attribute__ ((nonnull (1), format (printf, 3, 4)));
@@ -141,6 +143,26 @@ void support_test_compare_failure (const char *file, int line,
int right_size);
+/* Compare [LEFT, LEFT + LEFT_LENGTH) with [RIGHT, RIGHT +
+ RIGHT_LENGTH) and report a test failure if the arrays are
+ different. LEFT_LENGTH and RIGHT_LENGTH are measured in bytes. If
+ the length is null, the corresponding pointer is ignored (i.e., it
+ can be NULL). The blobs should be reasonably short because on
+ mismatch, both are printed. */
+#define TEST_COMPARE_BLOB(left, left_length, right, right_length) \
+ (support_test_compare_blob (left, left_length, right, right_length, \
+ __FILE__, __LINE__, \
+ #left, #left_length, #right, #right_length))
+
+void support_test_compare_blob (const void *left,
+ unsigned long int left_length,
+ const void *right,
+ unsigned long int right_length,
+ const char *file, int line,
+ const char *left_exp, const char *left_len_exp,
+ const char *right_exp,
+ const char *right_len_exp);
+
/* Internal function called by the test driver. */
int support_report_failure (int status)
__attribute__ ((weak, warn_unused_result));
diff --git a/support/support.h b/support/support.h
index bc5827e..b61fe07 100644
--- a/support/support.h
+++ b/support/support.h
@@ -59,6 +59,12 @@ void support_shared_free (void *);
process on error. */
void support_write_file_string (const char *path, const char *contents);
+/* Quote the contents of the byte array starting at BLOB, of LENGTH
+ bytes, in such a way that the result string can be included in a C
+ literal (in single/double quotes, without putting the quotes into
+ the result). */
+char *support_quote_blob (const void *blob, size_t length);
+
/* Error-checking wrapper functions which terminate the process on
error. */
diff --git a/support/support_format_addrinfo.c b/support/support_format_addrinfo.c
index c5e00e5..60d2cc4 100644
--- a/support/support_format_addrinfo.c
+++ b/support/support_format_addrinfo.c
@@ -67,8 +67,6 @@ format_ai_flags (FILE *out, struct addrinfo *ai)
FLAG (AI_ADDRCONFIG);
FLAG (AI_IDN);
FLAG (AI_CANONIDN);
- FLAG (AI_IDN_ALLOW_UNASSIGNED);
- FLAG (AI_IDN_USE_STD3_ASCII_RULES);
FLAG (AI_NUMERICSERV);
#undef FLAG
int remaining = ai->ai_flags & ~flags_printed;
@@ -220,7 +218,11 @@ support_format_addrinfo (struct addrinfo *ai, int ret)
xopen_memstream (&mem);
if (ret != 0)
{
- fprintf (mem.out, "error: %s\n", gai_strerror (ret));
+ const char *errmsg = gai_strerror (ret);
+ if (strcmp (errmsg, "Unknown error") == 0)
+ fprintf (mem.out, "error: Unknown error %d\n", ret);
+ else
+ fprintf (mem.out, "error: %s\n", errmsg);
if (ret == EAI_SYSTEM)
{
errno = errno_copy;
diff --git a/support/support_openpty.c b/support/support_openpty.c
new file mode 100644
index 0000000..ac779ab
--- /dev/null
+++ b/support/support_openpty.c
@@ -0,0 +1,109 @@
+/* Open a pseudoterminal.
+ Copyright (C) 2018 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
+ <http://www.gnu.org/licenses/>. */
+
+#include <support/tty.h>
+#include <support/check.h>
+#include <support/support.h>
+
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <fcntl.h>
+#include <termios.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+
+/* As ptsname, but allocates space for an appropriately-sized string
+ using malloc. */
+static char *
+xptsname (int fd)
+{
+ int rv;
+ size_t buf_len = 128;
+ char *buf = xmalloc (buf_len);
+ for (;;)
+ {
+ rv = ptsname_r (fd, buf, buf_len);
+ if (rv)
+ FAIL_EXIT1 ("ptsname_r: %s", strerror (errno));
+
+ if (memchr (buf, '\0', buf_len))
+ return buf; /* ptsname succeeded and the buffer was not truncated */
+
+ buf_len *= 2;
+ buf = xrealloc (buf, buf_len);
+ }
+}
+
+void
+support_openpty (int *a_outer, int *a_inner, char **a_name,
+ const struct termios *termp,
+ const struct winsize *winp)
+{
+ int outer = -1, inner = -1;
+ char *namebuf = 0;
+
+ outer = posix_openpt (O_RDWR | O_NOCTTY);
+ if (outer == -1)
+ FAIL_EXIT1 ("posix_openpt: %s", strerror (errno));
+
+ if (grantpt (outer))
+ FAIL_EXIT1 ("grantpt: %s", strerror (errno));
+
+ if (unlockpt (outer))
+ FAIL_EXIT1 ("unlockpt: %s", strerror (errno));
+
+
+#ifdef TIOCGPTPEER
+ inner = ioctl (outer, TIOCGPTPEER, O_RDWR | O_NOCTTY);
+#endif
+ if (inner == -1)
+ {
+ /* The kernel might not support TIOCGPTPEER, fall back to open
+ by name. */
+ namebuf = xptsname (outer);
+ inner = open (namebuf, O_RDWR | O_NOCTTY);
+ if (inner == -1)
+ FAIL_EXIT1 ("%s: %s", namebuf, strerror (errno));
+ }
+
+ if (termp)
+ {
+ if (tcsetattr (inner, TCSAFLUSH, termp))
+ FAIL_EXIT1 ("tcsetattr: %s", strerror (errno));
+ }
+#ifdef TIOCSWINSZ
+ if (winp)
+ {
+ if (ioctl (inner, TIOCSWINSZ, winp))
+ FAIL_EXIT1 ("TIOCSWINSZ: %s", strerror (errno));
+ }
+#endif
+
+ if (a_name)
+ {
+ if (!namebuf)
+ namebuf = xptsname (outer);
+ *a_name = namebuf;
+ }
+ else
+ free (namebuf);
+ *a_outer = outer;
+ *a_inner = inner;
+}
diff --git a/support/support_quote_blob.c b/support/support_quote_blob.c
new file mode 100644
index 0000000..d6a678d
--- /dev/null
+++ b/support/support_quote_blob.c
@@ -0,0 +1,83 @@
+/* Quote a blob so that it can be used in C literals.
+ Copyright (C) 2018 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
+ <http://www.gnu.org/licenses/>. */
+
+#include <support/support.h>
+#include <support/xmemstream.h>
+
+char *
+support_quote_blob (const void *blob, size_t length)
+{
+ struct xmemstream out;
+ xopen_memstream (&out);
+
+ const unsigned char *p = blob;
+ for (size_t i = 0; i < length; ++i)
+ {
+ unsigned char ch = p[i];
+
+ /* Use C backslash escapes for those control characters for
+ which they are defined. */
+ switch (ch)
+ {
+ case '\a':
+ putc_unlocked ('\\', out.out);
+ putc_unlocked ('a', out.out);
+ break;
+ case '\b':
+ putc_unlocked ('\\', out.out);
+ putc_unlocked ('b', out.out);
+ break;
+ case '\f':
+ putc_unlocked ('\\', out.out);
+ putc_unlocked ('f', out.out);
+ break;
+ case '\n':
+ putc_unlocked ('\\', out.out);
+ putc_unlocked ('n', out.out);
+ break;
+ case '\r':
+ putc_unlocked ('\\', out.out);
+ putc_unlocked ('r', out.out);
+ break;
+ case '\t':
+ putc_unlocked ('\\', out.out);
+ putc_unlocked ('t', out.out);
+ break;
+ case '\v':
+ putc_unlocked ('\\', out.out);
+ putc_unlocked ('v', out.out);
+ break;
+ case '\\':
+ case '\'':
+ case '\"':
+ putc_unlocked ('\\', out.out);
+ putc_unlocked (ch, out.out);
+ break;
+ default:
+ if (ch < ' ' || ch > '~')
+ /* Use octal sequences because they are fixed width,
+ unlike hexadecimal sequences. */
+ fprintf (out.out, "\\%03o", ch);
+ else
+ putc_unlocked (ch, out.out);
+ }
+ }
+
+ xfclose_memstream (&out);
+ return out.buffer;
+}
diff --git a/support/support_test_compare_blob.c b/support/support_test_compare_blob.c
new file mode 100644
index 0000000..c5e63d1
--- /dev/null
+++ b/support/support_test_compare_blob.c
@@ -0,0 +1,76 @@
+/* Check two binary blobs for equality.
+ Copyright (C) 2018 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
+ <http://www.gnu.org/licenses/>. */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <support/check.h>
+#include <support/support.h>
+#include <support/xmemstream.h>
+
+static void
+report_length (const char *what, unsigned long int length, const char *expr)
+{
+ printf (" %s %lu bytes (from %s)\n", what, length, expr);
+}
+
+static void
+report_blob (const char *what, const unsigned char *blob,
+ unsigned long int length, const char *expr)
+{
+ if (length > 0)
+ {
+ printf (" %s (evaluated from %s):\n", what, expr);
+ char *quoted = support_quote_blob (blob, length);
+ printf (" \"%s\"\n", quoted);
+ free (quoted);
+
+ fputs (" ", stdout);
+ for (unsigned long i = 0; i < length; ++i)
+ printf (" %02X", blob[i]);
+ putc ('\n', stdout);
+ }
+}
+
+void
+support_test_compare_blob (const void *left, unsigned long int left_length,
+ const void *right, unsigned long int right_length,
+ const char *file, int line,
+ const char *left_expr, const char *left_len_expr,
+ const char *right_expr, const char *right_len_expr)
+{
+ /* No differences are possible if both lengths are null. */
+ if (left_length == 0 && right_length == 0)
+ return;
+
+ if (left_length != right_length || left == NULL || right == NULL
+ || memcmp (left, right, left_length) != 0)
+ {
+ support_record_failure ();
+ printf ("%s:%d: error: blob comparison failed\n", file, line);
+ if (left_length == right_length)
+ printf (" blob length: %lu bytes\n", left_length);
+ else
+ {
+ report_length ("left length: ", left_length, left_len_expr);
+ report_length ("right length:", right_length, right_len_expr);
+ }
+ report_blob ("left", left, left_length, left_expr);
+ report_blob ("right", right, right_length, right_expr);
+ }
+}
diff --git a/support/support_test_main.c b/support/support_test_main.c
index 3963857..2342977 100644
--- a/support/support_test_main.c
+++ b/support/support_test_main.c
@@ -270,7 +270,8 @@ support_test_main (int argc, char **argv, const struct test_config *config)
timeout = DEFAULT_TIMEOUT;
/* Make sure we see all message, even those on stdout. */
- setvbuf (stdout, NULL, _IONBF, 0);
+ if (!config->no_setvbuf)
+ setvbuf (stdout, NULL, _IONBF, 0);
/* Make sure temporary files are deleted. */
if (support_delete_temp_files != NULL)
diff --git a/support/test-driver.c b/support/test-driver.c
index 09c8783..9798f16 100644
--- a/support/test-driver.c
+++ b/support/test-driver.c
@@ -140,6 +140,10 @@ main (int argc, char **argv)
test_config.no_mallopt = 1;
#endif
+#ifdef TEST_NO_SETVBUF
+ test_config.no_setvbuf = 1;
+#endif
+
#ifdef TIMEOUT
test_config.timeout = TIMEOUT;
#endif
diff --git a/support/test-driver.h b/support/test-driver.h
index 1708d68..549179b 100644
--- a/support/test-driver.h
+++ b/support/test-driver.h
@@ -35,6 +35,7 @@ struct test_config
int expected_status; /* Expected exit status. */
int expected_signal; /* If non-zero, expect termination by signal. */
char no_mallopt; /* Boolean flag to disable mallopt. */
+ char no_setvbuf; /* Boolean flag to disable setvbuf. */
const char *optstring; /* Short command line options. */
};
diff --git a/support/tst-support_quote_blob.c b/support/tst-support_quote_blob.c
new file mode 100644
index 0000000..5467a19
--- /dev/null
+++ b/support/tst-support_quote_blob.c
@@ -0,0 +1,61 @@
+/* Test the support_quote_blob function.
+ Copyright (C) 2018 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
+ <http://www.gnu.org/licenses/>. */
+
+#include <support/check.h>
+#include <support/support.h>
+#include <string.h>
+#include <stdlib.h>
+
+static int
+do_test (void)
+{
+ /* Check handling of the empty blob, both with and without trailing
+ NUL byte. */
+ char *p = support_quote_blob ("", 0);
+ TEST_COMPARE (strlen (p), 0);
+ free (p);
+ p = support_quote_blob ("X", 0);
+ TEST_COMPARE (strlen (p), 0);
+ free (p);
+
+ /* Check escaping of backslash-escaped characters, and lack of
+ escaping for other shell meta-characters. */
+ p = support_quote_blob ("$()*?`@[]{}~\'\"X", 14);
+ TEST_COMPARE (strcmp (p, "$()*?`@[]{}~\\'\\\""), 0);
+ free (p);
+
+ /* Check lack of escaping for letters and digits. */
+#define LETTERS_AND_DIGTS \
+ "abcdefghijklmnopqrstuvwxyz" \
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ" \
+ "0123456789"
+ p = support_quote_blob (LETTERS_AND_DIGTS "@", 2 * 26 + 10);
+ TEST_COMPARE (strcmp (p, LETTERS_AND_DIGTS), 0);
+ free (p);
+
+ /* Check escaping of control characters and other non-printable
+ characters. */
+ p = support_quote_blob ("\r\n\t\a\b\f\v\1\177\200\377\0@", 14);
+ TEST_COMPARE (strcmp (p, "\\r\\n\\t\\a\\b\\f\\v\\001"
+ "\\177\\200\\377\\000@\\000"), 0);
+ free (p);
+
+ return 0;
+}
+
+#include <support/test-driver.c>
diff --git a/support/tst-test_compare_blob.c b/support/tst-test_compare_blob.c
new file mode 100644
index 0000000..aa8643e
--- /dev/null
+++ b/support/tst-test_compare_blob.c
@@ -0,0 +1,125 @@
+/* Basic test for the TEST_COMPARE_BLOB macro.
+ Copyright (C) 2018 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
+ <http://www.gnu.org/licenses/>. */
+
+#include <string.h>
+#include <support/check.h>
+#include <support/capture_subprocess.h>
+
+static void
+subprocess (void *closure)
+{
+ /* These tests should fail. They were chosen to cover differences
+ in length (with the same contents), single-bit mismatches, and
+ mismatching null pointers. */
+ TEST_COMPARE_BLOB ("", 0, "", 1); /* Line 29. */
+ TEST_COMPARE_BLOB ("X", 1, "", 1); /* Line 30. */
+ TEST_COMPARE_BLOB ("abcd", 3, "abcd", 4); /* Line 31. */
+ TEST_COMPARE_BLOB ("abcd", 4, "abcD", 4); /* Line 32. */
+ TEST_COMPARE_BLOB ("abcd", 4, NULL, 0); /* Line 33. */
+ TEST_COMPARE_BLOB (NULL, 0, "abcd", 4); /* Line 34. */
+}
+
+/* Same contents, different addresses. */
+char buffer_abc_1[] = "abc";
+char buffer_abc_2[] = "abc";
+
+static int
+do_test (void)
+{
+ /* This should succeed. Even if the pointers and array contents are
+ different, zero-length inputs are not different. */
+ TEST_COMPARE_BLOB ("", 0, "", 0);
+ TEST_COMPARE_BLOB ("", 0, buffer_abc_1, 0);
+ TEST_COMPARE_BLOB (buffer_abc_1, 0, "", 0);
+ TEST_COMPARE_BLOB (NULL, 0, "", 0);
+ TEST_COMPARE_BLOB ("", 0, NULL, 0);
+ TEST_COMPARE_BLOB (NULL, 0, NULL, 0);
+
+ /* Check equality of blobs containing a single NUL byte. */
+ TEST_COMPARE_BLOB ("", 1, "", 1);
+ TEST_COMPARE_BLOB ("", 1, &buffer_abc_1[3], 1);
+
+ /* Check equality of blobs of varying lengths. */
+ for (size_t i = 0; i <= sizeof (buffer_abc_1); ++i)
+ TEST_COMPARE_BLOB (buffer_abc_1, i, buffer_abc_2, i);
+
+ struct support_capture_subprocess proc = support_capture_subprocess
+ (&subprocess, NULL);
+
+ /* Discard the reported error. */
+ support_record_failure_reset ();
+
+ puts ("info: *** subprocess output starts ***");
+ fputs (proc.out.buffer, stdout);
+ puts ("info: *** subprocess output ends ***");
+
+ TEST_VERIFY
+ (strcmp (proc.out.buffer,
+"tst-test_compare_blob.c:29: error: blob comparison failed\n"
+" left length: 0 bytes (from 0)\n"
+" right length: 1 bytes (from 1)\n"
+" right (evaluated from \"\"):\n"
+" \"\\000\"\n"
+" 00\n"
+"tst-test_compare_blob.c:30: error: blob comparison failed\n"
+" blob length: 1 bytes\n"
+" left (evaluated from \"X\"):\n"
+" \"X\"\n"
+" 58\n"
+" right (evaluated from \"\"):\n"
+" \"\\000\"\n"
+" 00\n"
+"tst-test_compare_blob.c:31: error: blob comparison failed\n"
+" left length: 3 bytes (from 3)\n"
+" right length: 4 bytes (from 4)\n"
+" left (evaluated from \"abcd\"):\n"
+" \"abc\"\n"
+" 61 62 63\n"
+" right (evaluated from \"abcd\"):\n"
+" \"abcd\"\n"
+" 61 62 63 64\n"
+"tst-test_compare_blob.c:32: error: blob comparison failed\n"
+" blob length: 4 bytes\n"
+" left (evaluated from \"abcd\"):\n"
+" \"abcd\"\n"
+" 61 62 63 64\n"
+" right (evaluated from \"abcD\"):\n"
+" \"abcD\"\n"
+" 61 62 63 44\n"
+"tst-test_compare_blob.c:33: error: blob comparison failed\n"
+" left length: 4 bytes (from 4)\n"
+" right length: 0 bytes (from 0)\n"
+" left (evaluated from \"abcd\"):\n"
+" \"abcd\"\n"
+" 61 62 63 64\n"
+"tst-test_compare_blob.c:34: error: blob comparison failed\n"
+" left length: 0 bytes (from 0)\n"
+" right length: 4 bytes (from 4)\n"
+" right (evaluated from \"abcd\"):\n"
+" \"abcd\"\n"
+" 61 62 63 64\n"
+ ) == 0);
+
+ /* Check that there is no output on standard error. */
+ support_capture_subprocess_check (&proc, "TEST_COMPARE_BLOB",
+ 0, sc_allow_stdout);
+
+ return 0;
+}
+
+#include <support/test-driver.c>
diff --git a/support/tty.h b/support/tty.h
new file mode 100644
index 0000000..1d37c42
--- /dev/null
+++ b/support/tty.h
@@ -0,0 +1,45 @@
+/* Support functions related to (pseudo)terminals.
+ Copyright (C) 2018 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
+ <http://www.gnu.org/licenses/>. */
+
+#ifndef _SUPPORT_TTY_H
+#define _SUPPORT_TTY_H 1
+
+struct termios;
+struct winsize;
+
+/** Open a pseudoterminal pair. The outer fd is written to the address
+ A_OUTER and the inner fd to A_INNER.
+
+ If A_NAME is not NULL, it will be set to point to a string naming
+ the /dev/pts/NNN device corresponding to the inner fd; space for
+ this string is allocated with malloc and should be freed by the
+ caller when no longer needed. (This is different from the libutil
+ function 'openpty'.)
+
+ If TERMP is not NULL, the terminal parameters will be initialized
+ according to the termios structure it points to.
+
+ If WINP is not NULL, the terminal window size will be set
+ accordingly.
+
+ Terminates the process on failure (like xmalloc). */
+extern void support_openpty (int *a_outer, int *a_inner, char **a_name,
+ const struct termios *termp,
+ const struct winsize *winp);
+
+#endif
diff --git a/support/xpthread_barrierattr_destroy.c b/support/xpthread_barrierattr_destroy.c
new file mode 100644
index 0000000..3e471f9
--- /dev/null
+++ b/support/xpthread_barrierattr_destroy.c
@@ -0,0 +1,26 @@
+/* pthread_barrierattr_destroy with error checking.
+ Copyright (C) 2018 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
+ <http://www.gnu.org/licenses/>. */
+
+#include <support/xthread.h>
+
+void
+xpthread_barrierattr_destroy (pthread_barrierattr_t *attr)
+{
+ xpthread_check_return ("pthread_barrierattr_destroy",
+ pthread_barrierattr_destroy (attr));
+}
diff --git a/support/xpthread_barrierattr_init.c b/support/xpthread_barrierattr_init.c
new file mode 100644
index 0000000..4ee14e7
--- /dev/null
+++ b/support/xpthread_barrierattr_init.c
@@ -0,0 +1,26 @@
+/* pthread_barrierattr_init with error checking.
+ Copyright (C) 2018 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
+ <http://www.gnu.org/licenses/>. */
+
+#include <support/xthread.h>
+
+void
+xpthread_barrierattr_init (pthread_barrierattr_t *attr)
+{
+ xpthread_check_return ("pthread_barrierattr_init",
+ pthread_barrierattr_init (attr));
+}
diff --git a/support/xpthread_barrierattr_setpshared.c b/support/xpthread_barrierattr_setpshared.c
new file mode 100644
index 0000000..90b2c5b
--- /dev/null
+++ b/support/xpthread_barrierattr_setpshared.c
@@ -0,0 +1,26 @@
+/* pthread_barrierattr_setpshared with error checking.
+ Copyright (C) 2018 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
+ <http://www.gnu.org/licenses/>. */
+
+#include <support/xthread.h>
+
+void
+xpthread_barrierattr_setpshared (pthread_barrierattr_t *attr, int pshared)
+{
+ xpthread_check_return ("pthread_barrierattr_setpshared",
+ pthread_barrierattr_setpshared (attr, pshared));
+}
diff --git a/support/xthread.h b/support/xthread.h
index 79358e7..623f5ad 100644
--- a/support/xthread.h
+++ b/support/xthread.h
@@ -41,6 +41,9 @@ void xpthread_check_return (const char *function, int value);
void xpthread_barrier_init (pthread_barrier_t *barrier,
pthread_barrierattr_t *attr, unsigned int count);
void xpthread_barrier_destroy (pthread_barrier_t *barrier);
+void xpthread_barrierattr_destroy (pthread_barrierattr_t *);
+void xpthread_barrierattr_init (pthread_barrierattr_t *);
+void xpthread_barrierattr_setpshared (pthread_barrierattr_t *, int pshared);
void xpthread_mutexattr_destroy (pthread_mutexattr_t *);
void xpthread_mutexattr_init (pthread_mutexattr_t *);
void xpthread_mutexattr_setprotocol (pthread_mutexattr_t *, int);
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 8 +
libio/Makefile | 3 +
libio/tst-vtables-common.c | 511 +++++++++++++++++++++++++++++
libio/tst-vtables-interposed.c | 37 ++
libio/tst-vtables.c | 29 ++
support/Makefile | 8 +
support/check.h | 22 ++
support/support.h | 6 +
support/support_format_addrinfo.c | 8 +-
support/support_openpty.c | 109 ++++++
support/support_quote_blob.c | 83 +++++
support/support_test_compare_blob.c | 76 +++++
support/support_test_main.c | 3 +-
support/test-driver.c | 4 +
support/test-driver.h | 1 +
support/tst-support_quote_blob.c | 61 ++++
support/tst-test_compare_blob.c | 125 +++++++
support/tty.h | 45 +++
support/xpthread_barrierattr_destroy.c | 26 ++
support/xpthread_barrierattr_init.c | 26 ++
support/xpthread_barrierattr_setpshared.c | 26 ++
support/xthread.h | 3 +
22 files changed, 1216 insertions(+), 4 deletions(-)
create mode 100644 libio/tst-vtables-common.c
create mode 100644 libio/tst-vtables-interposed.c
create mode 100644 libio/tst-vtables.c
create mode 100644 support/support_openpty.c
create mode 100644 support/support_quote_blob.c
create mode 100644 support/support_test_compare_blob.c
create mode 100644 support/tst-support_quote_blob.c
create mode 100644 support/tst-test_compare_blob.c
create mode 100644 support/tty.h
create mode 100644 support/xpthread_barrierattr_destroy.c
create mode 100644 support/xpthread_barrierattr_init.c
create mode 100644 support/xpthread_barrierattr_setpshared.c
hooks/post-receive
--
GNU C Library master sources