
* engine-gpgsm.c (status_handler): Do not close status fd at end of function. * ops.h (_gpgme_op_data_lookup): Add prototype. * op-support.c: Include <stdlib.h>. (_gpgme_op_data_lookup): New function. * decrypt.c (_gpgme_release_decrypt_result): Function removed. (struct decrypt_result_s): Rename to ... (struct decrypt_resul): ... this. (DecryptResult): New type. (_gpgme_decrypt_status_handler): Don't use test_and_allocate_result, but use _gpgme_op_data_lookup to retrieve result data object. * sign.c (_gpgme_release_sign_result): Function removed. (release_sign_result): New function. (struct sign_result_s): Rename to ... (struct sign_result): ... this. (SignResult): New type. (_gpgme_sign_status_handler): Don't use test_and_allocate_result, but use _gpgme_op_data_lookup to retrieve result data object. * encrypt.c (struct encrypt_result_s): Rename to ... (struct encrypt_result): ... this. (_gpgme_release_encrypt_result): Function removed. (release_encrypt_result): New function. (_gpgme_encrypt_status_handler): Don't use test_and_allocate_result, but use _gpgme_op_data_lookup to retrieve result data object. * verify.c (struct verify_result_s): Rename to ... (struct verify_result): ... this. Remove member next. (VerifyResult): New type. (_gpgme_release_verify_result): Function removed. (release_verify_result): New function. (finish_sig): Change first argument to type VerifyResult. Diddle the type of the op_data structure. (add_notation): Change first argument to type VerifyResult. (_gpgme_verify_status_handler): Don't use test_and_allocate_result, but use _gpgme_op_data_lookup to retrieve result data object. * passphrase.c (struct passphrase_result_s): Rename to ... (struct passphrase_result): ... this. Remove member next. (PassphraseResult): New type. (_gpgme_release_passphrase_result): Function removed. (release_passphrase_result): New function. (_gpgme_passphrase_status_handler): Don't use test_and_allocate_result, but use _gpgme_op_data_lookup to retrieve result data object. (_gpgme_passphrase_command_handler): Likewise. * keylist.c (struct keylist_result_s): Rename to ... (struct keylist_result): ... this. Remove member next. (KeylistResult): New type. (_gpgme_release_keylist_result): Function removed. (release_keylist_result): New function. (keylist_status_handler): Don't use test_and_allocate_result, but use _gpgme_op_data_lookup to retrieve result data object. * edit.c (struct edit_result_s): Rename to ... (struct edit_result): ... this. Remove member next. (EditResult): New type. (_gpgme_release_edit_result): Function removed. (release_edit_result): New function. (edit_status_handler): Don't use test_and_allocate_result, but use _gpgme_op_data_lookup to retrieve result data object. (command_handler): Likewise. * types.h (DecryptResult, SignResult, EncryptResult, PassphraseResult, ImportResult, DeleteResult, GenKeyResult, KeylistResult, EditResult): Types removed. * ops.h: Don't include "types.h", but "gpgme.h" and "context.h". (test_and_allocate_result): Remove macro. (_gpgme_release_decrypt_result): Remove prototype. (_gpgme_decrypt_result): Remove prototype. (_gpgme_release_sign_result): Remove prototype. (_gpgme_release_encrypt_result): Remove prototype. (_gpgme_release_passphrase_result): Remove prototype. (_gpgme_release_import_result): Remove prototype. (_gpgme_release_delete_result): Remove prototype. (_gpgme_release_genkey_result): Remove prototype. (_gpgme_release_keylist_result): Remove prototype. (_gpgme_release_edit_result): Remove prototype. (_gpgme_release_verify_result): Remove prototype. * gpgme.c (_gpgme_release_result): Rewritten. * context.h (enum ctx_op_data_type): New enum. (struct ctx_op_data): New structure. (struct gpgme_context_s): Replace the member result with a member op_data. (fail_on_pending_request): Remove macro. * op-support.c (_gpgme_op_reset): Expand macro fail_on_pending_request. * util.h: Don't include "types.h" or "debug.h", but include "gpgme.h".
168 lines
3.6 KiB
C
168 lines
3.6 KiB
C
/* wait.c
|
||
Copyright (C) 2000 Werner Koch (dd9jn)
|
||
Copyright (C) 2001, 2002, 2003 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 General Public License as published by
|
||
the Free Software Foundation; either version 2 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
|
||
General Public License for more details.
|
||
|
||
You should have received a copy of the GNU General Public License
|
||
along with GPGME; 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 <string.h>
|
||
#include <assert.h>
|
||
#include <errno.h>
|
||
#include <sys/types.h>
|
||
|
||
#include "util.h"
|
||
#include "context.h"
|
||
#include "ops.h"
|
||
#include "wait.h"
|
||
#include "sema.h"
|
||
#include "io.h"
|
||
#include "engine.h"
|
||
#include "debug.h"
|
||
|
||
|
||
void
|
||
_gpgme_fd_table_init (fd_table_t fdt)
|
||
{
|
||
fdt->fds = NULL;
|
||
fdt->size = 0;
|
||
}
|
||
|
||
void
|
||
_gpgme_fd_table_deinit (fd_table_t fdt)
|
||
{
|
||
if (fdt->fds)
|
||
free (fdt->fds);
|
||
}
|
||
|
||
|
||
/* XXX We should keep a marker and roll over for speed. */
|
||
static GpgmeError
|
||
fd_table_put (fd_table_t fdt, int fd, int dir, void *opaque, int *idx)
|
||
{
|
||
int i, j;
|
||
struct io_select_fd_s *new_fds;
|
||
|
||
for (i = 0; i < fdt->size; i++)
|
||
{
|
||
if (fdt->fds[i].fd == -1)
|
||
break;
|
||
}
|
||
if (i == fdt->size)
|
||
{
|
||
#define FDT_ALLOCSIZE 10
|
||
new_fds = realloc (fdt->fds, (fdt->size + FDT_ALLOCSIZE)
|
||
* sizeof (*new_fds));
|
||
if (!new_fds)
|
||
return GPGME_Out_Of_Core;
|
||
|
||
fdt->fds = new_fds;
|
||
fdt->size += FDT_ALLOCSIZE;
|
||
for (j = 0; j < FDT_ALLOCSIZE; j++)
|
||
fdt->fds[i + j].fd = -1;
|
||
}
|
||
|
||
fdt->fds[i].fd = fd;
|
||
fdt->fds[i].for_read = (dir == 1);
|
||
fdt->fds[i].for_write = (dir == 0);
|
||
fdt->fds[i].frozen = 0;
|
||
fdt->fds[i].signaled = 0;
|
||
fdt->fds[i].opaque = opaque;
|
||
*idx = i;
|
||
return 0;
|
||
}
|
||
|
||
|
||
/* Register the file descriptor FD with the handler FNC (which gets
|
||
FNC_DATA as its first argument) for the direction DIR. DATA should
|
||
be the context for which the fd is added. R_TAG will hold the tag
|
||
that can be used to remove the fd. */
|
||
GpgmeError
|
||
_gpgme_add_io_cb (void *data, int fd, int dir, GpgmeIOCb fnc, void *fnc_data,
|
||
void **r_tag)
|
||
{
|
||
GpgmeError err;
|
||
GpgmeCtx ctx = (GpgmeCtx) data;
|
||
fd_table_t fdt;
|
||
struct wait_item_s *item;
|
||
struct tag *tag;
|
||
|
||
assert (fnc);
|
||
assert (ctx);
|
||
|
||
fdt = &ctx->fdt;
|
||
assert (fdt);
|
||
|
||
tag = malloc (sizeof *tag);
|
||
if (!tag)
|
||
return GPGME_Out_Of_Core;
|
||
tag->ctx = ctx;
|
||
|
||
/* Allocate a structure to hold information about the handler. */
|
||
item = calloc (1, sizeof *item);
|
||
if (!item)
|
||
{
|
||
free (tag);
|
||
return GPGME_Out_Of_Core;
|
||
}
|
||
item->ctx = ctx;
|
||
item->dir = dir;
|
||
item->handler = fnc;
|
||
item->handler_value = fnc_data;
|
||
|
||
err = fd_table_put (fdt, fd, dir, item, &tag->idx);
|
||
if (err)
|
||
{
|
||
free (tag);
|
||
free (item);
|
||
return err;
|
||
}
|
||
|
||
*r_tag = tag;
|
||
return 0;
|
||
}
|
||
|
||
|
||
void
|
||
_gpgme_remove_io_cb (void *data)
|
||
{
|
||
struct tag *tag = data;
|
||
GpgmeCtx ctx;
|
||
fd_table_t fdt;
|
||
int idx;
|
||
|
||
assert (tag);
|
||
ctx = tag->ctx;
|
||
assert (ctx);
|
||
fdt = &ctx->fdt;
|
||
assert (fdt);
|
||
idx = tag->idx;
|
||
|
||
DEBUG2 ("setting fd %d (item=%p) done", fdt->fds[idx].fd,
|
||
fdt->fds[idx].opaque);
|
||
free (fdt->fds[idx].opaque);
|
||
free (tag);
|
||
|
||
/* Free the table entry. */
|
||
fdt->fds[idx].fd = -1;
|
||
fdt->fds[idx].for_read = 0;
|
||
fdt->fds[idx].for_write = 0;
|
||
fdt->fds[idx].opaque = NULL;
|
||
}
|