From c4485ac49a977d666187db4c5c25045215976577 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 16 Feb 2017 08:51:34 -0800
Subject: Fix up recent -U patches

Inspired by a suggestion by Eric Blake (Bug#25707#17).
* bootstrap.conf (gnulib_modules): Add xbinary-io,
and remove binary-io and xfreopen.
* doc/grep.texi (Other Options):
Fix typo and reword to be a bit more general.
* src/grep.c: Include xbinary-io.h instead of xfreopen.h.
(grepfile): Open with O_BINARY if binary.
(grepdesc): No need for set_binary_mode now.
(grep_command_line_arg, main): Set stdin to binary mode if binary.
(main): Avoid unnecessary test of stdin == NULL.
Use xsetmode instead of xfreopen.
* src/system.h: Do not include binary-io.h.
---
 bootstrap.conf | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'bootstrap.conf')

diff --git a/bootstrap.conf b/bootstrap.conf
index 4115f35b..1c50974e 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -26,7 +26,6 @@ gnulib_modules='
 alloca
 announce-gen
 argmatch
-binary-io
 c-ctype
 closeout
 dfa
@@ -53,10 +52,10 @@ isatty
 isblank
 iswctype
 largefile
-lseek
 locale
-malloc-gnu
+lseek
 maintainer-makefile
+malloc-gnu
 manywarnings
 mbrlen
 mbrtowc
@@ -95,7 +94,7 @@ wcrtomb
 wctob
 wctype-h
 xalloc
-xfreopen
+xbinary-io
 xstrtoimax
 '
 gnulib_name=libgreputils
-- 
cgit v1.2.1