gpg,gpgsm: New option --disable-fd-translation.

* common/sysutils.c (no_translate_sys2libc_fd) [W32]: New global.
(disable_translate_sys2libc_fd): New.
(translate_sys2libc_fd): Make static and cobuild only for Windows.
(translate_sys2libc_fd_int): Use no_translate_sys2libc_fd flag.

* g10/gpg.c, sm/gpgsm.c (oDisableFdTranslation): New const.
(opts): Add option "disable-fd-translation".
(main): Set option.
--

GnuPG-bug-id: 7060

1 files changed, 7 insertions, 1 deletions

diff --git a/g10/gpg.c b/g10/gpg.c
index 658b7c7c8..2afcd91ad 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -354,6 +354,7 @@ enum cmd_and_opt_values
     oAllowSecretKeyImport,
     oAllowOldCipherAlgos,
     oEnableSpecialFilenames,
+    oDisableFdTranslation,
     oNoLiteral,
     oSetFilesize,
     oHonorHttpProxy,
@@ -880,7 +881,6 @@ static gpgrt_opt_t opts[] = {
   ARGPARSE_s_n (oAllowOldCipherAlgos, "allow-old-cipher-algos", "@"),
   ARGPARSE_s_s (oWeakDigest, "weak-digest","@"),
   ARGPARSE_s_s (oVerifyOptions, "verify-options", "@"),
-  ARGPARSE_s_n (oEnableSpecialFilenames, "enable-special-filenames", "@"),
   ARGPARSE_s_n (oNoRandomSeedFile,  "no-random-seed-file", "@"),
   ARGPARSE_s_n (oNoSigCache,         "no-sig-cache", "@"),
   ARGPARSE_s_n (oIgnoreTimeConflict, "ignore-time-conflict", "@"),
@@ -912,6 +912,8 @@ static gpgrt_opt_t opts[] = {
   ARGPARSE_s_i (oPassphraseRepeat,"passphrase-repeat", "@"),
   ARGPARSE_s_s (oPinentryMode,    "pinentry-mode", "@"),
   ARGPARSE_s_n (oForceSignKey,    "force-sign-key", "@"),
+  ARGPARSE_s_n (oEnableSpecialFilenames, "enable-special-filenames", "@"),
+  ARGPARSE_s_n (oDisableFdTranslation, "disable-fd-translation", "@"),
 
   ARGPARSE_header (NULL, N_("Other options")),
 
@@ -3563,6 +3565,10 @@ main (int argc, char **argv)
             enable_special_filenames ();
             break;
 
+          case oDisableFdTranslation:
+            disable_translate_sys2libc_fd ();
+            break;
+
           case oNoExpensiveTrustChecks: opt.no_expensive_trust_checks=1; break;
           case oAutoCheckTrustDB: opt.no_auto_check_trustdb=0; break;
           case oNoAutoCheckTrustDB: opt.no_auto_check_trustdb=1; break;