diff options
| author | Werner Koch <[email protected]> | 2017-09-26 10:00:03 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-09-26 10:00:03 +0000 |
| commit | cd2d758f3f9e0007ecd6bae9d2ee0d631773e237 (patch) | |
| tree | 0e1b9c898d0527969fa953e0f1fc418e610c8da4 /tools/mime-maker.c | |
| parent | g10: Select a secret key by checking availability under gpg-agent. (diff) | |
| parent | po: Remove trailing colon from a German pinentry string. (diff) | |
| download | gnupg-cd2d758f3f9e0007ecd6bae9d2ee0d631773e237.tar.gz gnupg-cd2d758f3f9e0007ecd6bae9d2ee0d631773e237.zip | |
Merge branch 'STABLE-BRANCH-2-2' into master
--
Signed-off-by: Werner Koch <[email protected]>
Conflicts:
NEWS - include release info from 2.2.1
configure.ac - keep master.
Diffstat (limited to 'tools/mime-maker.c')
| -rw-r--r-- | tools/mime-maker.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/tools/mime-maker.c b/tools/mime-maker.c index d1241f3f8..0edc14d78 100644 --- a/tools/mime-maker.c +++ b/tools/mime-maker.c @@ -478,7 +478,8 @@ add_body (mime_maker_t ctx, const void *data, size_t datalen) /* Add STRING as body to the mail or the current MIME container. A - * second call to this function is not allowed. + * second call to this function or mime_make_add_body_data is not + * allowed. * * FIXME: We may want to have an append_body to add more data to a body. */ @@ -489,6 +490,16 @@ mime_maker_add_body (mime_maker_t ctx, const char *string) } +/* Add (DATA,DATALEN) as body to the mail or the current MIME + * container. Note that a second call to this function or to + * mime_make_add_body is not allowed. */ +gpg_error_t +mime_maker_add_body_data (mime_maker_t ctx, const void *data, size_t datalen) +{ + return add_body (ctx, data, datalen); +} + + /* This is the same as mime_maker_add_body but takes a stream as * argument. As of now the stream is copied to the MIME object but * eventually we may delay that and read the stream only at the time |