Merge commit 'upstream/0.9.1.1'

1 files changed, 150 insertions, 72 deletions

diff --git a/tests/Makefile.in b/tests/Makefile.in
index fa734572..b1d9e4a7 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -49,42 +49,43 @@ host_triplet = @host@
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.gnulib $(srcdir)/Makefile.in
 TESTS = test-alloca-opt$(EXEEXT) test-array-mergesort$(EXEEXT) \
-	test-c-ctype$(EXEEXT) test-c-strcase.sh test-environ$(EXEEXT) \
-	test-errno$(EXEEXT) test-frexpl-nolibm$(EXEEXT) \
-	test-fseterr$(EXEEXT) test-iconv$(EXEEXT) \
-	test-isnand-nolibm$(EXEEXT) test-isnanf-nolibm$(EXEEXT) \
-	test-isnanl-nolibm$(EXEEXT) test-locale$(EXEEXT) \
-	test-localename$(EXEEXT) test-malloca$(EXEEXT) \
-	test-math$(EXEEXT) test-mbrtowc1.sh test-mbrtowc2.sh \
-	test-mbrtowc3.sh test-mbrtowc4.sh test-mbsinit.sh \
-	test-memchr$(EXEEXT) test-printf-frexp$(EXEEXT) \
-	test-printf-frexpl$(EXEEXT) test-signbit$(EXEEXT) \
-	test-stdbool$(EXEEXT) test-stdint$(EXEEXT) \
-	test-stdlib$(EXEEXT) test-strerror$(EXEEXT) \
-	test-striconveh$(EXEEXT) test-striconveha$(EXEEXT) \
-	test-string$(EXEEXT) test-cased$(EXEEXT) \
-	test-ignorable$(EXEEXT) unicase/test-locale-language.sh \
-	test-uc_tolower$(EXEEXT) test-uc_totitle$(EXEEXT) \
-	test-uc_toupper$(EXEEXT) test-u16-casecmp$(EXEEXT) \
-	test-u16-casecoll$(EXEEXT) test-u16-casefold$(EXEEXT) \
-	test-u16-is-cased$(EXEEXT) test-u16-is-casefolded$(EXEEXT) \
-	test-u16-is-lowercase$(EXEEXT) test-u16-is-titlecase$(EXEEXT) \
-	test-u16-is-uppercase$(EXEEXT) test-u16-tolower$(EXEEXT) \
-	test-u16-totitle$(EXEEXT) test-u16-toupper$(EXEEXT) \
-	test-u32-casecmp$(EXEEXT) test-u32-casecoll$(EXEEXT) \
-	test-u32-casefold$(EXEEXT) test-u32-is-cased$(EXEEXT) \
-	test-u32-is-casefolded$(EXEEXT) test-u32-is-lowercase$(EXEEXT) \
-	test-u32-is-titlecase$(EXEEXT) test-u32-is-uppercase$(EXEEXT) \
-	test-u32-tolower$(EXEEXT) test-u32-totitle$(EXEEXT) \
-	test-u32-toupper$(EXEEXT) test-u8-casecmp$(EXEEXT) \
-	test-u8-casecoll$(EXEEXT) test-u8-casefold$(EXEEXT) \
-	test-u8-is-cased$(EXEEXT) test-u8-is-casefolded$(EXEEXT) \
-	test-u8-is-lowercase$(EXEEXT) test-u8-is-titlecase$(EXEEXT) \
-	test-u8-is-uppercase$(EXEEXT) test-u8-tolower$(EXEEXT) \
-	test-u8-totitle$(EXEEXT) test-u8-toupper$(EXEEXT) \
-	unicase/test-ulc-casecmp1.sh unicase/test-ulc-casecmp2.sh \
-	unicase/test-ulc-casecoll1.sh unicase/test-ulc-casecoll2.sh \
-	test-u16-conv-from-enc$(EXEEXT) test-u16-conv-to-enc$(EXEEXT) \
+	test-c-ctype$(EXEEXT) test-c-strcase.sh test-dup2$(EXEEXT) \
+	test-environ$(EXEEXT) test-errno$(EXEEXT) test-fcntl$(EXEEXT) \
+	test-frexpl-nolibm$(EXEEXT) test-fseterr$(EXEEXT) \
+	test-iconv$(EXEEXT) test-isnand-nolibm$(EXEEXT) \
+	test-isnanf-nolibm$(EXEEXT) test-isnanl-nolibm$(EXEEXT) \
+	test-locale$(EXEEXT) test-localename$(EXEEXT) \
+	test-malloca$(EXEEXT) test-math$(EXEEXT) test-mbrtowc1.sh \
+	test-mbrtowc2.sh test-mbrtowc3.sh test-mbrtowc4.sh \
+	test-mbsinit.sh test-memchr$(EXEEXT) test-open$(EXEEXT) \
+	test-printf-frexp$(EXEEXT) test-printf-frexpl$(EXEEXT) \
+	test-signbit$(EXEEXT) test-stdbool$(EXEEXT) \
+	test-stddef$(EXEEXT) test-stdint$(EXEEXT) test-stdlib$(EXEEXT) \
+	test-strerror$(EXEEXT) test-striconveh$(EXEEXT) \
+	test-striconveha$(EXEEXT) test-string$(EXEEXT) \
+	test-cased$(EXEEXT) test-ignorable$(EXEEXT) \
+	unicase/test-locale-language.sh test-uc_tolower$(EXEEXT) \
+	test-uc_totitle$(EXEEXT) test-uc_toupper$(EXEEXT) \
+	test-u16-casecmp$(EXEEXT) test-u16-casecoll$(EXEEXT) \
+	test-u16-casefold$(EXEEXT) test-u16-is-cased$(EXEEXT) \
+	test-u16-is-casefolded$(EXEEXT) test-u16-is-lowercase$(EXEEXT) \
+	test-u16-is-titlecase$(EXEEXT) test-u16-is-uppercase$(EXEEXT) \
+	test-u16-tolower$(EXEEXT) test-u16-totitle$(EXEEXT) \
+	test-u16-toupper$(EXEEXT) test-u32-casecmp$(EXEEXT) \
+	test-u32-casecoll$(EXEEXT) test-u32-casefold$(EXEEXT) \
+	test-u32-is-cased$(EXEEXT) test-u32-is-casefolded$(EXEEXT) \
+	test-u32-is-lowercase$(EXEEXT) test-u32-is-titlecase$(EXEEXT) \
+	test-u32-is-uppercase$(EXEEXT) test-u32-tolower$(EXEEXT) \
+	test-u32-totitle$(EXEEXT) test-u32-toupper$(EXEEXT) \
+	test-u8-casecmp$(EXEEXT) test-u8-casecoll$(EXEEXT) \
+	test-u8-casefold$(EXEEXT) test-u8-is-cased$(EXEEXT) \
+	test-u8-is-casefolded$(EXEEXT) test-u8-is-lowercase$(EXEEXT) \
+	test-u8-is-titlecase$(EXEEXT) test-u8-is-uppercase$(EXEEXT) \
+	test-u8-tolower$(EXEEXT) test-u8-totitle$(EXEEXT) \
+	test-u8-toupper$(EXEEXT) unicase/test-ulc-casecmp1.sh \
+	unicase/test-ulc-casecmp2.sh unicase/test-ulc-casecoll1.sh \
+	unicase/test-ulc-casecoll2.sh test-u16-conv-from-enc$(EXEEXT) \
+	test-u16-conv-to-enc$(EXEEXT) \
 	test-u16-strconv-from-enc$(EXEEXT) \
 	test-u16-strconv-to-enc$(EXEEXT) \
 	test-u32-conv-from-enc$(EXEEXT) test-u32-conv-to-enc$(EXEEXT) \
@@ -234,16 +235,17 @@ noinst_PROGRAMS =
 check_PROGRAMS = test-alloca-opt$(EXEEXT) \
 	test-array-mergesort$(EXEEXT) test-c-ctype$(EXEEXT) \
 	test-c-strcasecmp$(EXEEXT) test-c-strncasecmp$(EXEEXT) \
-	test-environ$(EXEEXT) test-errno$(EXEEXT) \
-	test-frexpl-nolibm$(EXEEXT) test-fseterr$(EXEEXT) \
-	test-iconv$(EXEEXT) test-isnand-nolibm$(EXEEXT) \
-	test-isnanf-nolibm$(EXEEXT) test-isnanl-nolibm$(EXEEXT) \
-	test-locale$(EXEEXT) test-localename$(EXEEXT) \
-	test-malloca$(EXEEXT) test-math$(EXEEXT) test-mbrtowc$(EXEEXT) \
-	test-mbsinit$(EXEEXT) test-memchr$(EXEEXT) \
+	test-dup2$(EXEEXT) test-environ$(EXEEXT) test-errno$(EXEEXT) \
+	test-fcntl$(EXEEXT) test-frexpl-nolibm$(EXEEXT) \
+	test-fseterr$(EXEEXT) test-iconv$(EXEEXT) \
+	test-isnand-nolibm$(EXEEXT) test-isnanf-nolibm$(EXEEXT) \
+	test-isnanl-nolibm$(EXEEXT) test-locale$(EXEEXT) \
+	test-localename$(EXEEXT) test-malloca$(EXEEXT) \
+	test-math$(EXEEXT) test-mbrtowc$(EXEEXT) test-mbsinit$(EXEEXT) \
+	test-memchr$(EXEEXT) test-open$(EXEEXT) \
 	test-printf-frexp$(EXEEXT) test-printf-frexpl$(EXEEXT) \
 	test-signbit$(EXEEXT) test-stdbool$(EXEEXT) \
-	test-stdint$(EXEEXT) test-stdlib$(EXEEXT) \
+	test-stddef$(EXEEXT) test-stdint$(EXEEXT) test-stdlib$(EXEEXT) \
 	test-strerror$(EXEEXT) test-striconveh$(EXEEXT) \
 	test-striconveha$(EXEEXT) test-string$(EXEEXT) \
 	test-cased$(EXEEXT) test-ignorable$(EXEEXT) \
@@ -418,6 +420,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/alloca.m4 \
 	$(top_srcdir)/gnulib-m4/codeset.m4 \
+	$(top_srcdir)/gnulib-m4/dup2.m4 \
 	$(top_srcdir)/gnulib-m4/eealloc.m4 \
 	$(top_srcdir)/gnulib-m4/environ.m4 \
 	$(top_srcdir)/gnulib-m4/errno_h.m4 \
@@ -427,6 +430,7 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/exponentf.m4 \
 	$(top_srcdir)/gnulib-m4/exponentl.m4 \
 	$(top_srcdir)/gnulib-m4/extensions.m4 \
+	$(top_srcdir)/gnulib-m4/fcntl_h.m4 \
 	$(top_srcdir)/gnulib-m4/float_h.m4 \
 	$(top_srcdir)/gnulib-m4/fpieee.m4 \
 	$(top_srcdir)/gnulib-m4/frexp.m4 \
@@ -470,8 +474,10 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/memchr.m4 \
 	$(top_srcdir)/gnulib-m4/minmax.m4 \
 	$(top_srcdir)/gnulib-m4/mmap-anon.m4 \
+	$(top_srcdir)/gnulib-m4/mode_t.m4 \
 	$(top_srcdir)/gnulib-m4/multiarch.m4 \
 	$(top_srcdir)/gnulib-m4/nocrash.m4 \
+	$(top_srcdir)/gnulib-m4/open.m4 \
 	$(top_srcdir)/gnulib-m4/printf-frexp.m4 \
 	$(top_srcdir)/gnulib-m4/printf-frexpl.m4 \
 	$(top_srcdir)/gnulib-m4/printf.m4 \
@@ -480,6 +486,7 @@ am__aclocal_m4_deps = $(top_srcdir)/gnulib-m4/00gnulib.m4 \
 	$(top_srcdir)/gnulib-m4/signbit.m4 \
 	$(top_srcdir)/gnulib-m4/size_max.m4 \
 	$(top_srcdir)/gnulib-m4/stdbool.m4 \
+	$(top_srcdir)/gnulib-m4/stddef_h.m4 \
 	$(top_srcdir)/gnulib-m4/stdint.m4 \
 	$(top_srcdir)/gnulib-m4/stdint_h.m4 \
 	$(top_srcdir)/gnulib-m4/stdlib_h.m4 \
@@ -923,6 +930,11 @@ test_digit_OBJECTS = $(am_test_digit_OBJECTS)
 test_digit_LDADD = $(LDADD)
 test_digit_DEPENDENCIES = libtests.a ../lib/libunistring.la libtests.a \
 	$(am__DEPENDENCIES_1)
+test_dup2_SOURCES = test-dup2.c
+test_dup2_OBJECTS = test-dup2.$(OBJEXT)
+test_dup2_LDADD = $(LDADD)
+test_dup2_DEPENDENCIES = libtests.a ../lib/libunistring.la libtests.a \
+	$(am__DEPENDENCIES_1)
 test_environ_SOURCES = test-environ.c
 test_environ_OBJECTS = test-environ.$(OBJEXT)
 test_environ_LDADD = $(LDADD)
@@ -933,6 +945,11 @@ test_errno_OBJECTS = test-errno.$(OBJEXT)
 test_errno_LDADD = $(LDADD)
 test_errno_DEPENDENCIES = libtests.a ../lib/libunistring.la libtests.a \
 	$(am__DEPENDENCIES_1)
+test_fcntl_SOURCES = test-fcntl.c
+test_fcntl_OBJECTS = test-fcntl.$(OBJEXT)
+test_fcntl_LDADD = $(LDADD)
+test_fcntl_DEPENDENCIES = libtests.a ../lib/libunistring.la libtests.a \
+	$(am__DEPENDENCIES_1)
 am_test_frexpl_nolibm_OBJECTS = test-frexpl.$(OBJEXT)
 test_frexpl_nolibm_OBJECTS = $(am_test_frexpl_nolibm_OBJECTS)
 test_frexpl_nolibm_LDADD = $(LDADD)
@@ -1043,6 +1060,11 @@ test_numeric_OBJECTS = $(am_test_numeric_OBJECTS)
 test_numeric_LDADD = $(LDADD)
 test_numeric_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
+test_open_SOURCES = test-open.c
+test_open_OBJECTS = test-open.$(OBJEXT)
+test_open_LDADD = $(LDADD)
+test_open_DEPENDENCIES = libtests.a ../lib/libunistring.la libtests.a \
+	$(am__DEPENDENCIES_1)
 am_test_pr_alphabetic_OBJECTS = unictype/test-pr_alphabetic.$(OBJEXT)
 test_pr_alphabetic_OBJECTS = $(am_test_pr_alphabetic_OBJECTS)
 test_pr_alphabetic_LDADD = $(LDADD)
@@ -1568,6 +1590,11 @@ test_stdbool_OBJECTS = test-stdbool.$(OBJEXT)
 test_stdbool_LDADD = $(LDADD)
 test_stdbool_DEPENDENCIES = libtests.a ../lib/libunistring.la \
 	libtests.a $(am__DEPENDENCIES_1)
+test_stddef_SOURCES = test-stddef.c
+test_stddef_OBJECTS = test-stddef.$(OBJEXT)
+test_stddef_LDADD = $(LDADD)
+test_stddef_DEPENDENCIES = libtests.a ../lib/libunistring.la \
+	libtests.a $(am__DEPENDENCIES_1)
 test_stdint_SOURCES = test-stdint.c
 test_stdint_OBJECTS = test-stdint.$(OBJEXT)
 test_stdint_LDADD = $(LDADD)
@@ -2211,15 +2238,16 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_ctype_space_SOURCES) $(test_ctype_upper_SOURCES) \
 	$(test_ctype_xdigit_SOURCES) $(test_decdigit_SOURCES) \
 	$(test_decomposing_form_SOURCES) $(test_decomposition_SOURCES) \
-	$(test_digit_SOURCES) test-environ.c test-errno.c \
-	$(test_frexpl_nolibm_SOURCES) test-fseterr.c test-iconv.c \
-	$(test_ignorable_SOURCES) test-isnand-nolibm.c \
+	$(test_digit_SOURCES) test-dup2.c test-environ.c test-errno.c \
+	test-fcntl.c $(test_frexpl_nolibm_SOURCES) test-fseterr.c \
+	test-iconv.c $(test_ignorable_SOURCES) test-isnand-nolibm.c \
 	test-isnanf-nolibm.c test-isnanl-nolibm.c test-locale.c \
 	$(test_locale_language_SOURCES) test-localename.c \
 	test-malloca.c test-math.c test-mbrtowc.c test-mbsinit.c \
 	test-memchr.c $(test_mirror_SOURCES) $(test_nfc_SOURCES) \
 	$(test_nfd_SOURCES) $(test_nfkc_SOURCES) $(test_nfkd_SOURCES) \
-	$(test_numeric_SOURCES) $(test_pr_alphabetic_SOURCES) \
+	$(test_numeric_SOURCES) test-open.c \
+	$(test_pr_alphabetic_SOURCES) \
 	$(test_pr_ascii_hex_digit_SOURCES) \
 	$(test_pr_bidi_arabic_digit_SOURCES) \
 	$(test_pr_bidi_arabic_right_to_left_SOURCES) \
@@ -2285,9 +2313,10 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_pr_xid_start_SOURCES) $(test_pr_zero_width_SOURCES) \
 	test-printf-frexp.c test-printf-frexpl.c \
 	$(test_scripts_SOURCES) test-signbit.c test-stdbool.c \
-	test-stdint.c test-stdlib.c test-strerror.c test-striconveh.c \
-	test-striconveha.c test-string.c $(test_sy_c_ident_SOURCES) \
-	$(test_sy_c_whitespace_SOURCES) $(test_sy_java_ident_SOURCES) \
+	test-stddef.c test-stdint.c test-stdlib.c test-strerror.c \
+	test-striconveh.c test-striconveha.c test-string.c \
+	$(test_sy_c_ident_SOURCES) $(test_sy_c_whitespace_SOURCES) \
+	$(test_sy_java_ident_SOURCES) \
 	$(test_sy_java_whitespace_SOURCES) \
 	$(test_u16_asnprintf1_SOURCES) $(test_u16_casecmp_SOURCES) \
 	$(test_u16_casecoll_SOURCES) $(test_u16_casefold_SOURCES) \
@@ -2400,15 +2429,16 @@ DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_ctype_space_SOURCES) $(test_ctype_upper_SOURCES) \
 	$(test_ctype_xdigit_SOURCES) $(test_decdigit_SOURCES) \
 	$(test_decomposing_form_SOURCES) $(test_decomposition_SOURCES) \
-	$(test_digit_SOURCES) test-environ.c test-errno.c \
-	$(test_frexpl_nolibm_SOURCES) test-fseterr.c test-iconv.c \
-	$(test_ignorable_SOURCES) test-isnand-nolibm.c \
+	$(test_digit_SOURCES) test-dup2.c test-environ.c test-errno.c \
+	test-fcntl.c $(test_frexpl_nolibm_SOURCES) test-fseterr.c \
+	test-iconv.c $(test_ignorable_SOURCES) test-isnand-nolibm.c \
 	test-isnanf-nolibm.c test-isnanl-nolibm.c test-locale.c \
 	$(test_locale_language_SOURCES) test-localename.c \
 	test-malloca.c test-math.c test-mbrtowc.c test-mbsinit.c \
 	test-memchr.c $(test_mirror_SOURCES) $(test_nfc_SOURCES) \
 	$(test_nfd_SOURCES) $(test_nfkc_SOURCES) $(test_nfkd_SOURCES) \
-	$(test_numeric_SOURCES) $(test_pr_alphabetic_SOURCES) \
+	$(test_numeric_SOURCES) test-open.c \
+	$(test_pr_alphabetic_SOURCES) \
 	$(test_pr_ascii_hex_digit_SOURCES) \
 	$(test_pr_bidi_arabic_digit_SOURCES) \
 	$(test_pr_bidi_arabic_right_to_left_SOURCES) \
@@ -2474,9 +2504,10 @@ DIST_SOURCES = $(libtests_a_SOURCES) $(EXTRA_libtests_a_SOURCES) \
 	$(test_pr_xid_start_SOURCES) $(test_pr_zero_width_SOURCES) \
 	test-printf-frexp.c test-printf-frexpl.c \
 	$(test_scripts_SOURCES) test-signbit.c test-stdbool.c \
-	test-stdint.c test-stdlib.c test-strerror.c test-striconveh.c \
-	test-striconveha.c test-string.c $(test_sy_c_ident_SOURCES) \
-	$(test_sy_c_whitespace_SOURCES) $(test_sy_java_ident_SOURCES) \
+	test-stddef.c test-stdint.c test-stdlib.c test-strerror.c \
+	test-striconveh.c test-striconveha.c test-string.c \
+	$(test_sy_c_ident_SOURCES) $(test_sy_c_whitespace_SOURCES) \
+	$(test_sy_java_ident_SOURCES) \
 	$(test_sy_java_whitespace_SOURCES) \
 	$(test_u16_asnprintf1_SOURCES) $(test_u16_casecmp_SOURCES) \
 	$(test_u16_casecoll_SOURCES) $(test_u16_casefold_SOURCES) \
@@ -2649,6 +2680,7 @@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@
 EOVERFLOW_VALUE = @EOVERFLOW_VALUE@
 ERRNO_H = @ERRNO_H@
 EXEEXT = @EXEEXT@
+FCNTL_H = @FCNTL_H@
 FGREP = @FGREP@
 FLOAT_H = @FLOAT_H@
 GLIBC21 = @GLIBC21@
@@ -2716,6 +2748,7 @@ GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
 GNULIB_MEMRCHR = @GNULIB_MEMRCHR@
 GNULIB_MKDTEMP = @GNULIB_MKDTEMP@
 GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
+GNULIB_OPEN = @GNULIB_OPEN@
 GNULIB_PUTENV = @GNULIB_PUTENV@
 GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
 GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
@@ -2748,6 +2781,7 @@ GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
 GNULIB_TRUNC = @GNULIB_TRUNC@
 GNULIB_TRUNCF = @GNULIB_TRUNCF@
 GNULIB_TRUNCL = @GNULIB_TRUNCL@
+GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
 GNULIB_UNSETENV = @GNULIB_UNSETENV@
 GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
@@ -2846,6 +2880,7 @@ HAVE_UNISTD_H = @HAVE_UNISTD_H@
 HAVE_UNSETENV = @HAVE_UNSETENV@
 HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
 HAVE_WCHAR_H = @HAVE_WCHAR_H@
+HAVE_WCHAR_T = @HAVE_WCHAR_T@
 HAVE_WCRTOMB = @HAVE_WCRTOMB@
 HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
 HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
@@ -2886,10 +2921,12 @@ MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 NAMESPACING = @NAMESPACING@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
+NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
 NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
 NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
 NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
 NEXT_AS_FIRST_DIRECTIVE_MATH_H = @NEXT_AS_FIRST_DIRECTIVE_MATH_H@
+NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
 NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
 NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
 NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@
@@ -2897,10 +2934,12 @@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
+NEXT_FCNTL_H = @NEXT_FCNTL_H@
 NEXT_FLOAT_H = @NEXT_FLOAT_H@
 NEXT_ICONV_H = @NEXT_ICONV_H@
 NEXT_LOCALE_H = @NEXT_LOCALE_H@
 NEXT_MATH_H = @NEXT_MATH_H@
+NEXT_STDDEF_H = @NEXT_STDDEF_H@
 NEXT_STDINT_H = @NEXT_STDINT_H@
 NEXT_STDLIB_H = @NEXT_STDLIB_H@
 NEXT_STRING_H = @NEXT_STRING_H@
@@ -2918,6 +2957,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
@@ -2931,6 +2971,7 @@ REPLACE_CEILF = @REPLACE_CEILF@
 REPLACE_CEILL = @REPLACE_CEILL@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
+REPLACE_DUP2 = @REPLACE_DUP2@
 REPLACE_FCHDIR = @REPLACE_FCHDIR@
 REPLACE_FLOORF = @REPLACE_FLOORF@
 REPLACE_FLOORL = @REPLACE_FLOORL@
@@ -2959,6 +3000,8 @@ REPLACE_MEMCHR = @REPLACE_MEMCHR@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
 REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
 REPLACE_NAN = @REPLACE_NAN@
+REPLACE_NULL = @REPLACE_NULL@
+REPLACE_OPEN = @REPLACE_OPEN@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_ROUND = @REPLACE_ROUND@
 REPLACE_ROUNDF = @REPLACE_ROUNDF@
@@ -2984,10 +3027,12 @@ SHELL = @SHELL@
 SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
 SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
 STDBOOL_H = @STDBOOL_H@
+STDDEF_H = @STDDEF_H@
 STDINT_H = @STDINT_H@
 STRIP = @STRIP@
 TEXI2DVI = @TEXI2DVI@
 UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
+UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
 VERSION = @VERSION@
 VOID_UNSETENV = @VOID_UNSETENV@
 WCHAR_H = @WCHAR_H@
@@ -3084,16 +3129,17 @@ noinst_LIBRARIES =
 check_LIBRARIES = libtests.a
 EXTRA_DIST = test-alloca-opt.c test-array-mergesort.c test-c-ctype.c \
 	test-c-strcase.sh test-c-strcasecmp.c test-c-strncasecmp.c \
-	test-environ.c test-errno.c error.c error.h exitfail.c \
-	exitfail.h test-frexpl.c test-fseterr.c test-iconv.c \
-	intprops.h test-isnand-nolibm.c test-isnand.h nan.h \
-	test-isnanf-nolibm.c test-isnanf.h nan.h test-isnanl-nolibm.c \
-	test-isnanl.h nan.h locale.in.h test-locale.c \
-	test-localename.c test-malloca.c test-math.c test-mbrtowc1.sh \
-	test-mbrtowc2.sh test-mbrtowc3.sh test-mbrtowc4.sh \
-	test-mbrtowc.c test-mbsinit.sh test-mbsinit.c test-memchr.c \
-	zerosize-ptr.h test-printf-frexp.c test-printf-frexpl.c \
-	setenv.c test-signbit.c test-stdbool.c test-stdint.c \
+	test-dup2.c test-environ.c test-errno.c error.c error.h \
+	exitfail.c exitfail.h fcntl.in.h test-fcntl.c test-frexpl.c \
+	test-fseterr.c test-iconv.c intprops.h test-isnand-nolibm.c \
+	test-isnand.h nan.h test-isnanf-nolibm.c test-isnanf.h nan.h \
+	test-isnanl-nolibm.c test-isnanl.h nan.h locale.in.h \
+	test-locale.c test-localename.c test-malloca.c test-math.c \
+	test-mbrtowc1.sh test-mbrtowc2.sh test-mbrtowc3.sh \
+	test-mbrtowc4.sh test-mbrtowc.c test-mbsinit.sh test-mbsinit.c \
+	test-memchr.c zerosize-ptr.h open.c test-open.c \
+	test-printf-frexp.c test-printf-frexpl.c setenv.c \
+	test-signbit.c test-stdbool.c test-stddef.c test-stdint.c \
 	test-stdlib.c strerror.c test-strerror.c test-striconveh.c \
 	test-striconveha.c test-string.c unicase/test-cased.c \
 	unicase/test-predicate-part1.h unicase/test-predicate-part2.h \
@@ -3550,9 +3596,10 @@ EXTRA_DIST = test-alloca-opt.c test-array-mergesort.c test-c-ctype.c \
 	uniwidth/test-uc_width.c uniwidth/test-uc_width2.c \
 	uniwidth/test-uc_width2.sh unsetenv.c test-wchar.c wctob.c \
 	test-wctype.c test-wcwidth.c xalloc.h xmalloc.c
-BUILT_SOURCES = $(LOCALE_H)
+BUILT_SOURCES = $(FCNTL_H) $(LOCALE_H)
 SUFFIXES = 
-MOSTLYCLEANFILES = core *.stackdump locale.h locale.h-t
+MOSTLYCLEANFILES = core *.stackdump fcntl.h fcntl.h-t locale.h \
+	locale.h-t
 MOSTLYCLEANDIRS = 
 CLEANFILES = 
 DISTCLEANFILES = 
@@ -3566,8 +3613,8 @@ LDADD = libtests.a ../lib/libunistring.la libtests.a $(LIBTESTS_LIBDEPS)
 libtests_a_SOURCES = gettext.h progname.h progname.c xalloc-die.c
 libtests_a_LIBADD = $(gltests_LIBOBJS)
 libtests_a_DEPENDENCIES = $(gltests_LIBOBJS)
-EXTRA_libtests_a_SOURCES = error.c exitfail.c setenv.c strerror.c \
-	unsetenv.c wctob.c xmalloc.c
+EXTRA_libtests_a_SOURCES = error.c exitfail.c open.c setenv.c \
+	strerror.c unsetenv.c wctob.c xmalloc.c
 AM_LIBTOOLFLAGS = --preserve-dup-deps
 test_frexpl_nolibm_SOURCES = test-frexpl.c
 test_iconv_LDADD = $(LDADD) @LIBICONV@
@@ -4411,12 +4458,18 @@ unictype/test-digit.$(OBJEXT): unictype/$(am__dirstamp) \
 test-digit$(EXEEXT): $(test_digit_OBJECTS) $(test_digit_DEPENDENCIES) 
 	@rm -f test-digit$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_digit_OBJECTS) $(test_digit_LDADD) $(LIBS)
+test-dup2$(EXEEXT): $(test_dup2_OBJECTS) $(test_dup2_DEPENDENCIES) 
+	@rm -f test-dup2$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_dup2_OBJECTS) $(test_dup2_LDADD) $(LIBS)
 test-environ$(EXEEXT): $(test_environ_OBJECTS) $(test_environ_DEPENDENCIES) 
 	@rm -f test-environ$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_environ_OBJECTS) $(test_environ_LDADD) $(LIBS)
 test-errno$(EXEEXT): $(test_errno_OBJECTS) $(test_errno_DEPENDENCIES) 
 	@rm -f test-errno$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_errno_OBJECTS) $(test_errno_LDADD) $(LIBS)
+test-fcntl$(EXEEXT): $(test_fcntl_OBJECTS) $(test_fcntl_DEPENDENCIES) 
+	@rm -f test-fcntl$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_fcntl_OBJECTS) $(test_fcntl_LDADD) $(LIBS)
 test-frexpl-nolibm$(EXEEXT): $(test_frexpl_nolibm_OBJECTS) $(test_frexpl_nolibm_DEPENDENCIES) 
 	@rm -f test-frexpl-nolibm$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_frexpl_nolibm_OBJECTS) $(test_frexpl_nolibm_LDADD) $(LIBS)
@@ -4520,6 +4573,9 @@ unictype/test-numeric.$(OBJEXT): unictype/$(am__dirstamp) \
 test-numeric$(EXEEXT): $(test_numeric_OBJECTS) $(test_numeric_DEPENDENCIES) 
 	@rm -f test-numeric$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_numeric_OBJECTS) $(test_numeric_LDADD) $(LIBS)
+test-open$(EXEEXT): $(test_open_OBJECTS) $(test_open_DEPENDENCIES) 
+	@rm -f test-open$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_open_OBJECTS) $(test_open_LDADD) $(LIBS)
 unictype/test-pr_alphabetic.$(OBJEXT): unictype/$(am__dirstamp) \
 	unictype/$(DEPDIR)/$(am__dirstamp)
 test-pr_alphabetic$(EXEEXT): $(test_pr_alphabetic_OBJECTS) $(test_pr_alphabetic_DEPENDENCIES) 
@@ -4942,6 +4998,9 @@ test-signbit$(EXEEXT): $(test_signbit_OBJECTS) $(test_signbit_DEPENDENCIES)
 test-stdbool$(EXEEXT): $(test_stdbool_OBJECTS) $(test_stdbool_DEPENDENCIES) 
 	@rm -f test-stdbool$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_stdbool_OBJECTS) $(test_stdbool_LDADD) $(LIBS)
+test-stddef$(EXEEXT): $(test_stddef_OBJECTS) $(test_stddef_DEPENDENCIES) 
+	@rm -f test-stddef$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_stddef_OBJECTS) $(test_stddef_LDADD) $(LIBS)
 test-stdint$(EXEEXT): $(test_stdint_OBJECTS) $(test_stdint_DEPENDENCIES) 
 	@rm -f test-stdint$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_stdint_OBJECTS) $(test_stdint_LDADD) $(LIBS)
@@ -5879,6 +5938,7 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exitfail.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/open.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/progname.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setenv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror.Po@am__quote@
@@ -5887,8 +5947,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-c-ctype.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-c-strcasecmp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-c-strncasecmp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-dup2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-environ.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-errno.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fcntl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-frexpl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fseterr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-iconv.Po@am__quote@
@@ -5902,10 +5964,12 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-mbrtowc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-mbsinit.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-memchr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-open.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-printf-frexp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-printf-frexpl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-signbit.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-stdbool.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-stddef.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-stdint.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-stdlib.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-strerror.Po@am__quote@
@@ -6680,6 +6744,20 @@ uninstall-am:
 	tags-recursive uninstall uninstall-am
 
 
+# We need the following in order to create <fcntl.h> when the system
+# doesn't have one that works with the given compiler.
+fcntl.h: fcntl.in.h
+	rm -f $@-t $@
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \
+	      -e 's|@''GNULIB_OPEN''@|$(GNULIB_OPEN)|g' \
+	      -e 's|@''REPLACE_OPEN''@|$(REPLACE_OPEN)|g' \
+	      < $(srcdir)/fcntl.in.h; \
+	} > $@-t
+	mv $@-t $@
+
 # We need the following in order to create <locale.h> when the system
 # doesn't have one that provides all definitions.
 locale.h: locale.in.h