[svn] GnuPG - r4537 - branches/STABLE-BRANCH-1-4/g10

[svn author dshaw]

Author: dshaw
Date: 2007-07-07 01:36:33 +0200 (Sat, 07 Jul 2007)
New Revision: 4537

Modified:
   branches/STABLE-BRANCH-1-4/g10/ChangeLog
   branches/STABLE-BRANCH-1-4/g10/encode.c
Log:
* encode.c (encode_crypt): Missed one call to setup_plaintext_name().
This is bug#809.


Modified: branches/STABLE-BRANCH-1-4/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ChangeLog	2007-07-06 14:55:40 UTC (rev 4536)
+++ branches/STABLE-BRANCH-1-4/g10/ChangeLog	2007-07-06 23:36:33 UTC (rev 4537)
@@ -1,3 +1,8 @@
+2007-07-06  David Shaw  <dshaw at jabberwocky.com>
+
+	* encode.c (encode_crypt): Missed one call to
+	setup_plaintext_name().  This is bug#809.
+
 2007-06-12  David Shaw  <dshaw at jabberwocky.com>
 
 	* sign.c (mk_notation_policy_etc): expect all sigs that this is

Modified: branches/STABLE-BRANCH-1-4/g10/encode.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/encode.c	2007-07-06 14:55:40 UTC (rev 4536)
+++ branches/STABLE-BRANCH-1-4/g10/encode.c	2007-07-06 23:36:33 UTC (rev 4537)
@@ -557,22 +557,8 @@
     if(use_symkey && (rc=write_symkey_enc(symkey_s2k,symkey_dek,cfx.dek,out)))
       goto leave;
 
-    if (!opt.no_literal) {
-	/* setup the inner packet */
-	if( filename || opt.set_filename ) {
-	    char *s = make_basename( opt.set_filename ? opt.set_filename
-						      : filename,
-				     iobuf_get_real_fname( inp ) );
-	    pt = xmalloc( sizeof *pt + strlen(s) - 1 );
-	    pt->namelen = strlen(s);
-	    memcpy(pt->name, s, pt->namelen );
-	    xfree(s);
-	}
-	else { /* no filename */
-	    pt = xmalloc( sizeof *pt - 1 );
-	    pt->namelen = 0;
-	}
-    }
+    if (!opt.no_literal)
+      pt=setup_plaintext_name(filename,inp);
 
     if (!iobuf_is_pipe_filename (filename) && *filename && !opt.textmode )
       {