rpms/coreutils
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Adjust the i18n patch for coreutils-8.25

Browse Source
This commit is contained in:
Ondrej Oprala 2016-01-21 16:46:39 +01:00
parent eccec8ba45
commit ab00e1ea64
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
coreutils-i18n.patch
View File

@ -562,7 +562,7 @@ diff -urNp coreutils-8.24-orig/src/join.c coreutils-8.24/src/join.c
+ } + }
+ mblength = (mblength < 1) ? 1 : mblength; + mblength = (mblength < 1) ? 1 : mblength;
+ +
+ if (!iswblank(wc)) + if (!iswblank(wc) && wc != '\n')
+ break; + break;
+ ptr += mblength; + ptr += mblength;
+ } + }
@ -593,7 +593,7 @@ diff -urNp coreutils-8.24-orig/src/join.c coreutils-8.24/src/join.c
+ } + }
+ mblength = (mblength < 1) ? 1 : mblength; + mblength = (mblength < 1) ? 1 : mblength;
+ +
+ if (iswblank (wc)) + if (iswblank (wc) || wc == '\n')
+ break; + break;
+ +
+ sep += mblength; + sep += mblength;
@ -626,7 +626,7 @@ diff -urNp coreutils-8.24-orig/src/join.c coreutils-8.24/src/join.c
+ } + }
+ mblength = (mblength < 1) ? 1 : mblength; + mblength = (mblength < 1) ? 1 : mblength;
+ +
+ if (!iswblank (wc)) + if (!iswblank (wc) && wc != '\n')
+ break; + break;
+ +
+ ptr += mblength; + ptr += mblength;
@ -1799,7 +1799,7 @@ diff -urNp coreutils-8.24-orig/src/sort.c coreutils-8.24/src/sort.c
+ } + }
+ +
+ *length = (mblength < 1) ? 1 : mblength; + *length = (mblength < 1) ? 1 : mblength;
+ return iswblank (wc); + return iswblank (wc) || wc == '\n';
+} +}
+#endif +#endif
+ +
@ -2685,6 +2685,19 @@ diff -urNp coreutils-8.24-orig/src/sort.c coreutils-8.24/src/sort.c
} }
break; break;
@@ -5444,12 +5444,10 @@ main (int argc, char **argv)
sort (files, nfiles, outfile, nthreads);
}
-#ifdef lint
if (files_from)
readtokens0_free (&tok);
else
free (files);
-#endif
if (have_read_stdin && fclose (stdin) == EOF)
die (_("close failed"), "-");
diff -urNp coreutils-8.24-orig/src/uniq.c coreutils-8.24/src/uniq.c diff -urNp coreutils-8.24-orig/src/uniq.c coreutils-8.24/src/uniq.c
--- coreutils-8.24-orig/src/uniq.c 2015-06-26 19:04:19.000000000 +0200 --- coreutils-8.24-orig/src/uniq.c 2015-06-26 19:04:19.000000000 +0200
+++ coreutils-8.24/src/uniq.c 2015-07-05 09:04:33.032546980 +0200 +++ coreutils-8.24/src/uniq.c 2015-07-05 09:04:33.032546980 +0200
@ -2799,7 +2812,7 @@ diff -urNp coreutils-8.24-orig/src/uniq.c coreutils-8.24/src/uniq.c
+ { + {
+ MBCHAR_TO_WCHAR (wc, mblength, lp, pos, size, statep, convfail); + MBCHAR_TO_WCHAR (wc, mblength, lp, pos, size, statep, convfail);
+ +
+ if (convfail || !iswblank (wc)) + if (convfail || !(iswblank (wc) || wc == '\n'))
+ { + {
+ pos += mblength; + pos += mblength;
+ break; + break;
@ -2811,7 +2824,7 @@ diff -urNp coreutils-8.24-orig/src/uniq.c coreutils-8.24/src/uniq.c
+ { + {
+ MBCHAR_TO_WCHAR (wc, mblength, lp, pos, size, statep, convfail); + MBCHAR_TO_WCHAR (wc, mblength, lp, pos, size, statep, convfail);
+ +
+ if (!convfail && iswblank (wc)) + if (!convfail && (iswblank (wc) || wc == '\n'))
+ break; + break;
+ +
+ pos += mblength; + pos += mblength;

5
coreutils.spec
View File

@ -1,7 +1,7 @@
Summary: A set of basic GNU tools commonly used in shell scripts Summary: A set of basic GNU tools commonly used in shell scripts
Name: coreutils Name: coreutils
Version: 8.25 Version: 8.25
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv3+ License: GPLv3+
Group: System Environment/Base Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/ Url: http://www.gnu.org/software/coreutils/
@ -346,6 +346,9 @@ fi
%license COPYING %license COPYING
%changelog %changelog
* Thu Jan 21 2016 Ondrej Vasik <ovasik@redhat.com> - 8.25-2
- Adjust the i18n patch for coreutils-8.25
* Wed Jan 20 2016 Ondrej Vasik <ovasik@redhat.com> - 8.25-1 * Wed Jan 20 2016 Ondrej Vasik <ovasik@redhat.com> - 8.25-1
- new upstream release(#1300282) - new upstream release(#1300282)