aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2021-03-04 09:43:46 +0000
committerWerner Koch <[email protected]>2021-06-08 07:24:39 +0000
commit1f59c4c8e2cfa2b111f0798212546864668383f9 (patch)
treed87814989621901c01108d6db37f533e3b05b233
parentdirmngr: Rewrite the LDAP wrapper tool (diff)
downloadgnupg-1f59c4c8e2cfa2b111f0798212546864668383f9.tar.gz
gnupg-1f59c4c8e2cfa2b111f0798212546864668383f9.zip
gpg: Prepare for globing with UTF-8.
* g10/gpg.c (_dowildcard): Remove. (my_strusage): Enable wildcards using our new system. -- This patch actually removes the current globing using a mingw feature. We are not able to use this because it does not handle Unicode filenames. The plan is to implement this in init.c. This patch merely configures gpg to request globing. GnuPG-bug-id: 4398 (cherry picked from commit 8e15506d6680bbee85bc01453da28fc90b4cb673)
-rw-r--r--g10/gpg.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/g10/gpg.c b/g10/gpg.c
index ee607664e..eea5f5342 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -75,10 +75,6 @@
#define MY_O_BINARY 0
#endif
-#ifdef __MINGW32__
-int _dowildcard = -1;
-#endif
-
enum cmd_and_opt_values
{
aNull = 0,
@@ -1135,6 +1131,10 @@ my_strusage( int level )
p = zips;
break;
+ case 95:
+ p = "1"; /* <-- Enable globbing under Windows (see init.c) */
+ break;
+
default: p = NULL;
}
return p;