mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-19 03:33:43 +03:00
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.
This commit is contained in:
1 parent
a24e9cc55c
commit
1c27b56095
14 files changed
+35
-35
No files matched your search
+1
-1
@@ -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
|
||||
|
||||
+2
-2
@@ -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
|
||||
|
||||
@@ -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
|
||||
{
|
||||
|
||||
+2
-2
@@ -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
|
||||
{
|
||||
|
||||
+3
-3
@@ -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);
|
||||
|
||||
+2
-2
@@ -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
|
||||
|
||||
@@ -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
|
||||
{
|
||||
|
||||
+2
-2
@@ -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. */
|
||||
|
||||
|
||||
@@ -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
|
||||
{
|
||||
|
||||
@@ -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;
|
||||
|
||||
+4
-4
@@ -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);
|
||||
|
||||
@@ -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].
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user