Skip to content

GitLab

C
coreutils
Commit b06d2885 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Upgraded coreutils to 8.32

parent ee989aad
Show whitespace changes
Inline Side-by-side
Showing with 288 additions and 348 deletions
Makefile
View file @ b06d2885
all: export FORCE_UNSAFE_CONFIGURE := 1
all:
tar xf coreutils-8.31.tar.xz
patch -Np1 -d coreutils-8.31 < coreutils-8.31-i18n-1.patch
cd coreutils-8.31 && sed -i '/test.lock/s/^/#/' gnulib-tests/gnulib.mk
cd coreutils-8.31 && autoreconf -fiv
cd coreutils-8.31 && ./configure --build=$(CLFS_TARGET) --prefix=/usr --enable-no-install-program=kill,uptime
$(MAKE) -C coreutils-8.31
tar xf coreutils-8.32.tar.xz
patch -Np1 -d coreutils-8.32 < coreutils-8.32-i18n-1.patch
cd coreutils-8.32 && sed -i '/test.lock/s/^/#/' gnulib-tests/gnulib.mk
cd coreutils-8.32 && autoreconf -fiv
cd coreutils-8.32 && ./configure --build=$(CLFS_TARGET) --prefix=/usr --enable-no-install-program=kill,uptime
$(MAKE) -C coreutils-8.32
-if [[ ! "$(BUILD_OPTIONS)" =~ no-tests ]] ; then \
$(MAKE) -C coreutils-8.31 NON_ROOT_USERNAME=nobody check-root ; \
$(MAKE) -C coreutils-8.32 NON_ROOT_USERNAME=nobody check-root ; \
echo "dummy:x:1000:nobody" >> /etc/group ; \
cd coreutils-8.31 ; \
cd coreutils-8.32 ; \
chown -Rv nobody . ; \
su nobody -s /bin/bash -c "PATH=$$PATH make RUN_EXPENSIVE_TESTS=yes -k check || true" ; \
sed -i '/dummy/d' /etc/group ; \
fi
$(MAKE) -C coreutils-8.31 install
$(MAKE) -C coreutils-8.32 install
mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date} /bin
mv -v /usr/bin/{dd,df,echo,false,ln,ls,mkdir,mknod} /bin
mv -v /usr/bin/{mv,pwd,rm,rmdir,stty,true,uname} /bin
......@@ -22,4 +22,4 @@ all:
mv -v /usr/share/man/man1/chroot.1 /usr/share/man/man8/chroot.8
sed -i s/\"1\"/\"8\"/1 /usr/share/man/man8/chroot.8
mv -v /usr/bin/{head,sleep,nice,test,[} /bin
rm -rf coreutils-8.31
rm -rf coreutils-8.32
build.xml
View file @ b06d2885
<project name="coreutils">
<target name="temporary-coreutils">
<property name="makedir" value="${builddir}/coreutils-8.31"/>
<property name="makedir" value="${builddir}/coreutils-8.32"/>
<exec executable="tar" failonerror="true">
<arg line="xf packages/coreutils/coreutils-8.31.tar.xz -C ${builddir}"/>
<arg line="xf packages/coreutils/coreutils-8.32.tar.xz -C ${builddir}"/>
</exec>
<exec executable="patch" dir="${makedir}" failonerror="true">
<arg line="-Np1 -i ${basedir}/packages/coreutils/coreutils-8.31-noman.patch"/>
<arg line="-Np1 -i ${basedir}/packages/coreutils/coreutils-8.32-noman.patch"/>
</exec>
<echo file="${makedir}/config.cache">fu_cv_sys_stat_statfs2_bsize=yes
gl_cv_func_working_mkstemp=yes
......
coreutils-8.31-i18n-1.patch → coreutils-8.32-i18n-1.patch
View file @ b06d2885
diff -uNr coreutils-8.31/bootstrap.conf coreutils-8.31-i18n-1/bootstrap.conf
--- coreutils-8.31/bootstrap.conf 2019-03-03 14:34:26.000000000 +1030
+++ coreutils-8.31-i18n-1/bootstrap.conf 2019-08-30 14:36:51.803486413 +0930
@@ -154,6 +154,7 @@
Submitted by: Xi Ruoyao <xry111@mengyan1223.wang>
Date: 2020-03-08
Initial Package Version: 8.32
Upstream Status: Rejected
Origin: Based on Fedora's i18n patches at
https://src.fedoraproject.org/rpms/coreutils/
Description: Fixes i18n issues with various Coreutils programs
diff -Naurp coreutils-8.32.orig/bootstrap.conf coreutils-8.32/bootstrap.conf
--- coreutils-8.32.orig/bootstrap.conf 2020-02-25 22:25:43.000000000 +0800
+++ coreutils-8.32/bootstrap.conf 2020-03-08 12:10:27.733236560 +0800
@@ -154,6 +154,7 @@ gnulib_modules="
maintainer-makefile
malloc-gnu
manywarnings
......@@ -9,10 +17,10 @@ diff -uNr coreutils-8.31/bootstrap.conf coreutils-8.31-i18n-1/bootstrap.conf
mbrlen
mbrtowc
mbsalign
diff -uNr coreutils-8.31/configure.ac coreutils-8.31-i18n-1/configure.ac
--- coreutils-8.31/configure.ac 2019-03-04 18:10:55.000000000 +1030
+++ coreutils-8.31-i18n-1/configure.ac 2019-08-30 14:36:51.803486413 +0930
@@ -438,6 +438,8 @@
diff -Naurp coreutils-8.32.orig/configure.ac coreutils-8.32/configure.ac
--- coreutils-8.32.orig/configure.ac 2020-02-28 05:45:34.000000000 +0800
+++ coreutils-8.32/configure.ac 2020-03-08 12:10:27.733236560 +0800
@@ -446,6 +446,8 @@ fi
# I'm leaving it here for now. This whole thing needs to be modernized...
gl_WINSIZE_IN_PTEM
......@@ -21,9 +29,9 @@ diff -uNr coreutils-8.31/configure.ac coreutils-8.31-i18n-1/configure.ac
gl_HEADER_TIOCGWINSZ_IN_TERMIOS_H
if test $gl_cv_sys_tiocgwinsz_needs_termios_h = no && \
diff -uNr coreutils-8.31/lib/linebuffer.h coreutils-8.31-i18n-1/lib/linebuffer.h
--- coreutils-8.31/lib/linebuffer.h 2019-01-05 02:44:43.000000000 +1030
+++ coreutils-8.31-i18n-1/lib/linebuffer.h 2019-08-30 14:36:51.803486413 +0930
diff -Naurp coreutils-8.32.orig/lib/linebuffer.h coreutils-8.32/lib/linebuffer.h
--- coreutils-8.32.orig/lib/linebuffer.h 2020-01-01 22:14:23.000000000 +0800
+++ coreutils-8.32/lib/linebuffer.h 2020-03-08 12:10:27.733236560 +0800
@@ -21,6 +21,11 @@
# include <stdio.h>
......@@ -36,7 +44,7 @@ diff -uNr coreutils-8.31/lib/linebuffer.h coreutils-8.31-i18n-1/lib/linebuffer.h
/* A 'struct linebuffer' holds a line of text. */
struct linebuffer
@@ -28,6 +33,9 @@
@@ -28,6 +33,9 @@ struct linebuffer
size_t size; /* Allocated. */
size_t length; /* Used. */
char *buffer;
......@@ -46,19 +54,19 @@ diff -uNr coreutils-8.31/lib/linebuffer.h coreutils-8.31-i18n-1/lib/linebuffer.h
};
/* Initialize linebuffer LINEBUFFER for use. */
diff -uNr coreutils-8.31/lib/mbfile.c coreutils-8.31-i18n-1/lib/mbfile.c
--- coreutils-8.31/lib/mbfile.c 1970-01-01 09:30:00.000000000 +0930
+++ coreutils-8.31-i18n-1/lib/mbfile.c 2019-08-30 14:36:51.804486415 +0930
diff -Naurp coreutils-8.32.orig/lib/mbfile.c coreutils-8.32/lib/mbfile.c
--- coreutils-8.32.orig/lib/mbfile.c 1970-01-01 08:00:00.000000000 +0800
+++ coreutils-8.32/lib/mbfile.c 2020-03-08 12:10:27.733236560 +0800
@@ -0,0 +1,3 @@
+#include <config.h>
+#define MBFILE_INLINE _GL_EXTERN_INLINE
+#include "mbfile.h"
diff -uNr coreutils-8.31/lib/mbfile.h coreutils-8.31-i18n-1/lib/mbfile.h
--- coreutils-8.31/lib/mbfile.h 1970-01-01 09:30:00.000000000 +0930
+++ coreutils-8.31-i18n-1/lib/mbfile.h 2019-08-30 14:36:51.804486415 +0930
diff -Naurp coreutils-8.32.orig/lib/mbfile.h coreutils-8.32/lib/mbfile.h
--- coreutils-8.32.orig/lib/mbfile.h 1970-01-01 08:00:00.000000000 +0800
+++ coreutils-8.32/lib/mbfile.h 2020-03-08 12:10:27.734236560 +0800
@@ -0,0 +1,255 @@
+/* Multibyte character I/O: macros for multi-byte encodings.
+ Copyright (C) 2001, 2005, 2009-2017 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2005, 2009-2015 Free Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
......@@ -312,12 +320,12 @@ diff -uNr coreutils-8.31/lib/mbfile.h coreutils-8.31-i18n-1/lib/mbfile.h
+_GL_INLINE_HEADER_BEGIN
+
+#endif /* _MBFILE_H */
diff -uNr coreutils-8.31/m4/mbfile.m4 coreutils-8.31-i18n-1/m4/mbfile.m4
--- coreutils-8.31/m4/mbfile.m4 1970-01-01 09:30:00.000000000 +0930
+++ coreutils-8.31-i18n-1/m4/mbfile.m4 2019-08-30 14:36:51.804486415 +0930
diff -Naurp coreutils-8.32.orig/m4/mbfile.m4 coreutils-8.32/m4/mbfile.m4
--- coreutils-8.32.orig/m4/mbfile.m4 1970-01-01 08:00:00.000000000 +0800
+++ coreutils-8.32/m4/mbfile.m4 2020-03-08 12:10:27.734236560 +0800
@@ -0,0 +1,14 @@
+# mbfile.m4 serial 7
+dnl Copyright (C) 2005, 2008-2017 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2008-2015 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
......@@ -330,9 +338,9 @@ diff -uNr coreutils-8.31/m4/mbfile.m4 coreutils-8.31-i18n-1/m4/mbfile.m4
+ AC_REQUIRE([AC_TYPE_MBSTATE_T])
+ :
+])
diff -uNr coreutils-8.31/src/cut.c coreutils-8.31-i18n-1/src/cut.c
--- coreutils-8.31/src/cut.c 2019-01-05 21:06:22.000000000 +1030
+++ coreutils-8.31-i18n-1/src/cut.c 2019-08-30 14:36:51.804486415 +0930
diff -Naurp coreutils-8.32.orig/src/cut.c coreutils-8.32/src/cut.c
--- coreutils-8.32.orig/src/cut.c 2020-01-01 22:13:12.000000000 +0800
+++ coreutils-8.32/src/cut.c 2020-03-08 12:10:27.734236560 +0800
@@ -28,6 +28,11 @@
#include <assert.h>
#include <getopt.h>
......@@ -427,7 +435,7 @@ diff -uNr coreutils-8.31/src/cut.c coreutils-8.31-i18n-1/src/cut.c
/* This buffer is used to support the semantics of the -s option
(or lack of same) when the specified field list includes (does
not include) the first field. In both of those cases, the entire
@@ -77,15 +143,25 @@
@@ -77,15 +143,25 @@ enum operating_mode
{
undefined_mode,
......@@ -454,7 +462,7 @@ diff -uNr coreutils-8.31/src/cut.c coreutils-8.31-i18n-1/src/cut.c
/* If true do not output lines containing no delimiter characters.
Otherwise, all such lines are printed. This option is valid only
with field mode. */
@@ -97,6 +173,9 @@
@@ -97,6 +173,9 @@ static bool complement;
/* The delimiter character for field mode. */
static unsigned char delim;
......@@ -464,7 +472,7 @@ diff -uNr coreutils-8.31/src/cut.c coreutils-8.31-i18n-1/src/cut.c
/* The delimiter for each line/record. */
static unsigned char line_delim = '\n';
@@ -164,7 +243,7 @@
@@ -164,7 +243,7 @@ Print selected parts of lines from each
-f, --fields=LIST select only these fields; also print any line\n\
that contains no delimiter character, unless\n\
the -s option is specified\n\
......@@ -473,7 +481,7 @@ diff -uNr coreutils-8.31/src/cut.c coreutils-8.31-i18n-1/src/cut.c
"), stdout);
fputs (_("\
--complement complement the set of selected bytes, characters\n\
@@ -280,6 +359,82 @@
@@ -280,6 +359,82 @@ cut_bytes (FILE *stream)
}
}
......@@ -489,7 +497,7 @@ diff -uNr coreutils-8.31/src/cut.c coreutils-8.31-i18n-1/src/cut.c
+static void
+cut_characters_or_cut_bytes_no_split (FILE *stream)
+{
+ size_t idx; /* number of bytes or characters in the line so far. */
+ uintmax_t idx; /* number of bytes or characters in the line so far. */
+ char buf[MB_LEN_MAX + BUFSIZ]; /* For spooling a read byte sequence. */
+ char *bufpos; /* Next read position of BUF. */
+ size_t buflen; /* The length of the byte sequence in buf. */
......@@ -556,7 +564,7 @@ diff -uNr coreutils-8.31/src/cut.c coreutils-8.31-i18n-1/src/cut.c
/* Read from stream STREAM, printing to standard output any selected fields. */
static void
@@ -425,13 +580,211 @@
@@ -425,13 +580,211 @@ cut_fields (FILE *stream)
}
}
......@@ -565,7 +573,7 @@ diff -uNr coreutils-8.31/src/cut.c coreutils-8.31-i18n-1/src/cut.c
+cut_fields_mb (FILE *stream)
+{
+ int c;
+ size_t field_idx;
+ uintmax_t field_idx;
+ int found_any_selected_field;
+ int buffer_first_field;
+ int empty_input;
......@@ -771,7 +779,7 @@ diff -uNr coreutils-8.31/src/cut.c coreutils-8.31-i18n-1/src/cut.c
}
/* Process file FILE to standard output.
@@ -483,6 +836,7 @@
@@ -483,6 +836,7 @@ main (int argc, char **argv)
bool ok;
bool delim_specified = false;
char *spec_list_string IF_LINT ( = NULL);
......@@ -779,7 +787,7 @@ diff -uNr coreutils-8.31/src/cut.c coreutils-8.31-i18n-1/src/cut.c
initialize_main (&argc, &argv);
set_program_name (argv[0]);
@@ -505,7 +859,6 @@
@@ -505,7 +859,6 @@ main (int argc, char **argv)
switch (optc)
{
case 'b':
......@@ -787,7 +795,7 @@ diff -uNr coreutils-8.31/src/cut.c coreutils-8.31-i18n-1/src/cut.c
/* Build the byte list. */
if (operating_mode != undefined_mode)
FATAL_ERROR (_("only one type of list may be specified"));
@@ -513,6 +866,14 @@
@@ -513,6 +866,14 @@ main (int argc, char **argv)
spec_list_string = optarg;
break;
......@@ -802,7 +810,7 @@ diff -uNr coreutils-8.31/src/cut.c coreutils-8.31-i18n-1/src/cut.c
case 'f':
/* Build the field list. */
if (operating_mode != undefined_mode)
@@ -524,10 +885,38 @@
@@ -524,10 +885,38 @@ main (int argc, char **argv)
case 'd':
/* New delimiter. */
/* Interpret -d '' to mean 'use the NUL byte as the delimiter.' */
......@@ -845,7 +853,7 @@ diff -uNr coreutils-8.31/src/cut.c coreutils-8.31-i18n-1/src/cut.c
break;
case OUTPUT_DELIMITER_OPTION:
@@ -540,6 +929,7 @@
@@ -540,6 +929,7 @@ main (int argc, char **argv)
break;
case 'n':
......@@ -853,7 +861,7 @@ diff -uNr coreutils-8.31/src/cut.c coreutils-8.31-i18n-1/src/cut.c
break;
case 's':
@@ -579,15 +969,34 @@
@@ -579,15 +969,34 @@ main (int argc, char **argv)
| (complement ? SETFLD_COMPLEMENT : 0) );
if (!delim_specified)
......@@ -894,9 +902,9 @@ diff -uNr coreutils-8.31/src/cut.c coreutils-8.31-i18n-1/src/cut.c
}
if (optind == argc)
diff -uNr coreutils-8.31/src/expand.c coreutils-8.31-i18n-1/src/expand.c
--- coreutils-8.31/src/expand.c 2019-01-05 21:06:22.000000000 +1030
+++ coreutils-8.31-i18n-1/src/expand.c 2019-08-30 14:36:51.805486418 +0930
diff -Naurp coreutils-8.32.orig/src/expand.c coreutils-8.32/src/expand.c
--- coreutils-8.32.orig/src/expand.c 2020-01-01 22:13:12.000000000 +0800
+++ coreutils-8.32/src/expand.c 2020-03-08 12:10:27.735236560 +0800
@@ -37,6 +37,9 @@
#include <stdio.h>
#include <getopt.h>
......@@ -907,7 +915,7 @@ diff -uNr coreutils-8.31/src/expand.c coreutils-8.31-i18n-1/src/expand.c
#include "system.h"
#include "die.h"
#include "xstrndup.h"
@@ -98,19 +101,41 @@
@@ -98,19 +101,41 @@ expand (void)
{
/* Input stream. */
FILE *fp = next_file (NULL);
......@@ -953,7 +961,7 @@ diff -uNr coreutils-8.31/src/expand.c coreutils-8.31-i18n-1/src/expand.c
/* The following variables have valid values only when CONVERT
is true: */
@@ -120,17 +145,48 @@
@@ -120,17 +145,48 @@ expand (void)
/* Index in TAB_LIST of next tab stop to examine. */
size_t tab_index = 0;
......@@ -985,7 +993,7 @@ diff -uNr coreutils-8.31/src/expand.c coreutils-8.31-i18n-1/src/expand.c
+ if(using_utf_locale==false && found_bom==true)
+ {
+ /*First file conatined BOM header - locale was switched to UTF
+ /*all subsequent files should contain BOM. */
+ *all subsequent files should contain BOM. */
+ error (EXIT_FAILURE, errno, _("combination of files with and without BOM header"));
+ }
+ }
......@@ -1006,7 +1014,7 @@ diff -uNr coreutils-8.31/src/expand.c coreutils-8.31-i18n-1/src/expand.c
{
/* Column the next input tab stop is on. */
uintmax_t next_tab_column;
@@ -149,32 +205,34 @@
@@ -149,32 +205,34 @@ expand (void)
if (putchar (' ') < 0)
die (EXIT_FAILURE, errno, _("write error"));
......@@ -1049,9 +1057,9 @@ diff -uNr coreutils-8.31/src/expand.c coreutils-8.31-i18n-1/src/expand.c
}
}
diff -uNr coreutils-8.31/src/expand-common.c coreutils-8.31-i18n-1/src/expand-common.c
--- coreutils-8.31/src/expand-common.c 2019-01-05 21:06:22.000000000 +1030
+++ coreutils-8.31-i18n-1/src/expand-common.c 2019-08-30 14:36:51.805486418 +0930
diff -Naurp coreutils-8.32.orig/src/expand-common.c coreutils-8.32/src/expand-common.c
--- coreutils-8.32.orig/src/expand-common.c 2020-01-01 22:13:12.000000000 +0800
+++ coreutils-8.32/src/expand-common.c 2020-03-08 12:10:27.735236560 +0800
@@ -19,6 +19,7 @@
#include <assert.h>
#include <stdio.h>
......@@ -1060,7 +1068,7 @@ diff -uNr coreutils-8.31/src/expand-common.c coreutils-8.31-i18n-1/src/expand-co
#include "system.h"
#include "die.h"
#include "error.h"
@@ -126,6 +127,119 @@
@@ -126,6 +127,119 @@ set_increment_size (uintmax_t tabval)
return ok;
}
......@@ -1180,10 +1188,10 @@ diff -uNr coreutils-8.31/src/expand-common.c coreutils-8.31-i18n-1/src/expand-co
/* Add the comma or blank separated list of tab stops STOPS
to the list of tab stops. */
extern void
diff -uNr coreutils-8.31/src/expand-common.h coreutils-8.31-i18n-1/src/expand-common.h
--- coreutils-8.31/src/expand-common.h 2019-01-05 21:06:22.000000000 +1030
+++ coreutils-8.31-i18n-1/src/expand-common.h 2019-08-30 14:36:51.805486418 +0930
@@ -34,6 +34,18 @@
diff -Naurp coreutils-8.32.orig/src/expand-common.h coreutils-8.32/src/expand-common.h
--- coreutils-8.32.orig/src/expand-common.h 2020-01-01 22:13:12.000000000 +0800
+++ coreutils-8.32/src/expand-common.h 2020-03-08 12:10:27.735236560 +0800
@@ -34,6 +34,18 @@ extern size_t max_column_width;
/* The desired exit status. */
extern int exit_status;
......@@ -1202,9 +1210,9 @@ diff -uNr coreutils-8.31/src/expand-common.h coreutils-8.31-i18n-1/src/expand-co
/* Add tab stop TABVAL to the end of 'tab_list'. */
extern void
add_tab_stop (uintmax_t tabval);
diff -uNr coreutils-8.31/src/fold.c coreutils-8.31-i18n-1/src/fold.c
--- coreutils-8.31/src/fold.c 2019-01-05 21:06:22.000000000 +1030
+++ coreutils-8.31-i18n-1/src/fold.c 2019-08-30 14:36:51.805486418 +0930
diff -Naurp coreutils-8.32.orig/src/fold.c coreutils-8.32/src/fold.c
--- coreutils-8.32.orig/src/fold.c 2020-01-01 22:13:12.000000000 +0800
+++ coreutils-8.32/src/fold.c 2020-03-08 12:10:27.736236560 +0800
@@ -22,12 +22,34 @@
#include <getopt.h>
#include <sys/types.h>
......@@ -1286,7 +1294,7 @@ diff -uNr coreutils-8.31/src/fold.c coreutils-8.31-i18n-1/src/fold.c
{"spaces", no_argument, NULL, 's'},
{"width", required_argument, NULL, 'w'},
{GETOPT_HELP_OPTION_DECL},
@@ -76,6 +119,7 @@
@@ -76,6 +119,7 @@ Wrap input lines in each FILE, writing t
fputs (_("\
-b, --bytes count bytes rather than columns\n\
......@@ -1294,7 +1302,7 @@ diff -uNr coreutils-8.31/src/fold.c coreutils-8.31-i18n-1/src/fold.c
-s, --spaces break at spaces\n\
-w, --width=WIDTH use WIDTH columns instead of 80\n\
"), stdout);
@@ -93,7 +137,7 @@
@@ -93,7 +137,7 @@ Wrap input lines in each FILE, writing t
static size_t
adjust_column (size_t column, char c)
{
......@@ -1303,7 +1311,7 @@ diff -uNr coreutils-8.31/src/fold.c coreutils-8.31-i18n-1/src/fold.c
{
if (c == '\b')
{
@@ -116,30 +160,14 @@
@@ -116,30 +160,14 @@ adjust_column (size_t column, char c)
to stdout, with maximum line length WIDTH.
Return true if successful. */
......@@ -1336,7 +1344,7 @@ diff -uNr coreutils-8.31/src/fold.c coreutils-8.31-i18n-1/src/fold.c
fadvise (istream, FADVISE_SEQUENTIAL);
@@ -169,6 +197,15 @@
@@ -169,6 +197,15 @@ fold_file (char const *filename, size_t
bool found_blank = false;
size_t logical_end = offset_out;
......@@ -1352,7 +1360,7 @@ diff -uNr coreutils-8.31/src/fold.c coreutils-8.31-i18n-1/src/fold.c
/* Look for the last blank. */
while (logical_end)
{
@@ -215,11 +252,220 @@
@@ -215,11 +252,220 @@ fold_file (char const *filename, size_t
line_out[offset_out++] = c;
}
......@@ -1574,7 +1582,7 @@ diff -uNr coreutils-8.31/src/fold.c coreutils-8.31-i18n-1/src/fold.c
if (ferror (istream))
{
error (0, saved_errno, "%s", quotef (filename));
@@ -252,7 +498,8 @@
@@ -252,7 +498,8 @@ main (int argc, char **argv)
atexit (close_stdout);
......@@ -1584,7 +1592,7 @@ diff -uNr coreutils-8.31/src/fold.c coreutils-8.31-i18n-1/src/fold.c
while ((optc = getopt_long (argc, argv, shortopts, longopts, NULL)) != -1)
{
@@ -261,7 +508,15 @@
@@ -261,7 +508,15 @@ main (int argc, char **argv)
switch (optc)
{
case 'b': /* Count bytes rather than columns. */
......@@ -1601,9 +1609,9 @@ diff -uNr coreutils-8.31/src/fold.c coreutils-8.31-i18n-1/src/fold.c
break;
case 's': /* Break at word boundaries. */
diff -uNr coreutils-8.31/src/join.c coreutils-8.31-i18n-1/src/join.c
--- coreutils-8.31/src/join.c 2019-02-18 13:54:11.000000000 +1030
+++ coreutils-8.31-i18n-1/src/join.c 2019-08-30 14:36:51.806486420 +0930
diff -Naurp coreutils-8.32.orig/src/join.c coreutils-8.32/src/join.c
--- coreutils-8.32.orig/src/join.c 2020-01-01 22:13:12.000000000 +0800
+++ coreutils-8.32/src/join.c 2020-03-08 12:10:27.736236560 +0800
@@ -22,19 +22,33 @@
#include <sys/types.h>
#include <getopt.h>
......@@ -1639,7 +1647,7 @@ diff -uNr coreutils-8.31/src/join.c coreutils-8.31-i18n-1/src/join.c
/* The official name of this program (e.g., no 'g' prefix). */
#define PROGRAM_NAME "join"
@@ -136,10 +150,12 @@
@@ -136,10 +150,12 @@ static struct outlist outlist_head;
/* Last element in 'outlist', where a new element can be added. */
static struct outlist *outlist_end = &outlist_head;
......@@ -1656,7 +1664,7 @@ diff -uNr coreutils-8.31/src/join.c coreutils-8.31-i18n-1/src/join.c
/* If nonzero, check that the input is correctly ordered. */
static enum
@@ -276,13 +292,14 @@
@@ -276,13 +292,14 @@ xfields (struct line *line)
if (ptr == lim)
return;
......@@ -1674,7 +1682,7 @@ diff -uNr coreutils-8.31/src/join.c coreutils-8.31-i18n-1/src/join.c
{
/* Skip leading blanks before the first field. */
while (field_sep (*ptr))
@@ -306,6 +323,147 @@
@@ -306,6 +323,147 @@ xfields (struct line *line)
extract_field (line, ptr, lim - ptr);
}
......@@ -1822,7 +1830,7 @@ diff -uNr coreutils-8.31/src/join.c coreutils-8.31-i18n-1/src/join.c
static void
freeline (struct line *line)
{
@@ -327,56 +485,133 @@
@@ -327,56 +485,133 @@ keycmp (struct line const *line1, struct
size_t jf_1, size_t jf_2)
{
/* Start of field to compare in each file. */
......@@ -1979,7 +1987,7 @@ diff -uNr coreutils-8.31/src/join.c coreutils-8.31-i18n-1/src/join.c
}
/* Check that successive input lines PREV and CURRENT from input file
@@ -468,6 +703,11 @@
@@ -468,6 +703,11 @@ get_line (FILE *fp, struct line **linep,
}
++line_no[which - 1];
......@@ -1991,7 +1999,7 @@ diff -uNr coreutils-8.31/src/join.c coreutils-8.31-i18n-1/src/join.c
xfields (line);
if (prevline[which - 1])
@@ -563,21 +803,28 @@
@@ -563,21 +803,28 @@ prfield (size_t n, struct line const *li
/* Output all the fields in line, other than the join field. */
......@@ -2023,7 +2031,7 @@ diff -uNr coreutils-8.31/src/join.c coreutils-8.31-i18n-1/src/join.c
prfield (i, line);
}
}
@@ -588,7 +835,6 @@
@@ -588,7 +835,6 @@ static void
prjoin (struct line const *line1, struct line const *line2)
{
const struct outlist *outlist;
......@@ -2031,7 +2039,7 @@ diff -uNr coreutils-8.31/src/join.c coreutils-8.31-i18n-1/src/join.c
size_t field;
struct line const *line;
@@ -622,7 +868,7 @@
@@ -622,7 +868,7 @@ prjoin (struct line const *line1, struct
o = o->next;
if (o == NULL)
break;
......@@ -2040,7 +2048,7 @@ diff -uNr coreutils-8.31/src/join.c coreutils-8.31-i18n-1/src/join.c
}
putchar (eolchar);
}
@@ -1099,20 +1345,43 @@
@@ -1098,20 +1344,43 @@ main (int argc, char **argv)
case 't':
{
......@@ -2093,9 +2101,9 @@ diff -uNr coreutils-8.31/src/join.c coreutils-8.31-i18n-1/src/join.c
}
break;
diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
--- coreutils-8.31/src/pr.c 2019-01-05 21:06:22.000000000 +1030
+++ coreutils-8.31-i18n-1/src/pr.c 2019-08-30 14:36:51.807486422 +0930
diff -Naurp coreutils-8.32.orig/src/pr.c coreutils-8.32/src/pr.c
--- coreutils-8.32.orig/src/pr.c 2020-01-01 22:33:18.000000000 +0800
+++ coreutils-8.32/src/pr.c 2020-03-08 12:10:27.737236560 +0800
@@ -311,6 +311,24 @@
#include <getopt.h>
......@@ -2121,8 +2129,8 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
#include "system.h"
#include "die.h"
#include "error.h"
@@ -324,6 +342,18 @@
#include "xstrtol.h"
@@ -325,6 +343,18 @@
#include "xstrtol-error.h"
#include "xdectoint.h"
+/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t. */
......@@ -2140,7 +2148,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
/* The official name of this program (e.g., no 'g' prefix). */
#define PROGRAM_NAME "pr"
@@ -416,7 +446,20 @@
@@ -417,7 +447,20 @@ struct COLUMN
typedef struct COLUMN COLUMN;
......@@ -2162,7 +2170,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
static bool read_line (COLUMN *p);
static bool print_page (void);
static bool print_stored (COLUMN *p);
@@ -428,6 +471,7 @@
@@ -429,6 +472,7 @@ static void add_line_number (COLUMN *p);
static void getoptnum (const char *n_str, int min, int *num,
const char *errfmt);
static void getoptarg (char *arg, char switch_char, char *character,
......@@ -2170,7 +2178,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
int *number);
static void print_files (int number_of_files, char **av);
static void init_parameters (int number_of_files);
@@ -441,7 +485,6 @@
@@ -442,7 +486,6 @@ static void store_char (char c);
static void pad_down (unsigned int lines);
static void read_rest_of_line (COLUMN *p);
static void skip_read (COLUMN *p, int column_number);
......@@ -2178,7 +2186,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
static void cleanup (void);
static void print_sep_string (void);
static void separator_string (const char *optarg_S);
@@ -453,7 +496,7 @@
@@ -454,7 +497,7 @@ static COLUMN *column_vector;
we store the leftmost columns contiguously in buff.
To print a line from buff, get the index of the first character
from line_vector[i], and print up to line_vector[i + 1]. */
......@@ -2187,7 +2195,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
/* Index of the position in buff where the next character
will be stored. */
@@ -557,7 +600,7 @@
@@ -558,7 +601,7 @@ static int chars_per_column;
static bool untabify_input = false;
/* (-e) The input tab character. */
......@@ -2196,7 +2204,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
/* (-e) Tabstops are at chars_per_tab, 2*chars_per_tab, 3*chars_per_tab, ...
where the leftmost column is 1. */
@@ -567,7 +610,10 @@
@@ -568,7 +611,10 @@ static int chars_per_input_tab = 8;
static bool tabify_output = false;
/* (-i) The output tab character. */
......@@ -2208,7 +2216,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
/* (-i) The width of the output tab. */
static int chars_per_output_tab = 8;
@@ -637,7 +683,13 @@
@@ -638,7 +684,13 @@ static int line_number;
static bool numbered_lines = false;
/* (-n) Character which follows each line number. */
......@@ -2223,7 +2231,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
/* (-n) line counting starts with 1st line of input file (not with 1st
line of 1st page printed). */
@@ -690,6 +742,7 @@
@@ -691,6 +743,7 @@ static bool use_col_separator = false;
-a|COLUMN|-m is a 'space' and with the -J option a 'tab'. */
static char const *col_sep_string = "";
static int col_sep_length = 0;
......@@ -2231,7 +2239,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
static char *column_separator = (char *) " ";
static char *line_separator = (char *) "\t";
@@ -851,6 +904,13 @@
@@ -852,6 +905,13 @@ separator_string (const char *optarg_S)
integer_overflow ();
col_sep_length = len;
col_sep_string = optarg_S;
......@@ -2245,7 +2253,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
}
int
@@ -875,6 +935,21 @@
@@ -876,6 +936,21 @@ main (int argc, char **argv)
atexit (close_stdout);
......@@ -2267,7 +2275,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
n_files = 0;
file_names = (argc > 1
? xnmalloc (argc - 1, sizeof (char *))
@@ -951,8 +1026,12 @@
@@ -952,8 +1027,12 @@ main (int argc, char **argv)
break;
case 'e':
if (optarg)
......@@ -2282,7 +2290,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
/* Could check tab width > 0. */
untabify_input = true;
break;
@@ -965,8 +1044,12 @@
@@ -966,8 +1045,12 @@ main (int argc, char **argv)
break;
case 'i':
if (optarg)
......@@ -2297,7 +2305,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
/* Could check tab width > 0. */
tabify_output = true;
break;
@@ -984,8 +1067,8 @@
@@ -985,8 +1068,8 @@ main (int argc, char **argv)
case 'n':
numbered_lines = true;
if (optarg)
......@@ -2308,7 +2316,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
break;
case 'N':
skip_count = false;
@@ -1010,6 +1093,7 @@
@@ -1011,6 +1094,7 @@ main (int argc, char **argv)
/* Reset an additional input of -s, -S dominates -s */
col_sep_string = "";
col_sep_length = 0;
......@@ -2316,7 +2324,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
use_col_separator = true;
if (optarg)
separator_string (optarg);
@@ -1165,10 +1249,45 @@
@@ -1166,10 +1250,45 @@ getoptnum (const char *n_str, int min, i
a number. */
static void
......@@ -2364,7 +2372,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
if (*arg)
{
long int tmp_long;
@@ -1190,6 +1309,11 @@
@@ -1191,6 +1310,11 @@ static void
init_parameters (int number_of_files)
{
int chars_used_by_number = 0;
......@@ -2376,7 +2384,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
lines_per_body = lines_per_page - lines_per_header - lines_per_footer;
if (lines_per_body <= 0)
@@ -1227,7 +1351,7 @@
@@ -1228,7 +1352,7 @@ init_parameters (int number_of_files)
else
col_sep_string = column_separator;
......@@ -2385,7 +2393,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
use_col_separator = true;
}
/* It's rather pointless to define a TAB separator with column
@@ -1257,11 +1381,11 @@
@@ -1258,11 +1382,11 @@ init_parameters (int number_of_files)
+ TAB_WIDTH (chars_per_input_tab, chars_per_number); */
/* Estimate chars_per_text without any margin and keep it constant. */
......@@ -2399,7 +2407,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
/* The number is part of the column width unless we are
printing files in parallel. */
@@ -1270,7 +1394,7 @@
@@ -1271,7 +1395,7 @@ init_parameters (int number_of_files)
}
int sep_chars, useful_chars;
......@@ -2408,7 +2416,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
sep_chars = INT_MAX;
if (INT_SUBTRACT_WRAPV (chars_per_line - chars_used_by_number, sep_chars,
&useful_chars))
@@ -1293,7 +1417,7 @@
@@ -1294,7 +1418,7 @@ init_parameters (int number_of_files)
We've to use 8 as the lower limit, if we use chars_per_default_tab = 8
to expand a tab which is not an input_tab-char. */
free (clump_buff);
......@@ -2417,7 +2425,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
}
/* Open the necessary files,
@@ -1399,7 +1523,7 @@
@@ -1400,7 +1524,7 @@ init_funcs (void)
/* Enlarge p->start_position of first column to use the same form of
padding_not_printed with all columns. */
......@@ -2426,7 +2434,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
/* This loop takes care of all but the rightmost column. */
@@ -1433,7 +1557,7 @@
@@ -1434,7 +1558,7 @@ init_funcs (void)
}
else
{
......@@ -2435,7 +2443,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
h_next = h + chars_per_column;
}
}
@@ -1724,9 +1848,9 @@
@@ -1725,9 +1849,9 @@ static void
align_column (COLUMN *p)
{
padding_not_printed = p->start_position;
......@@ -2447,7 +2455,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
padding_not_printed = ANYWHERE;
}
@@ -2001,13 +2125,13 @@
@@ -2002,13 +2126,13 @@ store_char (char c)
/* May be too generous. */
buff = X2REALLOC (buff, &buff_allocated);
}
......@@ -2463,7 +2471,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
char *s;
int num_width;
@@ -2024,22 +2148,24 @@
@@ -2025,22 +2149,24 @@ add_line_number (COLUMN *p)
/* Tabification is assumed for multiple columns, also for n-separators,
but 'default n-separator = TAB' hasn't been given priority over
equal column_width also specified by POSIX. */
......@@ -2492,7 +2500,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
output_position = POS_AFTER_TAB (chars_per_output_tab,
output_position);
}
@@ -2198,7 +2324,7 @@
@@ -2199,7 +2325,7 @@ print_white_space (void)
while (goal - h_old > 1
&& (h_new = POS_AFTER_TAB (chars_per_output_tab, h_old)) <= goal)
{
......@@ -2501,7 +2509,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
h_old = h_new;
}
while (++h_old <= goal)
@@ -2218,6 +2344,7 @@
@@ -2219,6 +2345,7 @@ print_sep_string (void)
{
char const *s = col_sep_string;
int l = col_sep_length;
......@@ -2509,7 +2517,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
if (separators_not_printed <= 0)
{
@@ -2229,6 +2356,7 @@
@@ -2230,6 +2357,7 @@ print_sep_string (void)
{
for (; separators_not_printed > 0; --separators_not_printed)
{
......@@ -2517,7 +2525,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
while (l-- > 0)
{
/* 3 types of sep_strings: spaces only, spaces and chars,
@@ -2242,12 +2370,15 @@
@@ -2243,12 +2371,15 @@ print_sep_string (void)
}
else
{
......@@ -2534,7 +2542,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
/* sep_string ends with some spaces */
if (spaces_not_printed > 0)
print_white_space ();
@@ -2275,7 +2406,7 @@
@@ -2276,7 +2407,7 @@ print_clump (COLUMN *p, int n, char *clu
required number of tabs and spaces. */
static void
......@@ -2543,7 +2551,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
{
if (tabify_output)
{
@@ -2299,6 +2430,74 @@
@@ -2300,6 +2431,74 @@ print_char (char c)
putchar (c);
}
......@@ -2618,7 +2626,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
/* Skip to page PAGE before printing.
PAGE may be larger than total number of pages. */
@@ -2476,9 +2675,9 @@
@@ -2477,9 +2676,9 @@ read_line (COLUMN *p)
align_empty_cols = false;
}
......@@ -2630,7 +2638,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
padding_not_printed = ANYWHERE;
}
@@ -2547,7 +2746,7 @@
@@ -2548,7 +2747,7 @@ print_stored (COLUMN *p)
COLUMN *q;
int line = p->current_line++;
......@@ -2639,7 +2647,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
/* FIXME
UMR: Uninitialized memory read:
* This is occurring while in:
@@ -2559,7 +2758,7 @@
@@ -2560,7 +2759,7 @@ print_stored (COLUMN *p)
xmalloc [xmalloc.c:94]
init_store_cols [pr.c:1648]
*/
......@@ -2648,7 +2656,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
pad_vertically = true;
@@ -2579,9 +2778,9 @@
@@ -2580,9 +2779,9 @@ print_stored (COLUMN *p)
}
}
......@@ -2660,7 +2668,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
padding_not_printed = ANYWHERE;
}
@@ -2594,8 +2793,8 @@
@@ -2595,8 +2794,8 @@ print_stored (COLUMN *p)
if (spaces_not_printed == 0)
{
output_position = p->start_position + end_vector[line];
......@@ -2671,7 +2679,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
}
return true;
@@ -2614,7 +2813,7 @@
@@ -2615,7 +2814,7 @@ print_stored (COLUMN *p)
number of characters is 1.) */
static int
......@@ -2680,7 +2688,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
{
unsigned char uc = c;
char *s = clump_buff;
@@ -2624,10 +2823,10 @@
@@ -2625,10 +2824,10 @@ char_to_clump (char c)
int chars;
int chars_per_c = 8;
......@@ -2693,7 +2701,7 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
{
width = TAB_WIDTH (chars_per_c, input_position);
@@ -2708,6 +2907,164 @@
@@ -2709,6 +2908,164 @@ char_to_clump (char c)
return chars;
}
......@@ -2858,9 +2866,9 @@ diff -uNr coreutils-8.31/src/pr.c coreutils-8.31-i18n-1/src/pr.c
/* We've just printed some files and need to clean up things before
looking for more options and printing the next batch of files.
diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
--- coreutils-8.31/src/sort.c 2019-02-18 13:54:43.000000000 +1030
+++ coreutils-8.31-i18n-1/src/sort.c 2019-08-30 14:36:51.808486424 +0930
diff -Naurp coreutils-8.32.orig/src/sort.c coreutils-8.32/src/sort.c
--- coreutils-8.32.orig/src/sort.c 2020-01-01 22:33:34.000000000 +0800
+++ coreutils-8.32/src/sort.c 2020-03-08 12:10:27.738236560 +0800
@@ -29,6 +29,14 @@
#include <sys/wait.h>
#include <signal.h>
......@@ -2876,7 +2884,7 @@ diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
#include "system.h"
#include "argmatch.h"
#include "die.h"
@@ -161,14 +169,39 @@
@@ -157,14 +165,39 @@ static int decimal_point;
/* Thousands separator; if -1, then there isn't one. */
static int thousands_sep;
......@@ -2917,7 +2925,7 @@ diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
/* The kind of blanks for '-b' to skip in various options. */
enum blanktype { bl_start, bl_end, bl_both };
@@ -342,13 +375,11 @@
@@ -338,13 +371,11 @@ static bool reverse;
they were read if all keys compare equal. */
static bool stable;
......@@ -2934,7 +2942,7 @@ diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
/* Flag to remove consecutive duplicate lines from the output.
Only the last of a sequence of equal lines will be output. */
@@ -806,6 +837,46 @@
@@ -802,6 +833,46 @@ reap_all (void)
reap (-1);
}
......@@ -2981,7 +2989,7 @@ diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
/* Clean up any remaining temporary files. */
static void
@@ -1274,7 +1345,7 @@
@@ -1270,7 +1341,7 @@ zaptemp (char const *name)
free (node);
}
......@@ -2990,7 +2998,7 @@ diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
static int
struct_month_cmp (void const *m1, void const *m2)
@@ -1289,7 +1360,7 @@
@@ -1285,7 +1356,7 @@ struct_month_cmp (void const *m1, void c
/* Initialize the character class tables. */
static void
......@@ -2999,7 +3007,7 @@ diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
{
size_t i;
@@ -1301,7 +1372,7 @@
@@ -1297,7 +1368,7 @@ inittables (void)
fold_toupper[i] = toupper (i);
}
......@@ -3008,7 +3016,7 @@ diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
/* If we're not in the "C" locale, read different names for months. */
if (hard_LC_TIME)
{
@@ -1383,6 +1454,84 @@
@@ -1379,6 +1450,84 @@ specify_nmerge (int oi, char c, char con
xstrtol_fatal (e, oi, c, long_options, s);
}
......@@ -3093,7 +3101,7 @@ diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
/* Specify the amount of main memory to use when sorting. */
static void
specify_sort_size (int oi, char c, char const *s)
@@ -1614,7 +1763,7 @@
@@ -1610,7 +1759,7 @@ buffer_linelim (struct buffer const *buf
by KEY in LINE. */
static char *
......@@ -3102,7 +3110,7 @@ diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
{
char *ptr = line->text, *lim = ptr + line->length - 1;
size_t sword = key->sword;
@@ -1623,10 +1772,10 @@
@@ -1619,10 +1768,10 @@ begfield (struct line const *line, struc
/* The leading field separator itself is included in a field when -t
is absent. */
......@@ -3115,7 +3123,7 @@ diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
++ptr;
if (ptr < lim)
++ptr;
@@ -1652,11 +1801,70 @@
@@ -1648,11 +1797,70 @@ begfield (struct line const *line, struc
return ptr;
}
......@@ -3187,7 +3195,7 @@ diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
{
char *ptr = line->text, *lim = ptr + line->length - 1;
size_t eword = key->eword, echar = key->echar;
@@ -1671,10 +1879,10 @@
@@ -1667,10 +1875,10 @@ limfield (struct line const *line, struc
'beginning' is the first character following the delimiting TAB.
Otherwise, leave PTR pointing at the first 'blank' character after
the preceding field. */
......@@ -3200,7 +3208,7 @@ diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
++ptr;
if (ptr < lim && (eword || echar))
++ptr;
@@ -1720,10 +1928,10 @@
@@ -1716,10 +1924,10 @@ limfield (struct line const *line, struc
*/
/* Make LIM point to the end of (one byte past) the current field. */
......@@ -3213,7 +3221,7 @@ diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
if (newlim)
lim = newlim;
}
@@ -1754,6 +1962,130 @@
@@ -1750,6 +1958,130 @@ limfield (struct line const *line, struc
return ptr;
}
......@@ -3344,7 +3352,7 @@ diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
/* Fill BUF reading from FP, moving buf->left bytes from the end
of buf->buf to the beginning first. If EOF is reached and the
file wasn't terminated by a newline, supply one. Set up BUF's line
@@ -1840,8 +2172,22 @@
@@ -1836,8 +2168,22 @@ fillbuf (struct buffer *buf, FILE *fp, c
else
{
if (key->skipsblanks)
......@@ -3369,7 +3377,7 @@ diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
line->keybeg = line_start;
}
}
@@ -1975,12 +2321,10 @@
@@ -1971,12 +2317,10 @@ find_unit_order (char const *number)
<none/unknown> < K/k < M < G < T < P < E < Z < Y */
static int
......@@ -3385,7 +3393,7 @@ diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
int diff = find_unit_order (a) - find_unit_order (b);
return (diff ? diff : strnumcmp (a, b, decimal_point, thousands_sep));
@@ -1991,7 +2335,7 @@
@@ -1987,7 +2331,7 @@ human_numcompare (char const *a, char co
hideously fast. */
static int
......@@ -3394,7 +3402,7 @@ diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
{
while (blanks[to_uchar (*a)])
a++;
@@ -2001,6 +2345,25 @@
@@ -1997,6 +2341,25 @@ numcompare (char const *a, char const *b
return strnumcmp (a, b, decimal_point, thousands_sep);
}
......@@ -3420,7 +3428,7 @@ diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
/* Work around a problem whereby the long double value returned by glibc's
strtold ("NaN", ...) contains uninitialized bits: clear all bytes of
A and B before calling strtold. FIXME: remove this function if
@@ -2051,7 +2414,7 @@
@@ -2047,7 +2410,7 @@ general_numcompare (char const *sa, char
Return 0 if the name in S is not recognized. */
static int
......@@ -3429,7 +3437,7 @@ diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
{
size_t lo = 0;
size_t hi = MONTHS_PER_YEAR;
@@ -2327,15 +2690,14 @@
@@ -2323,15 +2686,14 @@ debug_key (struct line const *line, stru
char saved = *lim;
*lim = '\0';
......@@ -3447,7 +3455,7 @@ diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
else if (key->general_numeric)
ignore_value (strtold (beg, &tighter_lim));
else if (key->numeric || key->human_numeric)
@@ -2469,7 +2831,7 @@
@@ -2465,7 +2827,7 @@ key_warnings (struct keyfield const *gke
/* Warn about significant leading blanks. */
bool implicit_skip = key_numeric (key) || key->month;
bool line_offset = key->eword == 0 && key->echar != 0; /* -k1.x,1.y */
......@@ -3456,7 +3464,7 @@ diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
&& ((!key->skipsblanks && !implicit_skip)
|| (!key->skipsblanks && key->schar)
|| (!key->skipeblanks && key->echar)))
@@ -2527,11 +2889,87 @@
@@ -2523,11 +2885,87 @@ key_warnings (struct keyfield const *gke
error (0, 0, _("option '-r' only applies to last-resort comparison"));
}
......@@ -3545,7 +3553,7 @@ diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
{
struct keyfield *key = keylist;
@@ -2616,7 +3054,7 @@
@@ -2612,7 +3050,7 @@ keycompare (struct line const *a, struct
else if (key->human_numeric)
diff = human_numcompare (ta, tb);
else if (key->month)
......@@ -3554,7 +3562,7 @@ diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
else if (key->random)
diff = compare_random (ta, tlena, tb, tlenb);
else if (key->version)
@@ -2732,6 +3170,211 @@
@@ -2728,6 +3166,211 @@ keycompare (struct line const *a, struct
return key->reverse ? -diff : diff;
}
......@@ -3766,7 +3774,7 @@ diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
/* Compare two lines A and B, returning negative, zero, or positive
depending on whether A compares less than, equal to, or greater than B. */
@@ -2759,7 +3402,7 @@
@@ -2755,7 +3398,7 @@ compare (struct line const *a, struct li
diff = - NONZERO (blen);
else if (blen == 0)
diff = 1;
......@@ -3775,7 +3783,7 @@ diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
{
/* xmemcoll0 is a performance enhancement as
it will not unconditionally write '\0' after the
@@ -4149,6 +4792,7 @@
@@ -4145,6 +4788,7 @@ set_ordering (char const *s, struct keyf
break;
case 'f':
key->translate = fold_toupper;
......@@ -3783,7 +3791,7 @@ diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
break;
case 'g':
key->general_numeric = true;
@@ -4228,7 +4872,7 @@
@@ -4224,7 +4868,7 @@ main (int argc, char **argv)
initialize_exit_failure (SORT_FAILURE);
hard_LC_COLLATE = hard_locale (LC_COLLATE);
......@@ -3792,7 +3800,7 @@ diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
hard_LC_TIME = hard_locale (LC_TIME);
#endif
@@ -4249,6 +4893,29 @@
@@ -4245,6 +4889,29 @@ main (int argc, char **argv)
thousands_sep = -1;
}
......@@ -3822,7 +3830,7 @@ diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
have_read_stdin = false;
inittables ();
@@ -4523,13 +5190,34 @@
@@ -4519,13 +5186,34 @@ main (int argc, char **argv)
case 't':
{
......@@ -3861,7 +3869,7 @@ diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
else
{
/* Provoke with 'sort -txx'. Complain about
@@ -4540,9 +5228,11 @@
@@ -4536,9 +5224,11 @@ main (int argc, char **argv)
quote (optarg));
}
}
......@@ -3875,7 +3883,7 @@ diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
}
break;
@@ -4771,12 +5461,10 @@
@@ -4767,12 +5457,10 @@ main (int argc, char **argv)
sort (files, nfiles, outfile, nthreads);
}
......@@ -3888,9 +3896,9 @@ diff -uNr coreutils-8.31/src/sort.c coreutils-8.31-i18n-1/src/sort.c
if (have_read_stdin && fclose (stdin) == EOF)
sort_die (_("close failed"), "-");
diff -uNr coreutils-8.31/src/unexpand.c coreutils-8.31-i18n-1/src/unexpand.c
--- coreutils-8.31/src/unexpand.c 2019-01-05 21:06:22.000000000 +1030
+++ coreutils-8.31-i18n-1/src/unexpand.c 2019-08-30 14:36:51.808486424 +0930
diff -Naurp coreutils-8.32.orig/src/unexpand.c coreutils-8.32/src/unexpand.c
--- coreutils-8.32.orig/src/unexpand.c 2020-01-01 22:13:12.000000000 +0800
+++ coreutils-8.32/src/unexpand.c 2020-03-08 12:10:27.738236560 +0800
@@ -38,6 +38,9 @@
#include <stdio.h>
#include <getopt.h>
......@@ -3901,7 +3909,7 @@ diff -uNr coreutils-8.31/src/unexpand.c coreutils-8.31-i18n-1/src/unexpand.c
#include "system.h"
#include "die.h"
#include "xstrndup.h"
@@ -107,24 +110,47 @@
@@ -107,24 +110,47 @@ unexpand (void)
{
/* Input stream. */
FILE *fp = next_file (NULL);
......@@ -3952,7 +3960,7 @@ diff -uNr coreutils-8.31/src/unexpand.c coreutils-8.31-i18n-1/src/unexpand.c
/* If true, perform translations. */
bool convert = true;
@@ -158,12 +184,44 @@
@@ -158,12 +184,44 @@ unexpand (void)
do
{
......@@ -3979,7 +3987,7 @@ diff -uNr coreutils-8.31/src/unexpand.c coreutils-8.31-i18n-1/src/unexpand.c
+ if(using_utf_locale==false && found_bom==true)
+ {
+ /*First file conatined BOM header - locale was switched to UTF
+ /*all subsequent files should contain BOM. */
+ *all subsequent files should contain BOM. */
+ error (EXIT_FAILURE, errno, _("combination of files with and without BOM header"));
+ }
+ }
......@@ -4000,7 +4008,7 @@ diff -uNr coreutils-8.31/src/unexpand.c coreutils-8.31-i18n-1/src/unexpand.c
if (blank)
{
@@ -180,16 +238,16 @@
@@ -180,16 +238,16 @@ unexpand (void)
if (next_tab_column < column)
die (EXIT_FAILURE, 0, _("input line is too long"));
......@@ -4020,7 +4028,7 @@ diff -uNr coreutils-8.31/src/unexpand.c coreutils-8.31-i18n-1/src/unexpand.c
if (! (prev_blank && column == next_tab_column))
{
@@ -197,13 +255,14 @@
@@ -197,13 +255,14 @@ unexpand (void)
will be replaced by tabs. */
if (column == next_tab_column)
one_blank_before_tab_stop = true;
......@@ -4037,7 +4045,7 @@ diff -uNr coreutils-8.31/src/unexpand.c coreutils-8.31-i18n-1/src/unexpand.c
}
/* Discard pending blanks, unless it was a single
@@ -211,7 +270,7 @@
@@ -211,7 +270,7 @@ unexpand (void)
pending = one_blank_before_tab_stop;
}
}
......@@ -4046,7 +4054,7 @@ diff -uNr coreutils-8.31/src/unexpand.c coreutils-8.31-i18n-1/src/unexpand.c
{
/* Go back one column, and force recalculation of the
next tab stop. */
@@ -219,9 +278,9 @@
@@ -219,9 +278,9 @@ unexpand (void)
next_tab_column = column;
tab_index -= !!tab_index;
}
......@@ -4058,7 +4066,7 @@ diff -uNr coreutils-8.31/src/unexpand.c coreutils-8.31-i18n-1/src/unexpand.c
if (!column)
die (EXIT_FAILURE, 0, _("input line is too long"));
}
@@ -229,8 +288,11 @@
@@ -229,8 +288,11 @@ unexpand (void)
if (pending)
{
if (pending > 1 && one_blank_before_tab_stop)
......@@ -4072,7 +4080,7 @@ diff -uNr coreutils-8.31/src/unexpand.c coreutils-8.31-i18n-1/src/unexpand.c
die (EXIT_FAILURE, errno, _("write error"));
pending = 0;
one_blank_before_tab_stop = false;
@@ -240,16 +302,17 @@
@@ -240,16 +302,17 @@ unexpand (void)
convert &= convert_entire_line || blank;
}
......@@ -4093,9 +4101,9 @@ diff -uNr coreutils-8.31/src/unexpand.c coreutils-8.31-i18n-1/src/unexpand.c
}
}
diff -uNr coreutils-8.31/src/uniq.c coreutils-8.31-i18n-1/src/uniq.c
--- coreutils-8.31/src/uniq.c 2019-01-05 21:06:22.000000000 +1030
+++ coreutils-8.31-i18n-1/src/uniq.c 2019-08-30 14:36:51.809486427 +0930
diff -Naurp coreutils-8.32.orig/src/uniq.c coreutils-8.32/src/uniq.c
--- coreutils-8.32.orig/src/uniq.c 2020-02-25 07:18:16.000000000 +0800
+++ coreutils-8.32/src/uniq.c 2020-03-08 12:10:35.436236531 +0800
@@ -21,6 +21,17 @@
#include <getopt.h>
#include <sys/types.h>
......@@ -4114,12 +4122,8 @@ diff -uNr coreutils-8.31/src/uniq.c coreutils-8.31-i18n-1/src/uniq.c
#include "system.h"
#include "argmatch.h"
#include "linebuffer.h"
@@ -32,9 +43,21 @@
#include "stdio--.h"
#include "xmemcoll.h"
#include "xstrtol.h"
-#include "memcasecmp.h"
+#include "xmemcoll.h"
@@ -33,6 +44,18 @@
#include "memcasecmp.h"
#include "quote.h"
+/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC
......@@ -4137,7 +4141,7 @@ diff -uNr coreutils-8.31/src/uniq.c coreutils-8.31-i18n-1/src/uniq.c
/* The official name of this program (e.g., no 'g' prefix). */
#define PROGRAM_NAME "uniq"
@@ -144,6 +167,10 @@
@@ -139,6 +162,10 @@ enum
GROUP_OPTION = CHAR_MAX + 1
};
......@@ -4148,7 +4152,7 @@ diff -uNr coreutils-8.31/src/uniq.c coreutils-8.31-i18n-1/src/uniq.c
static struct option const longopts[] =
{
{"count", no_argument, NULL, 'c'},
@@ -260,7 +287,7 @@
@@ -253,7 +280,7 @@ size_opt (char const *opt, char const *m
return a pointer to the beginning of the line's field to be compared. */
static char * _GL_ATTRIBUTE_PURE
......@@ -4157,7 +4161,7 @@ diff -uNr coreutils-8.31/src/uniq.c coreutils-8.31-i18n-1/src/uniq.c
{
size_t count;
char const *lp = line->buffer;
@@ -280,6 +307,83 @@
@@ -273,6 +300,83 @@ find_field (struct linebuffer const *lin
return line->buffer + i;
}
......@@ -4241,49 +4245,10 @@ diff -uNr coreutils-8.31/src/uniq.c coreutils-8.31-i18n-1/src/uniq.c
/* Return false if two strings OLD and NEW match, true if not.
OLD and NEW point not to the beginnings of the lines
but rather to the beginnings of the fields to compare.
@@ -288,6 +392,8 @@
static bool
different (char *old, char *new, size_t oldlen, size_t newlen)
{
+ char *copy_old, *copy_new;
+
if (check_chars < oldlen)
oldlen = check_chars;
if (check_chars < newlen)
@@ -295,14 +401,103 @@
if (ignore_case)
{
- /* FIXME: This should invoke strcoll somehow. */
- return oldlen != newlen || memcasecmp (old, new, oldlen);
+ size_t i;
+
+ copy_old = xmalloc (oldlen + 1);
+ copy_new = xmalloc (oldlen + 1);
+
+ for (i = 0; i < oldlen; i++)
+ {
+ copy_old[i] = toupper (old[i]);
+ copy_new[i] = toupper (new[i]);
+ }
+ bool rc = xmemcoll (copy_old, oldlen, copy_new, newlen);
+ free (copy_old);
+ free (copy_new);
+ return rc;
@@ -292,6 +396,79 @@ different (char *old, char *new, size_t
return oldlen != newlen || memcmp (old, new, oldlen);
}
- else if (hard_LC_COLLATE)
- return xmemcoll (old, oldlen, new, newlen) != 0;
else
- return oldlen != newlen || memcmp (old, new, oldlen);
+ {
+ copy_old = (char *)old;
+ copy_new = (char *)new;
+ }
+
+ return xmemcoll (copy_old, oldlen, copy_new, newlen);
+
+}
+
+#if HAVE_MBRTOWC
+static int
+different_multi (const char *old, const char *new, size_t oldlen, size_t newlen, mbstate_t oldstate, mbstate_t newstate)
......@@ -4349,17 +4314,18 @@ diff -uNr coreutils-8.31/src/uniq.c coreutils-8.31-i18n-1/src/uniq.c
+ copy[i][j] = '\0';
+ len[i] = j;
+ }
+ int rc = xmemcoll (copy[0], len[0], copy[1], len[1]);
+ int rc = len[0] != len[1] || memcmp(copy[0], copy[1], len[0]);
+ free (copy[0]);
+ free (copy[1]);
+ return rc;
+
}
+}
+#endif
+
/* Output the line in linebuffer LINE to standard output
provided that the switches say it should be output.
@@ -367,19 +562,38 @@
MATCH is true if the line matches the previous line.
@@ -355,19 +532,38 @@ check_file (const char *infile, const ch
char *prevfield IF_LINT ( = NULL);
size_t prevlen IF_LINT ( = 0);
bool first_group_printed = false;
......@@ -4398,7 +4364,7 @@ diff -uNr coreutils-8.31/src/uniq.c coreutils-8.31-i18n-1/src/uniq.c
new_group = (prevline->length == 0
|| different (thisfield, prevfield, thislen, prevlen));
@@ -397,6 +611,10 @@
@@ -385,6 +581,10 @@ check_file (const char *infile, const ch
SWAP_LINES (prevline, thisline);
prevfield = thisfield;
prevlen = thislen;
......@@ -4409,7 +4375,7 @@ diff -uNr coreutils-8.31/src/uniq.c coreutils-8.31-i18n-1/src/uniq.c
first_group_printed = true;
}
}
@@ -409,17 +627,26 @@
@@ -397,17 +597,26 @@ check_file (const char *infile, const ch
size_t prevlen;
uintmax_t match_count = 0;
bool first_delimiter = true;
......@@ -4436,7 +4402,7 @@ diff -uNr coreutils-8.31/src/uniq.c coreutils-8.31-i18n-1/src/uniq.c
if (readlinebuffer_delim (thisline, stdin, delimiter) == 0)
{
if (ferror (stdin))
@@ -428,6 +655,14 @@
@@ -416,6 +625,14 @@ check_file (const char *infile, const ch
}
thisfield = find_field (thisline);
thislen = thisline->length - 1 - (thisfield - thisline->buffer);
......@@ -4451,7 +4417,7 @@ diff -uNr coreutils-8.31/src/uniq.c coreutils-8.31-i18n-1/src/uniq.c
match = !different (thisfield, prevfield, thislen, prevlen);
match_count += match;
@@ -460,6 +695,9 @@
@@ -448,6 +665,9 @@ check_file (const char *infile, const ch
SWAP_LINES (prevline, thisline);
prevfield = thisfield;
prevlen = thislen;
......@@ -4461,7 +4427,7 @@ diff -uNr coreutils-8.31/src/uniq.c coreutils-8.31-i18n-1/src/uniq.c
if (!match)
match_count = 0;
}
@@ -506,6 +744,19 @@
@@ -493,6 +713,19 @@ main (int argc, char **argv)
atexit (close_stdout);
......@@ -4481,13 +4447,13 @@ diff -uNr coreutils-8.31/src/uniq.c coreutils-8.31-i18n-1/src/uniq.c
skip_chars = 0;
skip_fields = 0;
check_chars = SIZE_MAX;
diff -uNr coreutils-8.31/tests/expand/mb.sh coreutils-8.31-i18n-1/tests/expand/mb.sh
--- coreutils-8.31/tests/expand/mb.sh 1970-01-01 09:30:00.000000000 +0930
+++ coreutils-8.31-i18n-1/tests/expand/mb.sh 2019-08-30 14:36:51.809486427 +0930
diff -Naurp coreutils-8.32.orig/tests/expand/mb.sh coreutils-8.32/tests/expand/mb.sh
--- coreutils-8.32.orig/tests/expand/mb.sh 1970-01-01 08:00:00.000000000 +0800
+++ coreutils-8.32/tests/expand/mb.sh 2020-03-08 12:10:27.738236560 +0800
@@ -0,0 +1,183 @@
+#!/bin/sh
+
+# Copyright (C) 2012-2017 Free Software Foundation, Inc.
+# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
......@@ -4668,9 +4634,9 @@ diff -uNr coreutils-8.31/tests/expand/mb.sh coreutils-8.31-i18n-1/tests/expand/m
+compare exp out > /dev/null 2>&1 || fail=1
+
+exit $fail
diff -uNr coreutils-8.31/tests/i18n/sort.sh coreutils-8.31-i18n-1/tests/i18n/sort.sh
--- coreutils-8.31/tests/i18n/sort.sh 1970-01-01 09:30:00.000000000 +0930
+++ coreutils-8.31-i18n-1/tests/i18n/sort.sh 2019-08-30 14:36:51.809486427 +0930
diff -Naurp coreutils-8.32.orig/tests/i18n/sort.sh coreutils-8.32/tests/i18n/sort.sh
--- coreutils-8.32.orig/tests/i18n/sort.sh 1970-01-01 08:00:00.000000000 +0800
+++ coreutils-8.32/tests/i18n/sort.sh 2020-03-08 12:10:27.738236560 +0800
@@ -0,0 +1,29 @@
+#!/bin/sh
+# Verify sort's multi-byte support.
......@@ -4701,10 +4667,10 @@ diff -uNr coreutils-8.31/tests/i18n/sort.sh coreutils-8.31-i18n-1/tests/i18n/sor
+
+
+Exit $fail
diff -uNr coreutils-8.31/tests/local.mk coreutils-8.31-i18n-1/tests/local.mk
--- coreutils-8.31/tests/local.mk 2019-03-04 19:06:33.000000000 +1030
+++ coreutils-8.31-i18n-1/tests/local.mk 2019-08-30 14:36:51.809486427 +0930
@@ -368,6 +368,8 @@
diff -Naurp coreutils-8.32.orig/tests/local.mk coreutils-8.32/tests/local.mk
--- coreutils-8.32.orig/tests/local.mk 2020-03-02 07:25:03.000000000 +0800
+++ coreutils-8.32/tests/local.mk 2020-03-08 12:10:27.738236560 +0800
@@ -369,6 +369,8 @@ all_tests = \
tests/misc/sort-discrim.sh \
tests/misc/sort-files0-from.pl \
tests/misc/sort-float.sh \
......@@ -4713,7 +4679,7 @@ diff -uNr coreutils-8.31/tests/local.mk coreutils-8.31-i18n-1/tests/local.mk
tests/misc/sort-h-thousands-sep.sh \
tests/misc/sort-merge.pl \
tests/misc/sort-merge-fdlimit.sh \
@@ -564,6 +566,7 @@
@@ -567,6 +569,7 @@ all_tests = \
tests/du/threshold.sh \
tests/du/trailing-slash.sh \
tests/du/two-args.sh \
......@@ -4721,7 +4687,7 @@ diff -uNr coreutils-8.31/tests/local.mk coreutils-8.31-i18n-1/tests/local.mk
tests/id/gnu-zero-uids.sh \
tests/id/no-context.sh \
tests/id/context.sh \
@@ -709,6 +712,7 @@
@@ -714,6 +717,7 @@ all_tests = \
tests/touch/read-only.sh \
tests/touch/relative.sh \
tests/touch/trailing-slash.sh \
......@@ -4729,35 +4695,10 @@ diff -uNr coreutils-8.31/tests/local.mk coreutils-8.31-i18n-1/tests/local.mk
$(all_root_tests)
# See tests/factor/create-test.sh.
diff -uNr coreutils-8.31/tests/misc/cut.pl coreutils-8.31-i18n-1/tests/misc/cut.pl
--- coreutils-8.31/tests/misc/cut.pl 2019-01-05 21:06:22.000000000 +1030
+++ coreutils-8.31-i18n-1/tests/misc/cut.pl 2019-08-30 14:36:51.809486427 +0930
@@ -23,9 +23,11 @@
# Turn off localization of executable's output.
@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
-my $mb_locale = $ENV{LOCALE_FR_UTF8};
+my $mb_locale;
+# uncommented enable multibyte paths
+$mb_locale = $ENV{LOCALE_FR_UTF8};
! defined $mb_locale || $mb_locale eq 'none'
- and $mb_locale = 'C';
+ and $mb_locale = 'C';
my $prog = 'cut';
my $try = "Try '$prog --help' for more information.\n";
@@ -240,6 +242,7 @@
my @new_t = @$t;
my $test_name = shift @new_t;
+ next if ($test_name =~ "newline-[12][0-9]");
push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}];
}
push @Tests, @new;
diff -uNr coreutils-8.31/tests/misc/expand.pl coreutils-8.31-i18n-1/tests/misc/expand.pl
--- coreutils-8.31/tests/misc/expand.pl 2019-01-05 21:06:22.000000000 +1030
+++ coreutils-8.31-i18n-1/tests/misc/expand.pl 2019-08-30 14:36:51.810486429 +0930
@@ -27,6 +27,15 @@
diff -Naurp coreutils-8.32.orig/tests/misc/expand.pl coreutils-8.32/tests/misc/expand.pl
--- coreutils-8.32.orig/tests/misc/expand.pl 2020-01-01 22:13:13.000000000 +0800
+++ coreutils-8.32/tests/misc/expand.pl 2020-03-08 12:10:27.738236560 +0800
@@ -27,6 +27,15 @@ my $prog = 'expand';
# Turn off localization of executable's output.
@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
......@@ -4773,7 +4714,7 @@ diff -uNr coreutils-8.31/tests/misc/expand.pl coreutils-8.31-i18n-1/tests/misc/e
my @Tests =
(
['t1', '--tabs=3', {IN=>"a\tb"}, {OUT=>"a b"}],
@@ -168,6 +177,8 @@
@@ -168,6 +177,8 @@ my @Tests =
# Test errors
......@@ -4782,7 +4723,7 @@ diff -uNr coreutils-8.31/tests/misc/expand.pl coreutils-8.31-i18n-1/tests/misc/e
['e1', '--tabs="a"', {IN=>''}, {OUT=>''}, {EXIT=>1},
{ERR => "$prog: tab size contains invalid character(s): 'a'\n"}],
['e2', "-t $UINTMAX_OFLOW", {IN=>''}, {OUT=>''}, {EXIT=>1},
@@ -184,6 +195,37 @@
@@ -184,6 +195,37 @@ my @Tests =
{ERR => "$prog: '/' specifier not at start of number: '/'\n"}],
);
......@@ -4820,10 +4761,10 @@ diff -uNr coreutils-8.31/tests/misc/expand.pl coreutils-8.31-i18n-1/tests/misc/e
my $save_temps = $ENV{DEBUG};
my $verbose = $ENV{VERBOSE};
diff -uNr coreutils-8.31/tests/misc/fold.pl coreutils-8.31-i18n-1/tests/misc/fold.pl
--- coreutils-8.31/tests/misc/fold.pl 2019-01-05 21:06:22.000000000 +1030
+++ coreutils-8.31-i18n-1/tests/misc/fold.pl 2019-08-30 14:36:51.810486429 +0930
@@ -20,9 +20,18 @@
diff -Naurp coreutils-8.32.orig/tests/misc/fold.pl coreutils-8.32/tests/misc/fold.pl
--- coreutils-8.32.orig/tests/misc/fold.pl 2020-01-01 22:13:13.000000000 +0800
+++ coreutils-8.32/tests/misc/fold.pl 2020-03-08 12:10:27.738236560 +0800
@@ -20,9 +20,18 @@ use strict;
(my $program_name = $0) =~ s|.*/||;
......@@ -4842,7 +4783,7 @@ diff -uNr coreutils-8.31/tests/misc/fold.pl coreutils-8.31-i18n-1/tests/misc/fol
my @Tests =
(
['s1', '-w2 -s', {IN=>"a\t"}, {OUT=>"a\n\t"}],
@@ -31,9 +40,48 @@
@@ -31,9 +40,48 @@ my @Tests =
['s4', '-w4 -s', {IN=>"abc ef\n"}, {OUT=>"abc \nef\n"}],
);
......@@ -4892,10 +4833,10 @@ diff -uNr coreutils-8.31/tests/misc/fold.pl coreutils-8.31-i18n-1/tests/misc/fol
-my $prog = 'fold';
my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose);
exit $fail;
diff -uNr coreutils-8.31/tests/misc/join.pl coreutils-8.31-i18n-1/tests/misc/join.pl
--- coreutils-8.31/tests/misc/join.pl 2019-02-18 13:54:11.000000000 +1030
+++ coreutils-8.31-i18n-1/tests/misc/join.pl 2019-08-30 14:36:51.810486429 +0930
@@ -25,6 +25,15 @@
diff -Naurp coreutils-8.32.orig/tests/misc/join.pl coreutils-8.32/tests/misc/join.pl
--- coreutils-8.32.orig/tests/misc/join.pl 2020-01-01 22:13:13.000000000 +0800
+++ coreutils-8.32/tests/misc/join.pl 2020-03-08 12:10:27.738236560 +0800
@@ -25,6 +25,15 @@ my $limits = getlimits ();
my $prog = 'join';
......@@ -4911,7 +4852,7 @@ diff -uNr coreutils-8.31/tests/misc/join.pl coreutils-8.31-i18n-1/tests/misc/joi
my $delim = chr 0247;
sub t_subst ($)
{
@@ -333,8 +342,49 @@
@@ -333,8 +342,49 @@ foreach my $t (@tv)
push @Tests, $new_ent;
}
......@@ -4961,9 +4902,9 @@ diff -uNr coreutils-8.31/tests/misc/join.pl coreutils-8.31-i18n-1/tests/misc/joi
my $save_temps = $ENV{DEBUG};
my $verbose = $ENV{VERBOSE};
diff -uNr coreutils-8.31/tests/misc/sort-mb-tests.sh coreutils-8.31-i18n-1/tests/misc/sort-mb-tests.sh
--- coreutils-8.31/tests/misc/sort-mb-tests.sh 1970-01-01 09:30:00.000000000 +0930
+++ coreutils-8.31-i18n-1/tests/misc/sort-mb-tests.sh 2019-08-30 14:36:51.810486429 +0930
diff -Naurp coreutils-8.32.orig/tests/misc/sort-mb-tests.sh coreutils-8.32/tests/misc/sort-mb-tests.sh
--- coreutils-8.32.orig/tests/misc/sort-mb-tests.sh 1970-01-01 08:00:00.000000000 +0800
+++ coreutils-8.32/tests/misc/sort-mb-tests.sh 2020-03-08 12:10:27.739236560 +0800
@@ -0,0 +1,45 @@
+#!/bin/sh
+# Verify sort's multi-byte support.
......@@ -5010,10 +4951,10 @@ diff -uNr coreutils-8.31/tests/misc/sort-mb-tests.sh coreutils-8.31-i18n-1/tests
+compare exp out || { fail=1; cat out; }
+
+Exit $fail
diff -uNr coreutils-8.31/tests/misc/sort-merge.pl coreutils-8.31-i18n-1/tests/misc/sort-merge.pl
--- coreutils-8.31/tests/misc/sort-merge.pl 2019-01-05 21:06:22.000000000 +1030
+++ coreutils-8.31-i18n-1/tests/misc/sort-merge.pl 2019-08-30 14:36:51.810486429 +0930
@@ -26,6 +26,15 @@
diff -Naurp coreutils-8.32.orig/tests/misc/sort-merge.pl coreutils-8.32/tests/misc/sort-merge.pl
--- coreutils-8.32.orig/tests/misc/sort-merge.pl 2020-01-01 22:13:13.000000000 +0800
+++ coreutils-8.32/tests/misc/sort-merge.pl 2020-03-08 12:10:27.739236560 +0800
@@ -26,6 +26,15 @@ my $prog = 'sort';
# Turn off localization of executable's output.
@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
......@@ -5029,7 +4970,7 @@ diff -uNr coreutils-8.31/tests/misc/sort-merge.pl coreutils-8.31-i18n-1/tests/mi
# three empty files and one that says 'foo'
my @inputs = (+(map{{IN=> {"empty$_"=> ''}}}1..3), {IN=> {foo=> "foo\n"}});
@@ -77,6 +86,39 @@
@@ -77,6 +86,39 @@ my @Tests =
{OUT=>$big_input}],
);
......@@ -5069,10 +5010,10 @@ diff -uNr coreutils-8.31/tests/misc/sort-merge.pl coreutils-8.31-i18n-1/tests/mi
my $save_temps = $ENV{DEBUG};
my $verbose = $ENV{VERBOSE};
diff -uNr coreutils-8.31/tests/misc/sort.pl coreutils-8.31-i18n-1/tests/misc/sort.pl
--- coreutils-8.31/tests/misc/sort.pl 2019-01-05 21:06:22.000000000 +1030
+++ coreutils-8.31-i18n-1/tests/misc/sort.pl 2019-08-30 14:36:51.811486431 +0930
@@ -24,10 +24,15 @@
diff -Naurp coreutils-8.32.orig/tests/misc/sort.pl coreutils-8.32/tests/misc/sort.pl
--- coreutils-8.32.orig/tests/misc/sort.pl 2020-01-01 22:13:13.000000000 +0800
+++ coreutils-8.32/tests/misc/sort.pl 2020-03-08 12:10:27.739236560 +0800
@@ -24,10 +24,15 @@ my $prog = 'sort';
# Turn off localization of executable's output.
@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
......@@ -5089,7 +5030,7 @@ diff -uNr coreutils-8.31/tests/misc/sort.pl coreutils-8.31-i18n-1/tests/misc/sor
# Since each test is run with a file name and with redirected stdin,
# the name in the diagnostic is either the file name or "-".
# Normalize each diagnostic to use '-'.
@@ -423,6 +428,38 @@
@@ -423,6 +428,38 @@ foreach my $t (@Tests)
}
}
......@@ -5128,7 +5069,7 @@ diff -uNr coreutils-8.31/tests/misc/sort.pl coreutils-8.31-i18n-1/tests/misc/sor
@Tests = triple_test \@Tests;
# Remember that triple_test creates from each test with exactly one "IN"
@@ -432,6 +469,7 @@
@@ -432,6 +469,7 @@ foreach my $t (@Tests)
# Remove the IN_PIPE version of the "output-is-input" test above.
# The others aren't susceptible because they have three inputs each.
@Tests = grep {$_->[0] ne 'output-is-input.p'} @Tests;
......@@ -5136,10 +5077,10 @@ diff -uNr coreutils-8.31/tests/misc/sort.pl coreutils-8.31-i18n-1/tests/misc/sor
my $save_temps = $ENV{DEBUG};
my $verbose = $ENV{VERBOSE};
diff -uNr coreutils-8.31/tests/misc/unexpand.pl coreutils-8.31-i18n-1/tests/misc/unexpand.pl
--- coreutils-8.31/tests/misc/unexpand.pl 2019-01-05 21:06:22.000000000 +1030
+++ coreutils-8.31-i18n-1/tests/misc/unexpand.pl 2019-08-30 14:36:51.811486431 +0930
@@ -27,6 +27,14 @@
diff -Naurp coreutils-8.32.orig/tests/misc/unexpand.pl coreutils-8.32/tests/misc/unexpand.pl
--- coreutils-8.32.orig/tests/misc/unexpand.pl 2020-01-01 22:13:13.000000000 +0800
+++ coreutils-8.32/tests/misc/unexpand.pl 2020-03-08 12:10:27.739236560 +0800
@@ -27,6 +27,14 @@ my $limits = getlimits ();
my $prog = 'unexpand';
......@@ -5154,7 +5095,7 @@ diff -uNr coreutils-8.31/tests/misc/unexpand.pl coreutils-8.31-i18n-1/tests/misc
my @Tests =
(
['a1', {IN=> ' 'x 1 ."y\n"}, {OUT=> ' 'x 1 ."y\n"}],
@@ -128,6 +136,37 @@
@@ -128,6 +136,37 @@ my @Tests =
['ts2', '-t5,8', {IN=>"x\t \t y\n"}, {OUT=>"x\t\t y\n"}],
);
......@@ -5192,10 +5133,10 @@ diff -uNr coreutils-8.31/tests/misc/unexpand.pl coreutils-8.31-i18n-1/tests/misc
my $save_temps = $ENV{DEBUG};
my $verbose = $ENV{VERBOSE};
diff -uNr coreutils-8.31/tests/misc/uniq.pl coreutils-8.31-i18n-1/tests/misc/uniq.pl
--- coreutils-8.31/tests/misc/uniq.pl 2019-01-05 21:06:22.000000000 +1030
+++ coreutils-8.31-i18n-1/tests/misc/uniq.pl 2019-08-30 14:36:51.811486431 +0930
@@ -23,9 +23,17 @@
diff -Naurp coreutils-8.32.orig/tests/misc/uniq.pl coreutils-8.32/tests/misc/uniq.pl
--- coreutils-8.32.orig/tests/misc/uniq.pl 2020-01-01 22:13:13.000000000 +0800
+++ coreutils-8.32/tests/misc/uniq.pl 2020-03-08 12:10:27.739236560 +0800
@@ -23,9 +23,17 @@ my $limits = getlimits ();
my $prog = 'uniq';
my $try = "Try '$prog --help' for more information.\n";
......@@ -5213,7 +5154,7 @@ diff -uNr coreutils-8.31/tests/misc/uniq.pl coreutils-8.31-i18n-1/tests/misc/uni
# When possible, create a "-z"-testing variant of each test.
sub add_z_variants($)
{
@@ -262,6 +270,53 @@
@@ -262,6 +270,53 @@ foreach my $t (@Tests)
and push @$t, {ENV=>'_POSIX2_VERSION=199209'};
}
......@@ -5267,10 +5208,10 @@ diff -uNr coreutils-8.31/tests/misc/uniq.pl coreutils-8.31-i18n-1/tests/misc/uni
@Tests = add_z_variants \@Tests;
@Tests = triple_test \@Tests;
diff -uNr coreutils-8.31/tests/pr/pr-tests.pl coreutils-8.31-i18n-1/tests/pr/pr-tests.pl
--- coreutils-8.31/tests/pr/pr-tests.pl 2019-01-05 21:06:22.000000000 +1030
+++ coreutils-8.31-i18n-1/tests/pr/pr-tests.pl 2019-08-30 14:36:51.812486434 +0930
@@ -24,6 +24,15 @@
diff -Naurp coreutils-8.32.orig/tests/pr/pr-tests.pl coreutils-8.32/tests/pr/pr-tests.pl
--- coreutils-8.32.orig/tests/pr/pr-tests.pl 2020-01-01 22:13:13.000000000 +0800
+++ coreutils-8.32/tests/pr/pr-tests.pl 2020-03-08 12:10:27.739236560 +0800
@@ -24,6 +24,15 @@ use strict;
my $prog = 'pr';
my $normalize_strerror = "s/': .*/'/";
......@@ -5286,7 +5227,7 @@ diff -uNr coreutils-8.31/tests/pr/pr-tests.pl coreutils-8.31-i18n-1/tests/pr/pr-
my @tv = (
# -b option is no longer an official option. But it's still working to
@@ -474,8 +483,48 @@
@@ -474,8 +483,48 @@ push @Tests,
{IN=>{2=>"a\n"}},
{OUT=>"a\t\t\t\t \t\t\ta\n"} ];
......@@ -5335,13 +5276,13 @@ diff -uNr coreutils-8.31/tests/pr/pr-tests.pl coreutils-8.31-i18n-1/tests/pr/pr-
my $save_temps = $ENV{DEBUG};
my $verbose = $ENV{VERBOSE};
diff -uNr coreutils-8.31/tests/unexpand/mb.sh coreutils-8.31-i18n-1/tests/unexpand/mb.sh
--- coreutils-8.31/tests/unexpand/mb.sh 1970-01-01 09:30:00.000000000 +0930
+++ coreutils-8.31-i18n-1/tests/unexpand/mb.sh 2019-08-30 14:36:51.812486434 +0930
diff -Naurp coreutils-8.32.orig/tests/unexpand/mb.sh coreutils-8.32/tests/unexpand/mb.sh
--- coreutils-8.32.orig/tests/unexpand/mb.sh 1970-01-01 08:00:00.000000000 +0800
+++ coreutils-8.32/tests/unexpand/mb.sh 2020-03-08 12:10:27.739236560 +0800
@@ -0,0 +1,172 @@
+#!/bin/sh
+
+# Copyright (C) 2012-2017 Free Software Foundation, Inc.
+# Copyright (C) 2012-2015 Free Software Foundation, Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
......
coreutils-8.31-noman.patch → coreutils-8.32-noman.patch
View file @ b06d2885
diff -uNr coreutils-8.31/Makefile.in coreutils-8.31-noman/Makefile.in
--- coreutils-8.31/Makefile.in 2019-03-11 10:37:54.000000000 +1030
+++ coreutils-8.31-noman/Makefile.in 2019-08-30 14:34:35.919174733 +0930
@@ -2907,7 +2907,7 @@
diff -uNr coreutils-8.32/Makefile.in coreutils-8.32-noman/Makefile.in
--- coreutils-8.32/Makefile.in 2020-03-06 00:33:51.000000000 +1030
+++ coreutils-8.32-noman/Makefile.in 2020-07-02 16:06:08.290547172 +0930
@@ -3413,7 +3413,7 @@
$(top_srcdir)/build-aux/texinfo.tex \
$(top_srcdir)/build-aux/ylwrap $(top_srcdir)/doc/local.mk \
$(top_srcdir)/lib/alloca.c $(top_srcdir)/lib/config.hin \
......@@ -10,7 +10,7 @@ diff -uNr coreutils-8.31/Makefile.in coreutils-8.31-noman/Makefile.in
$(top_srcdir)/src/local.mk $(top_srcdir)/src/single-binary.mk \
$(top_srcdir)/tests/local.mk ABOUT-NLS AUTHORS COPYING \
ChangeLog INSTALL NEWS README THANKS TODO build-aux/ar-lib \
@@ -3009,7 +3009,6 @@
@@ -3516,7 +3516,6 @@
EOVERFLOW_VALUE = @EOVERFLOW_VALUE@
ERRNO_H = @ERRNO_H@
EXEEXT = @EXEEXT@
......@@ -18,7 +18,7 @@ diff -uNr coreutils-8.31/Makefile.in coreutils-8.31-noman/Makefile.in
FLOAT_H = @FLOAT_H@
FNMATCH_H = @FNMATCH_H@
GETADDRINFO_LIB = @GETADDRINFO_LIB@
@@ -4316,7 +4315,6 @@
@@ -4961,7 +4960,6 @@
lispdir = @lispdir@
localedir = @localedir@
localstatedir = @localstatedir@
......@@ -26,9 +26,9 @@ diff -uNr coreutils-8.31/Makefile.in coreutils-8.31-noman/Makefile.in
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -4510,9 +4508,8 @@
lib/xgetcwd.h lib/xnanosleep.h lib/xreadlink.h lib/xstrtod.h \
lib/xstrtol.h lib/xstrtod.c lib/xstrtod.h lib/xalloc.h \
@@ -5172,9 +5170,8 @@
lib/xreadlink.h lib/xstrtod.h lib/xstrtol.h \
lib/xstrtol-error.h lib/xstrtod.c lib/xstrtod.h lib/xalloc.h \
lib/yesno.h src/dcgen src/dircolors.hin src/primes.h \
- src/tac-pipe.c src/extract-magic man/help2man man/dummy-man \
- $(man1_MANS) $(man1_MANS:.1=.x) $(EXTRA_MANS) \
......@@ -38,17 +38,16 @@ diff -uNr coreutils-8.31/Makefile.in coreutils-8.31-noman/Makefile.in
tests/CuSkip.pm tests/CuTmpdir.pm tests/d_type-check \
tests/envvar-check tests/factor/run.sh \
tests/factor/create-test.sh tests/filefrag-extent-compare \
@@ -4570,8 +4567,7 @@
MAINTAINERCLEANFILES = THANKS-to-translators lib/iconv_open-aix.h \
@@ -5234,7 +5231,7 @@
lib/iconv_open-hpux.h lib/iconv_open-irix.h \
lib/iconv_open-osf.h lib/iconv_open-solaris.h \
- lib/parse-datetime.c $(BUILT_SOURCES) doc/constants.texi \
- $(ALL_MANS)
+ lib/parse-datetime.c $(BUILT_SOURCES) doc/constants.texi
lib/iconv_open-zos.h lib/parse-datetime.c $(BUILT_SOURCES) \
- doc/constants.texi $(ALL_MANS)
+ doc/constants.texi
# Sort in traditional ASCII order, regardless of the current locale;
# otherwise we may get into trouble with distinct strings that the
@@ -5494,19 +5490,6 @@
@@ -6165,19 +6162,6 @@
} \
END {$$m and (warn "$@: do not use upper case in \@var{...}\n"), exit 1}'
......@@ -68,7 +67,7 @@ diff -uNr coreutils-8.31/Makefile.in coreutils-8.31-noman/Makefile.in
# Indirections required so that we'll still be able to know the
# complete list of our tests even if the user overrides TESTS
# from the command line (as permitted by the test harness API).
@@ -6351,10 +6334,10 @@
@@ -7027,10 +7011,10 @@
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
......@@ -81,16 +80,16 @@ diff -uNr coreutils-8.31/Makefile.in coreutils-8.31-noman/Makefile.in
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -6376,7 +6359,7 @@
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
@@ -7052,7 +7036,7 @@
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
esac;
-$(top_srcdir)/lib/local.mk $(srcdir)/lib/gnulib.mk $(top_srcdir)/src/local.mk $(srcdir)/src/cu-progs.mk $(top_srcdir)/src/single-binary.mk $(top_srcdir)/doc/local.mk $(top_srcdir)/man/local.mk $(top_srcdir)/tests/local.mk $(am__empty):
+$(top_srcdir)/lib/local.mk $(srcdir)/lib/gnulib.mk $(top_srcdir)/src/local.mk $(srcdir)/src/cu-progs.mk $(top_srcdir)/src/single-binary.mk $(top_srcdir)/doc/local.mk $(top_srcdir)/tests/local.mk $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -15181,151 +15164,6 @@
@@ -17510,151 +17494,6 @@
check-local: check-texinfo
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment