Fix sorting by non-first field (#1003544)
This commit is contained in:
parent
31d3fdd040
commit
9b303ebcee
@ -3233,12 +3233,12 @@ diff -urNp coreutils-8.22-orig/src/sort.c coreutils-8.22/src/sort.c
|
||||
+ diff = - NONZERO (lenb);
|
||||
+ else if (lenb == 0)
|
||||
+ diff = 1;
|
||||
+ else if (hard_LC_COLLATE && !folding)
|
||||
+ {
|
||||
+ diff = xmemcoll0 (texta, lena, textb, lenb);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ diff = memcmp (texta, textb, MIN (lena,lenb));
|
||||
+ if (!diff)
|
||||
+ diff = xmemcoll (texta, lena, textb, lenb);
|
||||
+ }
|
||||
+ diff = memcmp (texta, textb, MIN (lena + 1,lenb + 1));
|
||||
+
|
||||
+ if (ignore || translate)
|
||||
+ free (texta);
|
||||
|
@ -1,7 +1,7 @@
|
||||
Summary: A set of basic GNU tools commonly used in shell scripts
|
||||
Name: coreutils
|
||||
Version: 8.22
|
||||
Release: 6%{?dist}
|
||||
Release: 7%{?dist}
|
||||
License: GPLv3+
|
||||
Group: System Environment/Base
|
||||
Url: http://www.gnu.org/software/coreutils/
|
||||
@ -372,6 +372,9 @@ fi
|
||||
%{_sbindir}/chroot
|
||||
|
||||
%changelog
|
||||
* Mon Jan 06 2014 Ondrej Oprala <ooprala@redhat.com> 8.22-7
|
||||
- Fix sorting by non-first field (#1003544)
|
||||
|
||||
* Fri Jan 03 2014 Ondrej Vasik <ovasik@redhat.com> 8.22-6
|
||||
- do not modify SELinux contexts of existing parent
|
||||
directories when copying files (fix by P.Brady, #1045122)
|
||||
|
Loading…
Reference in New Issue
Block a user