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

sort -R fix for non-C locales(#249315)

Browse Source
This commit is contained in:
Ondrej Vasik 2007-10-29 16:12:27 +00:00
parent 96aa3c3d90
commit 182f35ee21
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
coreutils-i18n.patch
View File

@ -2196,7 +2196,7 @@
{ {
struct keyfield const *key = keylist; struct keyfield const *key = keylist;
@@ -1875,6 +2265,177 @@ @@ -1875,6 +2265,179 @@
return key->reverse ? -diff : diff; return key->reverse ? -diff : diff;
} }
@ -2232,7 +2232,9 @@
+ size_t lenb = limb <= textb ? 0 : limb - textb; + size_t lenb = limb <= textb ? 0 : limb - textb;
+ +
+ /* Actually compare the fields. */ + /* Actually compare the fields. */
+ if (key->numeric | key->general_numeric) + if (key->random)
+ diff = compare_random (texta, lena, textb, lenb);
+ else if (key->numeric | key->general_numeric)
+ { + {
+ char savea = *lima, saveb = *limb; + char savea = *lima, saveb = *limb;
+ +
@ -2373,7 +2375,7 @@
+ +
/* Compare two lines A and B, returning negative, zero, or positive /* Compare two lines A and B, returning negative, zero, or positive
depending on whether A compares less than, equal to, or greater than B. */ depending on whether A compares less than, equal to, or greater than B. */
@@ -2744,7 +3305,7 @@ @@ -2744,7 +3305,7 @@
initialize_exit_failure (SORT_FAILURE); initialize_exit_failure (SORT_FAILURE);

6
coreutils.spec
View File

@ -1,7 +1,7 @@
Summary: The GNU core utilities: a set of tools commonly used in shell scripts Summary: The GNU core utilities: a set of tools commonly used in shell scripts
Name: coreutils Name: coreutils
Version: 6.9 Version: 6.9
Release: 9%{?dist} Release: 10%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Base Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/ Url: http://www.gnu.org/software/coreutils/
@ -282,6 +282,10 @@ fi
/sbin/runuser /sbin/runuser
%changelog %changelog
* Mon Oct 29 2007 Ondrej Vasik <ovasik@redhat.com> - 6.9-10
- modified coreutils-i18n.patch because of sort -R in
a non C locales(fix by Andreas Schwab) (#249315)
* Mon Oct 29 2007 Ondrej Vasik <ovasik@redhat.com> - 6.9-9 * Mon Oct 29 2007 Ondrej Vasik <ovasik@redhat.com> - 6.9-9
- applied upstream patch for runuser to coreutils-selinux.patch(#232652) - applied upstream patch for runuser to coreutils-selinux.patch(#232652)
- License tag to GPLv2+ - License tag to GPLv2+