coreutils/src/sort.c, branch v8.5Mirror of https://https.git.savannah.gnu.org/git/coreutils.git/
https://git.shady.money/coreutils/atom?h=v8.52010-04-20T21:37:18Zsort: fix parsing of end field in obsolescent key formats2010-04-20T21:37:18ZPádraig BradyP@draigBrady.com2010-04-20T15:25:55Zurn:sha1:8fc12909f649fbe75eb84c48ace554ae3e4e6c06
This regression was introduced in commit 224a69b5, 2009-02-24,
"sort: Fix two bugs with determining the end of field".
The specific regression being that we include 1 field too many when
an end field is specified using obsolescent key syntax (+POS -POS).
* src/sort.c (struct keyfield): Clarify the description of the eword
member, as suggested by Alan Curry.
(main): When processing obsolescent format key specifications,
normalize eword to a zero based count when no specific end char is given
for an end field. This matches what's done when keys are specified with -k.
* tests/misc/sort: Add a few more tests for the obsolescent key formats,
with test 07i being the particular failure addressed by this change.
* THANKS: Add Alan Curry who precisely identified the issue.
* NEWS: Mention the fix.
Reported by Santiago Rodríguez
maint: add a space before open-paren, where lacking2010-03-17T17:28:28ZJim Meyeringmeyering@redhat.com2010-03-17T17:27:52Zurn:sha1:46e01372773a9ca265009ca085a28aea313a3d73
* src/copy.c (copy_reg): Likewise.
* src/cut.c (main): Likewise.
* src/dd.c (main): Likewise.
* src/getlimits.c (print_int): Likewise.
* src/join.c (join): Likewise.
* src/pwd.c (logical_getcwd): Likewise.
* src/sort.c (specify_nmerge, mergefps, avoid_trashing_input): Likewise.
(merge): Likewise.
* src/uptime.c (usage): Likewise.
maint: rename the si_present variable in sort to iec_present2010-03-04T10:54:21ZPádraig BradyP@draigBrady.com2010-03-04T10:54:21Zurn:sha1:a7b4fa01ddde3f09eb642cb6378e16522917f8e0
* src/sort.c: The units containing 'i' are actually IEC not SI.
sort: inform the system about our input access pattern2010-03-04T10:42:00ZJoey Deggesjdegges@gmail.com2010-03-01T10:26:22Zurn:sha1:dae35bac98520c1402d29c60df11a2993889ec85
Tell the system that we'll access input sequentially,
so that we more efficiently process uncached files in a few cases:
Reading from faster flash devices. E.g. 21 MB/s key:
NORMAL 31.6s (26.8 user)
SEQUENTIAL 27.7s
WILLNEED 27.7s
Processing in parallel with readahead when using a small 1M buffer:
NORMAL 24.7s (21.1 user)
SEQUENTIAL 22.7s
WILLNEED 25.6s
A small benefit when merging:
NORMAL 25.0s (16.9 user)
SEQUENTIAL 24.6s (16.6 user)
WILLNEED 38.4s (13.1 user)
Note WILLNEED is presented above for comparison to show it
has some unwanted characteristics due to its synchronous
prepopulation of the cache. It has a good benefit on a
mechanical disk @ 80MB/s and a multicore system with
competing processes:
NORMAL 14.73s
SEQUENTIAL 10.95s
WILLNEED 05.22s
However the scheduling differences causing this result
are probably best explicitly managed using `nice` etc.
* m4/jm-macros.m4 (coreutils_MACROS): check for posix_fadvise().
* src/sort.c (fadvise_input): A new function to apply
the POSIX_FADV_SEQUENTIAL hint to an input stream.
(stream_open): Call the above function for all input streams.
sort: fix issues with month sorting in some locales2010-03-01T10:58:02ZPádraig BradyP@draigBrady.com2010-02-26T15:33:16Zurn:sha1:59e2e55d0f154a388adc9bac37d2b45f2ba971f8
* src/sort.c (char fold_toupper[]): Change to unsigned
so as the correct comparisons are made in getmonth().
This fixes unibyte locales where abbreviated months
have characters that are > 0x7F, but it also works for
multibyte locales with the caveat that multibyte characters
are matched case sensitively.
With this change, the following example sorts correctly:
$ echo -e "1 márta\n2 Feabhra" | LANG=ga_IE.utf8 sort -k2,2M
2 Feabhra
1 márta
* src/sort.c (inittables): Since we ignore blanks around months
in the input, don't include them when they're present in the locale.
With this change, the following example sorts correctly:
$ echo -e "1 2月\n2 1月" | LANG=ja_JP.utf8 sort -k2,2M
2 1月
1 2月
* tests/misc/sort-month: A new test to exercise the above cases.
* tests/Makefile.am: Reference the new test.
* NEWS: Mention the fix.
maint: update all FSF copyright year lists to include 20102010-01-01T13:06:47ZJim Meyeringmeyering@redhat.com2010-01-01T09:56:28Zurn:sha1:1aa17dc89b3f313697661541adca0aa0defbdc09
Use this command:
git ls-files | grep -v COPYING \
| xargs env UPDATE_COPYRIGHT_USE_INTERVALS=1 \
build-aux/update-copyright
sort: fix failure if sort's parent has ignored SIGCHLD2009-12-08T15:29:27ZPádraig BradyP@draigBrady.com2009-12-08T08:48:34Zurn:sha1:f5a97b8269f11f63cf05cca1f31a08dc7567aeb9
* src/sort.c (main): Reset the SIGCHLD handler to the default
as otherwise wait() could return an error.
* tests/misc/sort-compress: Set the CHLD handler in a subshell
to SIG_IGN to ensure the sort command resets it to SIG_DFL.
* NEWS: Mention the fix.
build: fix link failure on cygwin2009-11-24T13:36:07ZEric Blakeebb9@byu.net2009-11-23T21:59:18Zurn:sha1:f9d0bb8481bed4cea5994ed8aae49fcf52c0e604
Cygwin 1.5 has a broken sleep, and the gnulib tests dragged in
rpl_sleep which then caused a link failure because it wasn't in
libcoreutils.a. We could solve it by using the gnulib sleep module.
However, sleep and usleep may interact poorly with SIGALRM, and they
have less granularity; so it is better to adopt a policy that if we
must sleep, prefer xnanosleep.
* src/sort.c (pipe_fork): Use xnanosleep, to avoid the need for
rpl_sleep on cygwin, and to reduce granularity.
(MAX_FORK_TRIES_COMPRESS, MAX_FORK_TRIES_DECOMPRESS): Increase,
to account for reduction in granularity.
* src/tail.c (tail_file): Use xnanosleep in debug code.
* cfg.mk (sc_prohibit_sleep): New rule.
maint: Use logical rather than bitwise operators on bools2009-09-23T13:33:40ZPádraig BradyP@draigBrady.com2009-09-23T09:10:51Zurn:sha1:a037e838e15c9a698f1634398e0fe2726398d575
This is because bitwise operators are:
- confusing and inconsistent in a boolean context
- non short circuiting
- brittle in C89 where bool can be an int (so > 1)
doc: mention the texinfo documentation in --help2009-09-21T11:37:57ZPádraig BradyP@draigBrady.com2009-09-18T22:06:21Zurn:sha1:5d4f09d83a7c69110b4db97443759e9046c149e1
* src/system.h: Rename emit_bug_reporting_address() to
emit_ancillary_info() and update it to not print the translation
project address in en_* locales, and _do_ print it in the 'C'
(and other) locales so that it's included in the default man page.
Also mention how to invoke the texinfo documentation for each command.
Also move the "hard-locale.h" include to the 8 files that now use it.
* man/help2man: Strip the newly added texinfo reference from the
--help output as a more verbose version is already added by help2man.
Suggestion from C de-Avillez