*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 2e37d0a1d765df7dc68c6fe5c2f7385068a3fa86..679b7f0babb6b0a2d1945ed3f763c7175e931727 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-09-04  Paul Eggert  <eggert@twinsun.com>
+
+       Don't ignore -S if input is a pipe.  Bug report by Michael McFarland in
+       <http://mail.gnu.org/archive/html/bug-coreutils/2003-09/msg00008.html>.
+
+       * src/sort.c (sort_buffer_size): Omit SIZE_BOUND arg.  Compute the
+       size_bound ourselves. if an input file is a pipe and the user
+       specified a size, use that size instead of trying to guess the
+       pipe size.  This has the beneficial side effect of avoiding the
+       overhead of default_sort_size in that case.  All callers changed.
+       (sort): Remove static var size; now done by sort_buffer_size.
+
 2003-09-05  Jim Meyering  <jim@meyering.net>
 
        * Version 5.0.91.

diff --git a/THANKS b/THANKS
index ae8ed1ea918e67d66ed5e2b6dfb6b837c04ee284..4f50e3b0309e0e04f704b357f2f0f1f593605853 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -287,6 +287,7 @@ Michael Gaughen                     mgaughen@polyserve.com
 Michael Hasselberg                  mikelh@zonta.ping.de
 Michael Hohn                        hohn@math.utah.edu
 Michael J. Croghan                  mcroghan@usatoday.com
+Michael McFarland                   sidlon@yahoo.com
 Michael Piefel                      piefel@informatik.hu-berlin.de
 Michael Steffens                    michael.steffens@s.netic.de
 Michael Stone                       mstone@debian.org