[svn] GnuPG - r5293 - branches/STABLE-BRANCH-2-0/g10

[svn author wk]

Author: wk
Date: 2010-03-12 19:46:33 +0100 (Fri, 12 Mar 2010)
New Revision: 5293

Modified:
   branches/STABLE-BRANCH-2-0/g10/ChangeLog
   branches/STABLE-BRANCH-2-0/g10/plaintext.c
Log:
Fix for bug#1201.


Modified: branches/STABLE-BRANCH-2-0/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-2-0/g10/ChangeLog	2010-03-12 18:08:02 UTC (rev 5292)
+++ branches/STABLE-BRANCH-2-0/g10/ChangeLog	2010-03-12 18:46:33 UTC (rev 5293)
@@ -1,5 +1,8 @@
 2010-03-12  Werner Koch  <wk at g10code.com>
 
+	* plaintext.c (setup_plaintext_name): Do not encode pipe like
+	filenames.  This helps with bug#1201.
+
 	* seckey-cert.c (do_check): Return GPG_ERR_CANCELED.
 	* keyedit.c (change_passphrase): Add arg R_ERR.
 	(keyedit_passwd): Return the correct error or emit a success

Modified: branches/STABLE-BRANCH-2-0/g10/plaintext.c
===================================================================
--- branches/STABLE-BRANCH-2-0/g10/plaintext.c	2010-03-12 18:08:02 UTC (rev 5292)
+++ branches/STABLE-BRANCH-2-0/g10/plaintext.c	2010-03-12 18:46:33 UTC (rev 5293)
@@ -623,7 +623,8 @@
 {
   PKT_plaintext *pt;
 
-  if(filename || opt.set_filename)
+  if ((filename && !iobuf_is_pipe_filename (filename))
+       || (opt.set_filename && !iobuf_is_pipe_filename (opt.set_filename)))
     {
       char *s;