Removed support for zip from sendfiles. I added it as part of the

sendfiles rewrite, f8baa5a34335fc0fc8ccabfabc601d0af73ab769, a few
weeks ago.  But because sendfiles fed zip from standard input, zip
would use Zip64 extensions.  That would require unzip 6.0 or later
to extract, according to the zip man page.  But current MacOS X
uses unzip 5.52, so it broke there.

diff --git a/etc/sendfiles b/etc/sendfiles
index b3f49716fe25557d55ad7f7b71bbe0524b88896b..99c170e0095577ae9e4a01844cbe631c20795a62 100755 (executable)
--- a/etc/sendfiles
+++ b/etc/sendfiles
@@ -12,7 +12,7 @@ usage='Usage: sendfiles [switches] -to recipient -subject subject '"\
   or
        sendfiles [switches] recipient subject file1 [file2 ...]
   switches are:
-  -compress [bzip2 | compress | gzip | lzma | none | zip]
+  -compress [bzip2 | compress | gzip | lzma | none]
   -from <sender>
   -[delay] <delay> (expressed in seconds)
   -version
@@ -145,7 +145,7 @@ fi
 
 #### Determine compression method and descriptive info.
 if [ x"$compress" = x ]; then
-  for compressor in gzip bzip2 lzma zip compress none; do
+  for compressor in gzip bzip2 lzma compress none; do
     if [ x"`finddir $compressor`" = x ]; then :; else
       compress="$compressor"
       break
@@ -161,8 +161,6 @@ case $compress in
             conversion='; x-conversions=gzip' ;;
   lzma)     compress='lzma -c'; uncompress='lzma -cd'
             conversion='; x-conversions=lzma' ;;
-  zip)      compress='zip -q'; uncompress='unzip -p'
-            conversion='; x-conversions=zip' ;;
   none)     compress=cat uncompress=cat; conversion= ;;
   *)        printf 'sendfiles: unknown compression method "%s"\n' \
                    "$compress" >&2

diff --git a/man/sendfiles.man b/man/sendfiles.man
index f8aec3fcaa96b435e0aabd0dca8c2929c5d70acb..020fd9d564bad104c986e0bef5ebbb01747f47e0 100644 (file)
--- a/man/sendfiles.man
+++ b/man/sendfiles.man
@@ -9,7 +9,7 @@ sendfiles \- send multiple files via a MIME message
 .na
 .B sendfiles
 .RB [ -compress
-.IR bzip2 " | " compress " | " gzip " | " lzma " | " none " | " zip ]
+.IR bzip2 " | " compress " | " gzip " | " lzma " | " none ]
 .br
 .RB [ \-from
 .IR sender ]

diff --git a/test/post/test-sendfiles b/test/post/test-sendfiles
index cc4596075aea6b7d8f796b7b45062b7c22f08920..687c5d9b7099ac694759f28aae458f1efc16e138 100755 (executable)
--- a/test/post/test-sendfiles
+++ b/test/post/test-sendfiles
@@ -80,7 +80,7 @@ Usage: sendfiles [switches] -to recipient -subject subject file1 [file2 ...]
   or
        sendfiles [switches] recipient subject file1 [file2 ...]
   switches are:
-  -compress [bzip2 | compress | gzip | lzma | none | zip]
+  -compress [bzip2 | compress | gzip | lzma | none]
   -from <sender>
   -[delay] <delay> (expressed in seconds)
   -version
@@ -104,7 +104,7 @@ run_test 'sendfiles -nonexistent' "Usage: sendfiles [switches] -to recipient \
   or
        sendfiles [switches] recipient subject file1 [file2 ...]
   switches are:
-  -compress [bzip2 | compress | gzip | lzma | none | zip]
+  -compress [bzip2 | compress | gzip | lzma | none]
   -from <sender>
   -[delay] <delay> (expressed in seconds)
   -version
@@ -119,7 +119,7 @@ Usage: sendfiles [switches] -to recipient \
   or
        sendfiles [switches] recipient subject file1 [file2 ...]
   switches are:
-  -compress [bzip2 | compress | gzip | lzma | none | zip]
+  -compress [bzip2 | compress | gzip | lzma | none]
   -from <sender>
   -[delay] <delay> (expressed in seconds)
   -version
@@ -136,7 +136,6 @@ Usage: sendfiles [switches] -to recipient \
 [ "`findprog gzip`" ]      &&  test_sendfiles 'gzip -cd' new -compress gzip
 [ "`findprog gzip`" ]      &&  test_sendfiles 'gzip -cd' new -gzip
 [ "`findprog lzma`" ]      &&  test_sendfiles 'lzma -cd' new -compress lzma
-[ "`findprog zip`" ]       &&  test_sendfiles 'unzip -p' new -compress zip
 
 # check with no compression
 cat >"$expected" <<EOF