maint: xsetmode renamed to xbinary-io

* bootstrap.conf, src/base64.c, src/cat.c, src/cksum.c:
* src/head.c, src/md5sum.c, src/od.c, src/split.c, src/sum.c:
* src/tac.c, src/tail.c, src/tee.c, src/tr.c, src/wc.c:
Adjust to renaming of the xsetmode module to xbinary-io,
and of the xsetmode function to xset_binary_mode.

diff --git a/bootstrap.conf b/bootstrap.conf
index a1e3523537d49fdfb28703ecefe6c870fc1e3779..27ac9785e1074efaeb517ee1f0578d105542acc1 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -269,6 +269,7 @@ gnulib_modules="
   winsz-termios
   write-any-file
   xalloc
+  xbinary-io
   xdectoint
   xfts
   xgetcwd
@@ -279,7 +280,6 @@ gnulib_modules="
   xprintf
   xprintf-posix
   xreadlink
-  xsetmode
   xstrtod
   xstrtoimax
   xstrtol

diff --git a/src/base64.c b/src/base64.c
index d5d75dcc39051dc4337c557e07e9d72e7dde57e4..d005c262acda2db3b8f299ac5231ce4f7d3ec0e5 100644 (file)
--- a/src/base64.c
+++ b/src/base64.c
@@ -31,7 +31,7 @@
 #include "quote.h"
 #include "xstrtol.h"
 #include "xdectoint.h"
-#include "xsetmode.h"
+#include "xbinary-io.h"
 
 #define AUTHORS proper_name ("Simon Josefsson")
 
@@ -320,7 +320,7 @@ main (int argc, char **argv)
 
   if (STREQ (infile, "-"))
     {
-      xsetmode (STDIN_FILENO, O_BINARY);
+      xset_binary_mode (STDIN_FILENO, O_BINARY);
       input_fh = stdin;
     }
   else

diff --git a/src/cat.c b/src/cat.c
index fba721f288e530708f9a9265d746af625d6e3fa7..995dc616c8221333c525c6bbabb792c4983d7e89 100644 (file)
--- a/src/cat.c
+++ b/src/cat.c
@@ -39,7 +39,7 @@
 #include "fadvise.h"
 #include "full-write.h"
 #include "safe-read.h"
-#include "xsetmode.h"
+#include "xbinary-io.h"
 
 /* The official name of this program (e.g., no 'g' prefix).  */
 #define PROGRAM_NAME "cat"
@@ -645,7 +645,7 @@ main (int argc, char **argv)
   if (! (number || show_ends || squeeze_blank))
     {
       file_open_mode |= O_BINARY;
-      xsetmode (STDOUT_FILENO, O_BINARY);
+      xset_binary_mode (STDOUT_FILENO, O_BINARY);
     }
 
   /* Check if any of the input files are the same as the output file.  */
@@ -665,7 +665,7 @@ main (int argc, char **argv)
           have_read_stdin = true;
           input_desc = STDIN_FILENO;
           if (file_open_mode & O_BINARY)
-            xsetmode (STDIN_FILENO, O_BINARY);
+            xset_binary_mode (STDIN_FILENO, O_BINARY);
         }
       else
         {

diff --git a/src/cksum.c b/src/cksum.c
index 65702a3176a654f4bb39bd6220ea678d3b45213e..b1a8f0c5fc79a66abc2619d60f96a3feca0bb2b6 100644 (file)
--- a/src/cksum.c
+++ b/src/cksum.c
@@ -44,7 +44,7 @@
 #include <stdint.h>
 #include "system.h"
 #include "fadvise.h"
-#include "xsetmode.h"
+#include "xbinary-io.h"
 
 #ifdef CRCTAB
 
@@ -194,7 +194,7 @@ cksum (const char *file, bool print_name)
     {
       fp = stdin;
       have_read_stdin = true;
-      xsetmode (STDIN_FILENO, O_BINARY);
+      xset_binary_mode (STDIN_FILENO, O_BINARY);
     }
   else
     {

diff --git a/src/head.c b/src/head.c
index 49c942fea35c5553ef1ff5a7591899d85d277961..d284b30de47b99dc3e617ec486eba2a3f532849f 100644 (file)
--- a/src/head.c
+++ b/src/head.c
@@ -37,8 +37,8 @@
 #include "quote.h"
 #include "safe-read.h"
 #include "stat-size.h"
+#include "xbinary-io.h"
 #include "xdectoint.h"
-#include "xsetmode.h"
 
 /* The official name of this program (e.g., no 'g' prefix).  */
 #define PROGRAM_NAME "head"
@@ -878,7 +878,7 @@ head_file (const char *filename, uintmax_t n_units, bool count_lines,
       have_read_stdin = true;
       fd = STDIN_FILENO;
       filename = _("standard input");
-      xsetmode (STDIN_FILENO, O_BINARY);
+      xset_binary_mode (STDIN_FILENO, O_BINARY);
     }
   else
     {
@@ -1082,7 +1082,7 @@ main (int argc, char **argv)
                ? (char const *const *) &argv[optind]
                : default_file_list);
 
-  xsetmode (STDOUT_FILENO, O_BINARY);
+  xset_binary_mode (STDOUT_FILENO, O_BINARY);
 
   for (i = 0; file_list[i]; ++i)
     ok &= head_file (file_list[i], n_units, count_lines, elide_from_end);

diff --git a/src/md5sum.c b/src/md5sum.c
index 19dac0861c7846e13289af8b59b926da278c0dc7..e58a68ee80e478907d435f46141891746d27f780 100644 (file)
--- a/src/md5sum.c
+++ b/src/md5sum.c
@@ -46,7 +46,7 @@
 #include "error.h"
 #include "fadvise.h"
 #include "stdio--.h"
-#include "xsetmode.h"
+#include "xbinary-io.h"
 
 /* The official name of this program (e.g., no 'g' prefix).  */
 #if HASH_ALGO_MD5
@@ -598,7 +598,7 @@ digest_file (const char *filename, int *binary, unsigned char *bin_result,
           if (*binary < 0)
             *binary = ! isatty (STDIN_FILENO);
           if (*binary)
-            xsetmode (STDIN_FILENO, O_BINARY);
+            xset_binary_mode (STDIN_FILENO, O_BINARY);
         }
     }
   else

diff --git a/src/od.c b/src/od.c
index 0da85dae593fa652c7a4c7fda8b0b96e59d229ac..f469326ffe841a39e02b48e2ec59f925a7dc0777 100644 (file)
--- a/src/od.c
+++ b/src/od.c
@@ -29,8 +29,8 @@
 #include "ftoastr.h"
 #include "quote.h"
 #include "stat-size.h"
+#include "xbinary-io.h"
 #include "xprintf.h"
-#include "xsetmode.h"
 #include "xstrtol.h"
 
 /* The official name of this program (e.g., no 'g' prefix).  */
@@ -914,7 +914,7 @@ open_next_file (void)
           input_filename = _("standard input");
           in_stream = stdin;
           have_read_stdin = true;
-          xsetmode (STDIN_FILENO, O_BINARY);
+          xset_binary_mode (STDIN_FILENO, O_BINARY);
         }
       else
         {

diff --git a/src/split.c b/src/split.c
index 8bed1d38a070fc8558952b00f8a69e73528e9e83..96623369198566131c699d9f4171900a12e5131d 100644 (file)
--- a/src/split.c
+++ b/src/split.c
@@ -38,8 +38,8 @@
 #include "quote.h"
 #include "safe-read.h"
 #include "sig2str.h"
+#include "xbinary-io.h"
 #include "xdectoint.h"
-#include "xsetmode.h"
 #include "xstrtol.h"
 
 /* The official name of this program (e.g., no 'g' prefix).  */
@@ -1553,7 +1553,7 @@ main (int argc, char **argv)
          quoteaf (infile));
 
   /* Binary I/O is safer when byte counts are used.  */
-  xsetmode (STDIN_FILENO, O_BINARY);
+  xset_binary_mode (STDIN_FILENO, O_BINARY);
 
   /* Get the optimal block size of input device and make a buffer.  */
 

diff --git a/src/sum.c b/src/sum.c
index 7a13abe01dab28a75bde58c91bf4938ed3f33073..cae5d3705469c4d3ee67df2f677dc64ce636316b 100644 (file)
--- a/src/sum.c
+++ b/src/sum.c
@@ -29,7 +29,7 @@
 #include "fadvise.h"
 #include "human.h"
 #include "safe-read.h"
-#include "xsetmode.h"
+#include "xbinary-io.h"
 
 /* The official name of this program (e.g., no 'g' prefix).  */
 #define PROGRAM_NAME "sum"
@@ -98,7 +98,7 @@ bsd_sum_file (const char *file, int print_name)
     {
       fp = stdin;
       have_read_stdin = true;
-      xsetmode (STDIN_FILENO, O_BINARY);
+      xset_binary_mode (STDIN_FILENO, O_BINARY);
     }
   else
     {
@@ -167,7 +167,7 @@ sysv_sum_file (const char *file, int print_name)
     {
       fd = STDIN_FILENO;
       have_read_stdin = true;
-      xsetmode (STDIN_FILENO, O_BINARY);
+      xset_binary_mode (STDIN_FILENO, O_BINARY);
     }
   else
     {

diff --git a/src/tac.c b/src/tac.c
index 41c4f998abb736e155065b1e5957e09e3f4021c5..4e06b7623a26b7168ee2f586fcd61bad9a8c6607 100644 (file)
--- a/src/tac.c
+++ b/src/tac.c
@@ -48,7 +48,7 @@ tac -r -s '.\|
 #include "filenamecat.h"
 #include "safe-read.h"
 #include "stdlib--.h"
-#include "xsetmode.h"
+#include "xbinary-io.h"
 
 /* The official name of this program (e.g., no 'g' prefix).  */
 #define PROGRAM_NAME "tac"
@@ -572,7 +572,7 @@ tac_file (const char *filename)
       have_read_stdin = true;
       fd = STDIN_FILENO;
       filename = _("standard input");
-      xsetmode (STDIN_FILENO, O_BINARY);
+      xset_binary_mode (STDIN_FILENO, O_BINARY);
     }
   else
     {
@@ -687,7 +687,7 @@ main (int argc, char **argv)
           ? (char const *const *) &argv[optind]
           : default_file_list);
 
-  xsetmode (STDOUT_FILENO, O_BINARY);
+  xset_binary_mode (STDOUT_FILENO, O_BINARY);
 
   {
     size_t i;

diff --git a/src/tail.c b/src/tail.c
index dbd2104586b19ce552b06def3f4f649b9fb78283..d1552d424ff0f005e13f9bc25ea3134af5bda5a4 100644 (file)
--- a/src/tail.c
+++ b/src/tail.c
@@ -43,9 +43,9 @@
 #include "safe-read.h"
 #include "stat-size.h"
 #include "stat-time.h"
-#include "xnanosleep.h"
+#include "xbinary-io.h"
 #include "xdectoint.h"
-#include "xsetmode.h"
+#include "xnanosleep.h"
 #include "xstrtol.h"
 #include "xstrtod.h"
 
@@ -1894,7 +1894,7 @@ tail_file (struct File_spec *f, uintmax_t n_units)
     {
       have_read_stdin = true;
       fd = STDIN_FILENO;
-      xsetmode (STDIN_FILENO, O_BINARY);
+      xset_binary_mode (STDIN_FILENO, O_BINARY);
     }
   else
     fd = open (f->name, O_RDONLY | O_BINARY);
@@ -2323,7 +2323,7 @@ main (int argc, char **argv)
       || (header_mode == multiple_files && n_files > 1))
     print_headers = true;
 
-  xsetmode (STDOUT_FILENO, O_BINARY);
+  xset_binary_mode (STDOUT_FILENO, O_BINARY);
 
   for (i = 0; i < n_files; i++)
     ok &= tail_file (&F[i], n_units);

diff --git a/src/tee.c b/src/tee.c
index 5f04bfc86243911be2fb22c7c28447ae6fb0f993..4a6885ce5ed45fc98a0a23f29172aa858fa63655 100644 (file)
--- a/src/tee.c
+++ b/src/tee.c
@@ -27,7 +27,7 @@
 #include "error.h"
 #include "fadvise.h"
 #include "stdio--.h"
-#include "xsetmode.h"
+#include "xbinary-io.h"
 
 /* The official name of this program (e.g., no 'g' prefix).  */
 #define PROGRAM_NAME "tee"
@@ -194,8 +194,8 @@ tee_files (int nfiles, char **files)
      ? (append ? "ab" : "wb")
      : (append ? "a" : "w"));
 
-  xsetmode (STDIN_FILENO, O_BINARY);
-  xsetmode (STDOUT_FILENO, O_BINARY);
+  xset_binary_mode (STDIN_FILENO, O_BINARY);
+  xset_binary_mode (STDOUT_FILENO, O_BINARY);
   fadvise (stdin, FADVISE_SEQUENTIAL);
 
   /* Set up FILES[0 .. NFILES] and DESCRIPTORS[0 .. NFILES].

diff --git a/src/tr.c b/src/tr.c
index 724297c9b4d58f1dd98c8d82fa40689040bb136c..0c770d7a9bf3090bb900b30ea8c50880e637522a 100644 (file)
--- a/src/tr.c
+++ b/src/tr.c
@@ -29,7 +29,7 @@
 #include "fadvise.h"
 #include "quote.h"
 #include "safe-read.h"
-#include "xsetmode.h"
+#include "xbinary-io.h"
 #include "xstrtol.h"
 
 /* The official name of this program (e.g., no 'g' prefix).  */
@@ -1786,8 +1786,8 @@ main (int argc, char **argv)
   /* Use binary I/O, since 'tr' is sometimes used to transliterate
      non-printable characters, or characters which are stripped away
      by text-mode reads (like CR and ^Z).  */
-  xsetmode (STDIN_FILENO, O_BINARY);
-  xsetmode (STDOUT_FILENO, O_BINARY);
+  xset_binary_mode (STDIN_FILENO, O_BINARY);
+  xset_binary_mode (STDOUT_FILENO, O_BINARY);
   fadvise (stdin, FADVISE_SEQUENTIAL);
 
   if (squeeze_repeats && non_option_args == 1)

diff --git a/src/wc.c b/src/wc.c
index a587b2ca4eae6ec05b125abb61c47646bd8a27cb..be4f3062dfd996703192dd35330989a446f55afb 100644 (file)
--- a/src/wc.c
+++ b/src/wc.c
@@ -36,7 +36,7 @@
 #include "readtokens0.h"
 #include "safe-read.h"
 #include "stat-size.h"
-#include "xsetmode.h"
+#include "xbinary-io.h"
 
 #if !defined iswspace && !HAVE_ISWSPACE
 # define iswspace(wc) \
@@ -556,7 +556,7 @@ wc_file (char const *file, struct fstatus *fstatus)
   if (! file || STREQ (file, "-"))
     {
       have_read_stdin = true;
-      xsetmode (STDIN_FILENO, O_BINARY);
+      xset_binary_mode (STDIN_FILENO, O_BINARY);
       return wc (STDIN_FILENO, file, fstatus, -1);
     }
   else