From 3bab25d7d5197cd6178be653feb1182cd313ecbe Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Thu, 15 Jun 2023 13:52:18 +0200
Subject: [PATCH] gpgtar: New option --no-compress.

* tools/gpgtar.c: Add option --no-compress.
* tools/gpgtar.h (opt): Add field no_compress.
* tools/gpgtar-create.c (gpgtar_create): Pass -z0 to gpg.
--

This option is probably easier to remember than --gpg-args '-z0'.
---
 doc/tools.texi        | 6 ++++++
 tools/gpgtar-create.c | 2 ++
 tools/gpgtar.c        | 3 +++
 tools/gpgtar.h        | 1 +
 4 files changed, 12 insertions(+)

diff --git a/doc/tools.texi b/doc/tools.texi
index 5fa21c66a..eefa4f9d6 100644
--- a/doc/tools.texi
+++ b/doc/tools.texi
@@ -2049,6 +2049,12 @@ default is to take the directory name from the input filename.  If no
 input filename is known a directory named @file{GPGARCH} is used.
 This option is deprecated in favor of option @option{--directory}.
 
+@item --no-compress
+@opindex no-compress
+This option tells gpg to disable compression (i.e. using option -z0).
+It is useful for archiving only large files which are are already
+compressed (e.g. a set of videos).
+
 @item --gpg @var{gpgcmd}
 @opindex gpg
 Use the specified command @var{gpgcmd} instead of @command{gpg}.
diff --git a/tools/gpgtar-create.c b/tools/gpgtar-create.c
index 26d37a332..0994322ea 100644
--- a/tools/gpgtar-create.c
+++ b/tools/gpgtar-create.c
@@ -1273,6 +1273,8 @@ gpgtar_create (char **inpattern, const char *files_from, int null_names,
           ccparray_put (&ccp, "--recipient");
           ccparray_put (&ccp, arg->d);
         }
+      if (opt.no_compress)
+        ccparray_put (&ccp, "-z0");
       for (arg = opt.gpg_arguments; arg; arg = arg->next)
         ccparray_put (&ccp, arg->d);
 
diff --git a/tools/gpgtar.c b/tools/gpgtar.c
index 492b3d5e5..ea1e1e751 100644
--- a/tools/gpgtar.c
+++ b/tools/gpgtar.c
@@ -76,6 +76,7 @@ enum cmd_and_opt_values
     oSetFilename,
     oNull,
     oUtf8Strings,
+    oNoCompress,
 
     oBatch,
     oAnswerYes,
@@ -121,6 +122,7 @@ static gpgrt_opt_t opts[] = {
   ARGPARSE_s_s (oSetFilename, "set-filename", "@"),
   ARGPARSE_s_n (oOpenPGP, "openpgp", "@"),
   ARGPARSE_s_n (oCMS, "cms", "@"),
+  ARGPARSE_s_n (oNoCompress,   "no-compress", "@"),
 
   ARGPARSE_s_n (oBatch, "batch", "@"),
   ARGPARSE_s_n (oAnswerYes, "yes", "@"),
@@ -350,6 +352,7 @@ parse_arguments (gpgrt_argparse_t *pargs, gpgrt_opt_t *popts)
         case oFilesFrom: files_from = pargs->r.ret_str; break;
         case oNull: null_names = 1; break;
         case oUtf8Strings: opt.utf8strings = 1; break;
+        case oNoCompress:  opt.no_compress = 1; break;
 
 	case aList:
         case aDecrypt:
diff --git a/tools/gpgtar.h b/tools/gpgtar.h
index 9177fcfcb..d86010476 100644
--- a/tools/gpgtar.h
+++ b/tools/gpgtar.h
@@ -33,6 +33,7 @@ struct
   int quiet;
   int dry_run;
   int utf8strings;
+  int no_compress;
   const char *gpg_program;
   strlist_t gpg_arguments;
   const char *outfile;