diff options
| author | Werner Koch <[email protected]> | 2007-10-25 09:06:21 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2007-10-25 09:06:21 +0000 |
| commit | cd2d9288aaf9c584673675826ba76e7dbc2ad239 (patch) | |
| tree | 900265d44d0cbc9beb573867fa17148007f37d5f /g10/encode.c | |
| parent | Add a /while loop. (diff) | |
| download | gnupg-cd2d9288aaf9c584673675826ba76e7dbc2ad239.tar.gz gnupg-cd2d9288aaf9c584673675826ba76e7dbc2ad239.zip | |
Ported changes from 1.4.
Add copyright notices.
Diffstat (limited to '')
| -rw-r--r-- | g10/encode.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/g10/encode.c b/g10/encode.c index 196d213d2..4a5733220 100644 --- a/g10/encode.c +++ b/g10/encode.c @@ -598,22 +598,8 @@ encode_crypt( const char *filename, strlist_t remusr, int use_symkey ) 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 ) { |