
* configure.ac (NEED_GPG_VERSION_DEFAULT): Bump to 1.4.0 as 1.3.0 was development versions only. tests/ 2009-10-26 Marcus Brinkmann <marcus@g10code.de> * opassuan/t-command.c: Update to new interface. src/ 2009-10-26 Marcus Brinkmann <marcus@g10code.de> * gpgme.h.in (struct gpgme_io_event_done_data) (gpgme_io_event_done_data_t): New types. (struct _gpgme_op_assuan_result): Deprecate the err member. (gpgme_op_assuan_result): Deprecate (for now). (gpgme_op_assuan_transact_ext): New prototype. (gpgme_op_assuan_transact): Deprecate. (struct _gpgme_op_g13_result): Replace with ... (struct _gpgme_op_vfs_mount_result): ... this. (gpgme_op_g13_mount): Replace with ... (gpgme_op_vfs_mount): ... this. * gpgme.def (gpgme_op_assuan_transact_ext, gpgme_wait_ext) (gpgme_op_vfs_mount_result, gpgme_op_vfs_mount): New. (gpgme_op_g13_mount): Remove. * libgpgme.vers: Likewise. * engine-backend.h (struct engine_ops): Remove RESULT_CB and RESULT_CB_VALUE args in opassuan_transact member. Add CANCEL_OP member. * ops.h (_gpgme_cancel_with_err, _gpgme_wait_on_condition): Add OP_ERR argument. (_gpgme_wait_one_ext): New prototype. * context.h (ctx_op_data_id_t): Add OPDATA_VFS_MOUNT. * engine-g13.c (g13_cancel_op): New function. (parse_status): Remove declaration. (g13_assuan_simple_command): Do nothing with status lines for now. (status_handler): Update opaque value access. (_gpgme_engine_ops_g13): Add new cancel_op member. * gpgme.c (_gpgme_cancel_with_err): Add new parameter OP_ERR. Handle operational errors. (gpgme_cancel, gpgme_io_read, gpgme_io_write): Add debug output. * data.c (_gpgme_data_inbound_handler) (_gpgme_data_outbound_handler): Adjust opaque value access. * engine-gpg.c (command_handler, status_handler) (colon_line_handler): Likewise. * engine-gpgsm.c (status_handler): Likewise. * engine-gpg.c (_gpgme_engine_ops_gpg): Add cancel_op member. * engine-gpgsm.c (_gpgme_engine_ops_gpgsm): Likewise. * g13.c: Rewritten (and will be rewritten again). * engine.h (_gpgme_engine_op_assuan_transact): Remove result_cb and result_cb_value parameters from prototype. (_gpgme_engine_cancel_op): New prototype. * engine.c (engine_ops) [! ENABLE_ASSUAN]: Add missing comma. (_gpgme_engine_op_assuan_transact): Remove result_cb and result_cb_value parameter. (_gpgme_engine_cancel_op): New function. * wait.h (_gpgme_run_io_cb): Add new argument OP_ERR. (struct io_cb_data): New struct to pass opaque data and get a op_err return value. Needed because we can't modify I/O callback handler signature because it is exposed to the user. * wait.c (_gpgme_run_io_cb): Add OP_ERR parameter. Handle operational errors. * wait-user.c (_gpgme_user_io_cb_handler): Handle operational errors. * wait-private.c (_gpgme_wait_on_condition): New argument to retrieve the operational result. Handle operational errors in session based protocols. (_gpgme_wait_one_ext): New function. (_gpgme_wait_one): Pass argument in invocation of _gpgme_wait_on_condition. * wait-global.c (struct ctx_list_item): Add member OP_ERR. (ctx_done): New argument OP_ERR. (ctx_wait): New argument OP_ERR. (gpgme_wait_ext): New function based on gpgme_wait but handling operational errors. (gpgme_wait): Implement in term of gpgme_wait_ext. * keylist.c (gpgme_op_keylist_next): Pass argument in invocation of _gpgme_wait_on_condition. * trustlist.c (gpgme_op_trustlist_next): Pass argument in invocation of _gpgme_wait_on_condition. * engine-assuan.c (struct engine_llass): Replace members RESULT_CB and RESULT_CB_VALUE by LAST_OP_ERR. (_gpgme_engine_assuan_last_op_err): Add this hack function. (llass_cancel_op): New function. (_gpgme_engine_llass_ops): Add cancel_op member. (llass_status_handler): Update opaque value access. (llass_transact): Remove RESULT_CB and RESULT_CB_VALUE arguments. * opassuan.c: Move compat hacks to the end of file. (opassuan_start): Do not set OPD->result.err. Do not pass RESULT_Cb and CTX to _gpgme_engine_op_assuan_transact. (gpgme_op_assuan_transact_ext): New function.
335 lines
7.8 KiB
C
335 lines
7.8 KiB
C
/* data.c - An abstraction for data objects.
|
||
Copyright (C) 2002, 2003, 2004, 2005, 2007 g10 Code GmbH
|
||
|
||
This file is part of GPGME.
|
||
|
||
GPGME is free software; you can redistribute it and/or modify it
|
||
under the terms of the GNU Lesser General Public License as
|
||
published by the Free Software Foundation; either version 2.1 of
|
||
the License, or (at your option) any later version.
|
||
|
||
GPGME is distributed in the hope that it will be useful, but
|
||
WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||
Lesser General Public License for more details.
|
||
|
||
You should have received a copy of the GNU Lesser General Public
|
||
License along with this program; if not, write to the Free Software
|
||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||
02111-1307, USA. */
|
||
|
||
#if HAVE_CONFIG_H
|
||
#include <config.h>
|
||
#endif
|
||
|
||
#include <stdlib.h>
|
||
#include <unistd.h>
|
||
#include <errno.h>
|
||
#include <string.h>
|
||
|
||
#include "gpgme.h"
|
||
#include "data.h"
|
||
#include "util.h"
|
||
#include "ops.h"
|
||
#include "priv-io.h"
|
||
#include "debug.h"
|
||
|
||
|
||
gpgme_error_t
|
||
_gpgme_data_new (gpgme_data_t *r_dh, struct _gpgme_data_cbs *cbs)
|
||
{
|
||
gpgme_data_t dh;
|
||
|
||
if (!r_dh)
|
||
return gpg_error (GPG_ERR_INV_VALUE);
|
||
|
||
*r_dh = NULL;
|
||
dh = calloc (1, sizeof (*dh));
|
||
if (!dh)
|
||
return gpg_error_from_errno (errno);
|
||
|
||
dh->cbs = cbs;
|
||
|
||
*r_dh = dh;
|
||
return 0;
|
||
}
|
||
|
||
|
||
void
|
||
_gpgme_data_release (gpgme_data_t dh)
|
||
{
|
||
if (!dh)
|
||
return;
|
||
|
||
if (dh->file_name)
|
||
free (dh->file_name);
|
||
free (dh);
|
||
}
|
||
|
||
|
||
/* Read up to SIZE bytes into buffer BUFFER from the data object with
|
||
the handle DH. Return the number of characters read, 0 on EOF and
|
||
-1 on error. If an error occurs, errno is set. */
|
||
ssize_t
|
||
gpgme_data_read (gpgme_data_t dh, void *buffer, size_t size)
|
||
{
|
||
ssize_t res;
|
||
TRACE_BEG2 (DEBUG_DATA, "gpgme_data_read", dh,
|
||
"buffer=%p, size=%u", buffer, size);
|
||
|
||
if (!dh)
|
||
{
|
||
errno = EINVAL;
|
||
return TRACE_SYSRES (-1);
|
||
}
|
||
if (!dh->cbs->read)
|
||
{
|
||
errno = ENOSYS;
|
||
return TRACE_SYSRES (-1);
|
||
}
|
||
do
|
||
res = (*dh->cbs->read) (dh, buffer, size);
|
||
while (res < 0 && errno == EINTR);
|
||
|
||
return TRACE_SYSRES (res);
|
||
}
|
||
|
||
|
||
/* Write up to SIZE bytes from buffer BUFFER to the data object with
|
||
the handle DH. Return the number of characters written, or -1 on
|
||
error. If an error occurs, errno is set. */
|
||
ssize_t
|
||
gpgme_data_write (gpgme_data_t dh, const void *buffer, size_t size)
|
||
{
|
||
ssize_t res;
|
||
TRACE_BEG2 (DEBUG_DATA, "gpgme_data_write", dh,
|
||
"buffer=%p, size=%u", buffer, size);
|
||
|
||
if (!dh)
|
||
{
|
||
errno = EINVAL;
|
||
return TRACE_SYSRES (-1);
|
||
}
|
||
if (!dh->cbs->write)
|
||
{
|
||
errno = ENOSYS;
|
||
return TRACE_SYSRES (-1);
|
||
}
|
||
do
|
||
res = (*dh->cbs->write) (dh, buffer, size);
|
||
while (res < 0 && errno == EINTR);
|
||
|
||
return TRACE_SYSRES (res);
|
||
}
|
||
|
||
|
||
/* Set the current position from where the next read or write starts
|
||
in the data object with the handle DH to OFFSET, relativ to
|
||
WHENCE. */
|
||
off_t
|
||
gpgme_data_seek (gpgme_data_t dh, off_t offset, int whence)
|
||
{
|
||
TRACE_BEG2 (DEBUG_DATA, "gpgme_data_seek", dh,
|
||
"offset=%lli, whence=%i", offset, whence);
|
||
|
||
if (!dh)
|
||
{
|
||
errno = EINVAL;
|
||
return TRACE_SYSRES (-1);
|
||
}
|
||
if (!dh->cbs->seek)
|
||
{
|
||
errno = ENOSYS;
|
||
return TRACE_SYSRES (-1);
|
||
}
|
||
|
||
/* For relative movement, we must take into account the actual
|
||
position of the read counter. */
|
||
if (whence == SEEK_CUR)
|
||
offset -= dh->pending_len;
|
||
|
||
offset = (*dh->cbs->seek) (dh, offset, whence);
|
||
if (offset >= 0)
|
||
dh->pending_len = 0;
|
||
|
||
return TRACE_SYSRES (offset);
|
||
}
|
||
|
||
|
||
/* Release the data object with the handle DH. */
|
||
void
|
||
gpgme_data_release (gpgme_data_t dh)
|
||
{
|
||
TRACE (DEBUG_DATA, "gpgme_data_release", dh);
|
||
|
||
if (!dh)
|
||
return;
|
||
|
||
if (dh->cbs->release)
|
||
(*dh->cbs->release) (dh);
|
||
_gpgme_data_release (dh);
|
||
}
|
||
|
||
|
||
/* Get the current encoding meta information for the data object with
|
||
handle DH. */
|
||
gpgme_data_encoding_t
|
||
gpgme_data_get_encoding (gpgme_data_t dh)
|
||
{
|
||
TRACE1 (DEBUG_DATA, "gpgme_data_get_encoding", dh,
|
||
"dh->encoding=%i", dh ? dh->encoding : GPGME_DATA_ENCODING_NONE);
|
||
return dh ? dh->encoding : GPGME_DATA_ENCODING_NONE;
|
||
}
|
||
|
||
|
||
/* Set the encoding meta information for the data object with handle
|
||
DH to ENC. */
|
||
gpgme_error_t
|
||
gpgme_data_set_encoding (gpgme_data_t dh, gpgme_data_encoding_t enc)
|
||
{
|
||
TRACE_BEG1 (DEBUG_DATA, "gpgme_data_set_encoding", dh,
|
||
"encoding=%i", enc);
|
||
if (!dh)
|
||
return TRACE_ERR (gpg_error (GPG_ERR_INV_VALUE));
|
||
if (enc < 0 || enc > GPGME_DATA_ENCODING_URL0)
|
||
return TRACE_ERR (gpg_error (GPG_ERR_INV_VALUE));
|
||
dh->encoding = enc;
|
||
return TRACE_ERR (0);
|
||
}
|
||
|
||
|
||
/* Set the file name associated with the data object with handle DH to
|
||
FILE_NAME. */
|
||
gpgme_error_t
|
||
gpgme_data_set_file_name (gpgme_data_t dh, const char *file_name)
|
||
{
|
||
TRACE_BEG1 (DEBUG_DATA, "gpgme_data_set_file_name", dh,
|
||
"file_name=%s", file_name);
|
||
|
||
if (!dh)
|
||
return TRACE_ERR (gpg_error (GPG_ERR_INV_VALUE));
|
||
|
||
if (dh->file_name)
|
||
free (dh->file_name);
|
||
|
||
if (file_name)
|
||
{
|
||
dh->file_name = strdup (file_name);
|
||
if (!dh->file_name)
|
||
return TRACE_ERR (gpg_error_from_errno (errno));
|
||
}
|
||
else
|
||
dh->file_name = 0;
|
||
|
||
return TRACE_ERR (0);
|
||
}
|
||
|
||
|
||
/* Get the file name associated with the data object with handle DH,
|
||
or NULL if there is none. */
|
||
char *
|
||
gpgme_data_get_file_name (gpgme_data_t dh)
|
||
{
|
||
if (!dh)
|
||
{
|
||
TRACE (DEBUG_DATA, "gpgme_data_get_file_name", dh);
|
||
return NULL;
|
||
}
|
||
|
||
TRACE1 (DEBUG_DATA, "gpgme_data_get_file_name", dh,
|
||
"dh->file_name=%s", dh->file_name);
|
||
return dh->file_name;
|
||
}
|
||
|
||
|
||
/* Functions to support the wait interface. */
|
||
|
||
gpgme_error_t
|
||
_gpgme_data_inbound_handler (void *opaque, int fd)
|
||
{
|
||
struct io_cb_data *data = (struct io_cb_data *) opaque;
|
||
gpgme_data_t dh = (gpgme_data_t) data->handler_value;
|
||
char buffer[BUFFER_SIZE];
|
||
char *bufp = buffer;
|
||
ssize_t buflen;
|
||
TRACE_BEG1 (DEBUG_CTX, "_gpgme_data_inbound_handler", dh,
|
||
"fd=0x%x", fd);
|
||
|
||
buflen = _gpgme_io_read (fd, buffer, BUFFER_SIZE);
|
||
if (buflen < 0)
|
||
return gpg_error_from_errno (errno);
|
||
if (buflen == 0)
|
||
{
|
||
_gpgme_io_close (fd);
|
||
return TRACE_ERR (0);
|
||
}
|
||
|
||
do
|
||
{
|
||
ssize_t amt = gpgme_data_write (dh, bufp, buflen);
|
||
if (amt == 0 || (amt < 0 && errno != EINTR))
|
||
return TRACE_ERR (gpg_error_from_errno (errno));
|
||
bufp += amt;
|
||
buflen -= amt;
|
||
}
|
||
while (buflen > 0);
|
||
return TRACE_ERR (0);
|
||
}
|
||
|
||
|
||
gpgme_error_t
|
||
_gpgme_data_outbound_handler (void *opaque, int fd)
|
||
{
|
||
struct io_cb_data *data = (struct io_cb_data *) opaque;
|
||
gpgme_data_t dh = (gpgme_data_t) data->handler_value;
|
||
ssize_t nwritten;
|
||
TRACE_BEG1 (DEBUG_CTX, "_gpgme_data_outbound_handler", dh,
|
||
"fd=0x%x", fd);
|
||
|
||
if (!dh->pending_len)
|
||
{
|
||
ssize_t amt = gpgme_data_read (dh, dh->pending, BUFFER_SIZE);
|
||
if (amt < 0)
|
||
return TRACE_ERR (gpg_error_from_errno (errno));
|
||
if (amt == 0)
|
||
{
|
||
_gpgme_io_close (fd);
|
||
return TRACE_ERR (0);
|
||
}
|
||
dh->pending_len = amt;
|
||
}
|
||
|
||
nwritten = _gpgme_io_write (fd, dh->pending, dh->pending_len);
|
||
if (nwritten == -1 && errno == EAGAIN)
|
||
return TRACE_ERR (0);
|
||
|
||
if (nwritten == -1 && errno == EPIPE)
|
||
{
|
||
/* Not much we can do. The other end closed the pipe, but we
|
||
still have data. This should only ever happen if the other
|
||
end is going to tell us what happened on some other channel.
|
||
Silently close our end. */
|
||
_gpgme_io_close (fd);
|
||
return TRACE_ERR (0);
|
||
}
|
||
|
||
if (nwritten <= 0)
|
||
return TRACE_ERR (gpg_error_from_errno (errno));
|
||
|
||
if (nwritten < dh->pending_len)
|
||
memmove (dh->pending, dh->pending + nwritten, dh->pending_len - nwritten);
|
||
dh->pending_len -= nwritten;
|
||
return TRACE_ERR (0);
|
||
}
|
||
|
||
|
||
/* Get the file descriptor associated with DH, if possible. Otherwise
|
||
return -1. */
|
||
int
|
||
_gpgme_data_get_fd (gpgme_data_t dh)
|
||
{
|
||
if (!dh || !dh->cbs->get_fd)
|
||
return -1;
|
||
return (*dh->cbs->get_fd) (dh);
|
||
}
|