* NEWS: sort now uses a --compress-program option rather than

an environment variable.
* doc/coreutils.texi (sort invocation): Document this.
* src/sort.c (usage): Likewise.
(COMPRESS_PROGRAM_OPTION): New const.
(long_options, create_temp, main): Support new option.
* tests/misc/sort-compress: Test it.

1 files changed, 17 insertions, 14 deletions

diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index f738d8399..1a2dba43e 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -3467,20 +3467,6 @@ value as the directory for temporary files instead of @file{/tmp}.  The
 @option{--temporary-directory} (@option{-T}) option in turn overrides
 the environment variable.
 
-@vindex GNUSORT_COMPRESSOR
-To improve performance when sorting very large files, GNU sort will,
-by default, try to compress temporary files with the program
-@file{gzip}.  The environment variable @env{GNUSORT_COMPRESSOR} can be
-set to the name of another program to be used.  The program specified
-must compress standard input to standard output when no arguments are
-given to it, and it must decompress standard input to standard output
-when the @option{-d} argument is given to it.  If the program exits
-with nonzero status, sort will terminate with an error.  To disable
-compression of temporary files, set the variable to the empty string.
-Whitespace and the backslash character should not appear in the
-program name.  They are reserved for future use.
-
-
 The following options affect the ordering of output lines.  They may be
 specified globally or as part of a specific key field.  If no key
 fields are specified, global options apply to comparison of entire
@@ -3647,6 +3633,23 @@ Other options are:
 
 @table @samp
 
+@item --compress-program=@var{prog}
+If @var{prog} is not the empty string, compress any temporary files
+with the program @var{prog} rather than with the default compression
+method.  The default is currently @command{gzip} but this may change.
+
+With no arguments, @var{prog} must compress standard input to standard
+output, and when given the @option{-d} option it must decompress
+standard input to standard output.
+
+Terminate with an error if @var{prog} exits with nonzero status.
+
+Whitespace and the backslash character should not appear in
+@var{prog}; they are reserved for future use.
+
+If @var{prog} is the empty string, do not compress temporary
+files.
+
 @item -k @var{pos1}[,@var{pos2}]
 @itemx --key=@var{pos1}[,@var{pos2}]
 @opindex -k