PublicArchive/gnu-coreutils
2
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils synced 2026-06-05 07:12:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

* src/sort.c: Avoid some silly merges.

Browse Source
This commit is contained in:
Paul Eggert
2004-11-06 23:47:13 +00:00
parent a31bc04af0
commit faba9a39bc
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+11 -2
View File
@@ -1,14 +1,23 @@
2004-11-06 Jim Meyering <jim@meyering.net>
2004-11-06 Paul Eggert <eggert@cs.ucla.edu>
* Version 5.3.0.
* src/sort.c (first_same_file): Remove. Move most of the code to....
(avoid_trashing_input): New function.
(merge): Avoid some silly merges, e.g., copying a single file to
a temporary file when there are exactly 17 input files to merge.
Take a count of temporary files rather than a max_merge arg.
All uses changed.
2004-11-06 Jim Meyering <jim@meyering.net>
* src/sort.c (xfclose): Don't close stdout here (just flush it),
since close_stdout now closes stdout unconditionally.
2004-11-05 Paul Eggert <eggert@cs.ucla.edu>
* src/sort.c (inittables, sort_buffer_size, getmonth, mergefps,
first_same_file, merge, sort, main): Use size_t for indexes into arrays.
first_same_file, merge, sort, main): Use size_t for indexes to arrays.
This fixes some unlikely havoc-wreaking bugs (e.g., more than INT_MAX
temporary files).
(getmonth, keycompare, compare): Rewrite to avoid need for alloca,