[git] GnuPG - branch, master, updated. gnupg-2.1.2-63-gbdd22e3

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  bdd22e3a0846d38a0b6cdb822476ad2f15d03455 (commit)
      from  898c5c4836e3771d70df4da56c01deda139e6ddb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bdd22e3a0846d38a0b6cdb822476ad2f15d03455
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Mar 24 13:30:57 2015 +0100

    gpg,w32: Handle forward slash in --keyring option.
    
    * g10/keydb.c (keydb_add_resource): Allow forward slash under Windows.
    --
    
    GnuPG-bug-id: 1546

diff --git a/g10/keydb.c b/g10/keydb.c
index cf422a8..040ca65 100644
--- a/g10/keydb.c
+++ b/g10/keydb.c
@@ -369,10 +369,18 @@ keydb_add_resource (const char *url, unsigned int flags)
     }
 #endif /* !HAVE_DRIVE_LETTERS && !__riscos__ */
 
-  if (*resname != DIRSEP_C )
+  if (*resname != DIRSEP_C
+#ifdef HAVE_W32_SYSTEM
+      && *resname != '/'  /* Fixme: does not handle drive letters.  */
+#endif
+        )
     {
       /* Do tilde expansion etc. */
-      if (strchr(resname, DIRSEP_C) )
+      if (strchr (resname, DIRSEP_C)
+#ifdef HAVE_W32_SYSTEM
+          || strchr (resname, '/')  /* Windows also accepts this.  */
+#endif
+          )
         filename = make_filename (resname, NULL);
       else
         filename = make_filename (opt.homedir, resname, NULL);

-----------------------------------------------------------------------

Summary of changes:
 g10/keydb.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org