From faba9a39bc2f2f2b4db7dc38f72dd57ab1c0a9d7 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 6 Nov 2004 23:47:13 +0000 Subject: * src/sort.c: Avoid some silly merges. --- ChangeLog | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7c5f30dd0..d064b6435 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,14 +1,23 @@ -2004-11-06 Jim Meyering +2004-11-06 Paul Eggert * 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 + * src/sort.c (xfclose): Don't close stdout here (just flush it), since close_stdout now closes stdout unconditionally. 2004-11-05 Paul Eggert * 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, -- cgit v1.2.3-54-g00ecf