2002-05-08 03:57:42 +00:00
|
|
|
|
/* debug.c - helpful output in desperate situations
|
2003-01-29 19:50:43 +00:00
|
|
|
|
Copyright (C) 2000 Werner Koch (dd9jn)
|
2009-06-22 14:50:17 +00:00
|
|
|
|
Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2009 g10 Code GmbH
|
2003-01-29 19:50:43 +00:00
|
|
|
|
|
|
|
|
|
This file is part of GPGME.
|
2001-01-30 11:01:41 +00:00
|
|
|
|
|
2003-01-29 19:50:43 +00:00
|
|
|
|
GPGME is free software; you can redistribute it and/or modify it
|
2004-12-07 Marcus Brinkmann <marcus@g10code.de>
* README: Refer to COPYING.LESSER and "each file" instead of
COPYING.
* COPYING.LESSER: New file.
* gpgme.spec.in (%doc): Add COPYING.LESSER.
* acinclude.m4, configure.ac, Makefile.am: Change license to LGPL
2.1 or later.
* TODO: Add copyright notice.
* README.CVS: Likewise.
assuan/
2004-12-07 Marcus Brinkmann <marcus@g10code.de>
* README.1st: Add copyright notice.
doc/
2004-12-07 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am: Change license to LGPL.
(gpgme_TEXINFOS): Replace gpl.texi with lesser.texi.
* gpgme.texi: Change license to LGPL (also for documentation of
GPGME's license).
* lesser.texi: New file.
* gpl.texi: File removed.
gpgme/
2004-12-07 Marcus Brinkmann <marcus@g10code.de>
* putc_unlocked.c, funopen.c: I just claim copyright on these
files and change their license to LGPL, because they are totally
trivial wrapper functions.
* isascii.c: Change copyright notice to the one from ctype/ctype.h
in the GNU C Library (CVS Head 2004-10-10), where isascii is
defined as a macro doing exactly the same as the function in this
file.
* memrchr.c: Update from the GNU C Library (CVS Head 2001-07-06).
* stpcpy.c: Update from the GNU C Library (CVS Head 2004-10-10).
* ath.c, ath-compat.c, ath.h, ath-pth.c, ath-pth-compat.c,
ath-pthread.c, ath-pthread-compat.c, context.h, conversion.c,
data.c, data-compat.c, data-fd.c, data.h, data-mem.c,
data-stream.c, data-user.c, debug.c, debug.h, decrypt.c,
decrypt-verify.c, delete.c, edit.c, encrypt.c, encrypt-sign.c,
engine-backend.h, engine.c, engine-gpgsm.c, engine.h, error.c,
export.c, genkey.c, get-env.c, gpgme.c, gpgme.h, import.c, io.h,
key.c, keylist.c, mkstatus, Makefile.am, ops.h, op-support.c,
passphrase.c, posix-io.c, posix-sema.c, posix-util.c, progress.c,
rungpg.c, sema.h, sign.c, signers.c, trust-item.c, trustlist.c,
util.h, verify.c, version.c, w32-io.c, w32-sema.c, w32-util.c,
wait.c, wait-global.c, wait.h, wait-private.c, wait-user.c: Change
license to LGPL.
tests/
2004-12-07 Marcus Brinkmann <marcus@g10code.de>
* gpg/mkdemodirs: Add copyright notice.
* gpgsm/Makefile.am, gpgsm/t-support.h, gpgsm/t-decrypt.c,
gpgsm/t-encrypt.c, gpgsm/t-export.c, gpgsm/t-genkey.c,
gpgsm/t-import.c, gpgsm/t-keylist.c, gpgsm/t-sign.c,
gpgsm/t-verify.c, gpg/Makefile.am, gpg/t-decrypt.c,
gpg/t-decrypt-verify.c, gpg/t-edit.c, gpg/t-encrypt.c,
gpg/t-encrypt-sign.c, gpg/t-encrypt-sym.c, gpg/t-eventloop.c,
gpg/t-export.c, gpg/t-genkey.c, gpg/t-import.c, gpg/t-keylist.c,
gpg/t-keylist-sig.c, gpg/t-sign.c, gpg/t-signers.c,
gpg/t-support.h, gpg/t-thread1.c, gpg/t-trustlist.c,
gpg/t-verify.c, Makefile.am, t-data.c, t-engine-info.c,
t-version.c: Change license to LGPL.
2004-12-07 21:13:39 +00:00
|
|
|
|
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.
|
|
|
|
|
|
2003-01-29 19:50:43 +00:00
|
|
|
|
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
|
2004-12-07 Marcus Brinkmann <marcus@g10code.de>
* README: Refer to COPYING.LESSER and "each file" instead of
COPYING.
* COPYING.LESSER: New file.
* gpgme.spec.in (%doc): Add COPYING.LESSER.
* acinclude.m4, configure.ac, Makefile.am: Change license to LGPL
2.1 or later.
* TODO: Add copyright notice.
* README.CVS: Likewise.
assuan/
2004-12-07 Marcus Brinkmann <marcus@g10code.de>
* README.1st: Add copyright notice.
doc/
2004-12-07 Marcus Brinkmann <marcus@g10code.de>
* Makefile.am: Change license to LGPL.
(gpgme_TEXINFOS): Replace gpl.texi with lesser.texi.
* gpgme.texi: Change license to LGPL (also for documentation of
GPGME's license).
* lesser.texi: New file.
* gpl.texi: File removed.
gpgme/
2004-12-07 Marcus Brinkmann <marcus@g10code.de>
* putc_unlocked.c, funopen.c: I just claim copyright on these
files and change their license to LGPL, because they are totally
trivial wrapper functions.
* isascii.c: Change copyright notice to the one from ctype/ctype.h
in the GNU C Library (CVS Head 2004-10-10), where isascii is
defined as a macro doing exactly the same as the function in this
file.
* memrchr.c: Update from the GNU C Library (CVS Head 2001-07-06).
* stpcpy.c: Update from the GNU C Library (CVS Head 2004-10-10).
* ath.c, ath-compat.c, ath.h, ath-pth.c, ath-pth-compat.c,
ath-pthread.c, ath-pthread-compat.c, context.h, conversion.c,
data.c, data-compat.c, data-fd.c, data.h, data-mem.c,
data-stream.c, data-user.c, debug.c, debug.h, decrypt.c,
decrypt-verify.c, delete.c, edit.c, encrypt.c, encrypt-sign.c,
engine-backend.h, engine.c, engine-gpgsm.c, engine.h, error.c,
export.c, genkey.c, get-env.c, gpgme.c, gpgme.h, import.c, io.h,
key.c, keylist.c, mkstatus, Makefile.am, ops.h, op-support.c,
passphrase.c, posix-io.c, posix-sema.c, posix-util.c, progress.c,
rungpg.c, sema.h, sign.c, signers.c, trust-item.c, trustlist.c,
util.h, verify.c, version.c, w32-io.c, w32-sema.c, w32-util.c,
wait.c, wait-global.c, wait.h, wait-private.c, wait-user.c: Change
license to LGPL.
tests/
2004-12-07 Marcus Brinkmann <marcus@g10code.de>
* gpg/mkdemodirs: Add copyright notice.
* gpgsm/Makefile.am, gpgsm/t-support.h, gpgsm/t-decrypt.c,
gpgsm/t-encrypt.c, gpgsm/t-export.c, gpgsm/t-genkey.c,
gpgsm/t-import.c, gpgsm/t-keylist.c, gpgsm/t-sign.c,
gpgsm/t-verify.c, gpg/Makefile.am, gpg/t-decrypt.c,
gpg/t-decrypt-verify.c, gpg/t-edit.c, gpg/t-encrypt.c,
gpg/t-encrypt-sign.c, gpg/t-encrypt-sym.c, gpg/t-eventloop.c,
gpg/t-export.c, gpg/t-genkey.c, gpg/t-import.c, gpg/t-keylist.c,
gpg/t-keylist-sig.c, gpg/t-sign.c, gpg/t-signers.c,
gpg/t-support.h, gpg/t-thread1.c, gpg/t-trustlist.c,
gpg/t-verify.c, Makefile.am, t-data.c, t-engine-info.c,
t-version.c: Change license to LGPL.
2004-12-07 21:13:39 +00:00
|
|
|
|
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
|
2007-08-02 14:59:01 +00:00
|
|
|
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
|
|
|
|
MA 02110-1301, USA. */
|
2003-01-29 19:50:43 +00:00
|
|
|
|
|
|
|
|
|
#if HAVE_CONFIG_H
|
2001-01-30 11:01:41 +00:00
|
|
|
|
#include <config.h>
|
2003-01-29 19:50:43 +00:00
|
|
|
|
#endif
|
2001-01-30 11:01:41 +00:00
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <stdarg.h>
|
2001-02-12 15:23:29 +00:00
|
|
|
|
#include <unistd.h>
|
2001-04-02 08:40:32 +00:00
|
|
|
|
#include <ctype.h>
|
2007-07-17 Marcus Brinkmann <marcus@g10code.de>
* debug.c:;5B Include <errno.h> and "debug.h".
(_gpgme_debug): Save and restore ERRNO.
(TOHEX): New macro.
(_gpgme_debug_buffer): New function.
* conversion.c, data-compat.c, data-mem.c, data.c, engine-gpgsm.c,
gpgme.c, keylist.c, posix-io.c, rungpg.c, sign.c, version.c,
w32-io.c, wait.c: Replace DEBUG macros by TRACE_* variants. In
most of these files, add many more tracepoints.
2007-07-17 12:36:04 +00:00
|
|
|
|
#include <errno.h>
|
2001-06-12 07:37:15 +00:00
|
|
|
|
#ifndef HAVE_DOSISH_SYSTEM
|
2007-08-02 14:59:01 +00:00
|
|
|
|
# include <sys/types.h>
|
|
|
|
|
# include <sys/stat.h>
|
|
|
|
|
# include <fcntl.h>
|
2001-06-12 07:37:15 +00:00
|
|
|
|
#endif
|
2001-01-30 11:01:41 +00:00
|
|
|
|
#include <assert.h>
|
|
|
|
|
|
2007-08-02 14:59:01 +00:00
|
|
|
|
#ifdef HAVE_ASSUAN_H
|
|
|
|
|
#include "assuan.h"
|
|
|
|
|
#endif
|
|
|
|
|
|
2001-01-30 11:01:41 +00:00
|
|
|
|
#include "util.h"
|
|
|
|
|
#include "sema.h"
|
2007-07-17 Marcus Brinkmann <marcus@g10code.de>
* debug.c:;5B Include <errno.h> and "debug.h".
(_gpgme_debug): Save and restore ERRNO.
(TOHEX): New macro.
(_gpgme_debug_buffer): New function.
* conversion.c, data-compat.c, data-mem.c, data.c, engine-gpgsm.c,
gpgme.c, keylist.c, posix-io.c, rungpg.c, sign.c, version.c,
w32-io.c, wait.c: Replace DEBUG macros by TRACE_* variants. In
most of these files, add many more tracepoints.
2007-07-17 12:36:04 +00:00
|
|
|
|
#include "debug.h"
|
2001-01-30 11:01:41 +00:00
|
|
|
|
|
2002-05-08 03:57:42 +00:00
|
|
|
|
|
|
|
|
|
/* Lock to serialize initialization of the debug output subsystem and
|
|
|
|
|
output of actual debug messages. */
|
2001-01-30 11:01:41 +00:00
|
|
|
|
DEFINE_STATIC_LOCK (debug_lock);
|
|
|
|
|
|
2002-05-08 03:57:42 +00:00
|
|
|
|
/* The amount of detail requested by the user, per environment
|
|
|
|
|
variable GPGME_DEBUG. */
|
|
|
|
|
static int debug_level;
|
2001-01-30 11:01:41 +00:00
|
|
|
|
|
2002-05-08 03:57:42 +00:00
|
|
|
|
/* The output stream for the debug messages. */
|
|
|
|
|
static FILE *errfp;
|
2001-04-02 08:40:32 +00:00
|
|
|
|
|
2002-05-08 03:57:42 +00:00
|
|
|
|
|
|
|
|
|
/* Remove leading and trailing white spaces. */
|
2001-04-02 08:40:32 +00:00
|
|
|
|
static char *
|
2002-05-08 03:57:42 +00:00
|
|
|
|
trim_spaces (char *str)
|
2001-04-02 08:40:32 +00:00
|
|
|
|
{
|
2002-05-08 03:57:42 +00:00
|
|
|
|
char *string, *p, *mark;
|
|
|
|
|
|
|
|
|
|
string = str;
|
|
|
|
|
/* Find first non space character. */
|
2003-01-29 19:50:43 +00:00
|
|
|
|
for (p = string; *p && isspace (*(unsigned char *) p); p++)
|
2002-05-08 03:57:42 +00:00
|
|
|
|
;
|
|
|
|
|
/* Move characters. */
|
|
|
|
|
for (mark = NULL; (*string = *p); string++, p++)
|
2003-01-29 19:50:43 +00:00
|
|
|
|
if (isspace (*(unsigned char *) p))
|
2002-05-08 03:57:42 +00:00
|
|
|
|
{
|
|
|
|
|
if (!mark)
|
|
|
|
|
mark = string;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
mark = NULL;
|
|
|
|
|
if (mark)
|
|
|
|
|
*mark = '\0'; /* Remove trailing spaces. */
|
|
|
|
|
|
|
|
|
|
return str;
|
2001-04-02 08:40:32 +00:00
|
|
|
|
}
|
|
|
|
|
|
2001-01-30 11:01:41 +00:00
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
debug_init (void)
|
|
|
|
|
{
|
2002-05-08 03:57:42 +00:00
|
|
|
|
static int initialized;
|
|
|
|
|
|
|
|
|
|
LOCK (debug_lock);
|
|
|
|
|
if (!initialized)
|
|
|
|
|
{
|
2003-09-13 17:45:04 +00:00
|
|
|
|
gpgme_error_t err;
|
2003-10-06 14:50:19 +00:00
|
|
|
|
char *e;
|
2002-05-08 03:57:42 +00:00
|
|
|
|
const char *s1, *s2;;
|
|
|
|
|
|
2003-09-13 17:45:04 +00:00
|
|
|
|
err = _gpgme_getenv ("GPGME_DEBUG", &e);
|
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
UNLOCK (debug_lock);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2002-05-08 03:57:42 +00:00
|
|
|
|
initialized = 1;
|
|
|
|
|
errfp = stderr;
|
|
|
|
|
if (e)
|
|
|
|
|
{
|
|
|
|
|
debug_level = atoi (e);
|
2005-08-26 12:38:57 +00:00
|
|
|
|
s1 = strchr (e, PATHSEP_C);
|
2002-05-08 03:57:42 +00:00
|
|
|
|
if (s1)
|
|
|
|
|
{
|
2001-04-02 08:40:32 +00:00
|
|
|
|
#ifndef HAVE_DOSISH_SYSTEM
|
2002-05-08 03:57:42 +00:00
|
|
|
|
if (getuid () == geteuid ())
|
|
|
|
|
{
|
2001-04-02 08:40:32 +00:00
|
|
|
|
#endif
|
2002-05-08 03:57:42 +00:00
|
|
|
|
char *p;
|
|
|
|
|
FILE *fp;
|
|
|
|
|
|
|
|
|
|
s1++;
|
2005-08-26 12:38:57 +00:00
|
|
|
|
if (!(s2 = strchr (s1, PATHSEP_C)))
|
2002-05-08 03:57:42 +00:00
|
|
|
|
s2 = s1 + strlen (s1);
|
2002-10-08 Marcus Brinkmann <marcus@g10code.de>
* util.h (_gpgme_malloc, _gpgme_realloc, _gpgme_calloc,
_gpgme_strdup, _gpgme_free): Remove prototypes.
(xtrymalloc, xtrycalloc, xtryrealloc, xtrystrdup, xfree): Remove
macros.
* util.c: File removed.
* Makefile.am (libgpgme_la_SOURCES): Remove util.h.
* conversion.c (_gpgme_decode_c_string): Use malloc instead of
xtrymalloc, realloc instead of xtryrealloc, calloc instead of
xtrycalloc, free instead of xfree.
(_gpgme_data_append_percentstring_for_xml): Likewise.
* data.c (_gpgme_data_new, _gpgme_data_release): Likewise.
* data-compat.c (gpgme_data_new_from_filepart): Likewise.
* data-mem.c (mem_write, mem_release, gpgme_data_new_from_mem,
_gpgme_data_get_as_string): Likewise.
* debug.c (debug_init): Likewise.
* decrypt.c (_gpgme_release_decrypt_result): Likewise.
* delete.c (_gpgme_release_delete_result): Likewise.
* edit.c (_gpgme_release_edit_result, _gpgme_op_edit_start):
Likewise.
* encrypt.c (_gpgme_release_encrypt_result): Likewise.
* engine.c (_gpgme_engine_get_info, _gpgme_engine_new,
_gpgme_engine_release): Likewise.
* engine-gpgsm.c (_gpgme_gpgsm_new, _gpgme_gpgsm_release,
_gpgme_gpgsm_op_decrypt, _gpgme_gpgsm_op_delete,
gpgsm_set_recipients, _gpgme_gpgsm_op_encrypt,
_gpgme_gpgsm_op_export, _gpgme_gpgsm_op_genkey,
_gpgme_gpgsm_op_import, _gpgme_gpgsm_op_keylist,
_gpgme_gpgsm_op_keylist_ext, _gpgme_gpgsm_op_sign,
_gpgme_gpgsm_op_verify, gpgsm_status_handler): Likewise.
* genkey.c (_gpgme_release_genkey_result): Likewise.
* gpgme.c (gpgme_new, gpgme_release): Likewise.
* import.c (_gpgme_release_import_result): Likewise.
* key.c (_gpgme_key_cache_init, _gpgme_key_cache_add, key_new,
add_subkey, gpgme_key_release, _gpgme_key_append_name): Likewise.
* keylist.c (_gpgme_release_keylist_result, keylist_colon_handler,
_gpgme_op_keylist_event_cb, gpgme_op_keylist_next): Likewise.
* ops.h (test_and_allocate_result): Likewise.
* passphrase.c (_gpgme_release_passphrase_result,
_gpgme_passphrase_status_handler,
_gpgme_passphrase_command_handler): Likewise.
* progress.c (_gpgme_progress_status_handler): Likewise.
* recipient.c (gpgme_recipients_new, gpgme_recipients_release,
gpgme_recipients_add_name_with_validity): Likewise.
* rungpg.c (_gpgme_gpg_new, _gpgme_gpg_release,
_gpgme_gpg_add_arg, _gpgme_gpg_add_data,
_gpgme_gpg_set_colon_line_handler, free_argv, free_fd_data_map,
build_argv, _gpgme_gpg_spawn, read_status, read_colon_line):
Likewise.
* sign.c (_gpgme_release_sign_result): Likewise.
* signers.c (_gpgme_signers_add): Likewise.
* trustlist.c (trust_item_new, trustlist_colon_handler,
_gpgme_op_trustlist_event_cb, gpgme_op_trustlist_next,
gpgme_trustitem_release): Likewise.
* verify.c (_gpgme_release_verify_result, finish_sig): Likewise.
* version.c (gpgme_get_engine_info, _gpgme_get_program_version):
Likewise.
* w32-io.c (create_reader, create_writer, destroy_reader,
destroy_writer, build_commandline, _gpgme_io_spawn): Likewise.
* w32-sema.c (critsect_init, _gpgme_sema_cs_destroy): Likewise.
* w32-util.c (read_w32_registry_string): Likewise.
* wait.c (_gpgme_fd_table_deinit, _gpgme_fd_table_put,
_gpgme_wait_event_cb, _gpgme_add_io_cb, _gpgme_remove_io_cb)
* data-compat.c: Include <stdlib.h>.
2002-10-09 01:08:21 +00:00
|
|
|
|
p = malloc (s2 - s1 + 1);
|
2002-05-08 03:57:42 +00:00
|
|
|
|
if (p)
|
|
|
|
|
{
|
|
|
|
|
memcpy (p, s1, s2 - s1);
|
|
|
|
|
p[s2-s1] = 0;
|
|
|
|
|
trim_spaces (p);
|
|
|
|
|
fp = fopen (p,"a");
|
|
|
|
|
if (fp)
|
|
|
|
|
{
|
|
|
|
|
setvbuf (fp, NULL, _IOLBF, 0);
|
|
|
|
|
errfp = fp;
|
|
|
|
|
}
|
2002-10-08 Marcus Brinkmann <marcus@g10code.de>
* util.h (_gpgme_malloc, _gpgme_realloc, _gpgme_calloc,
_gpgme_strdup, _gpgme_free): Remove prototypes.
(xtrymalloc, xtrycalloc, xtryrealloc, xtrystrdup, xfree): Remove
macros.
* util.c: File removed.
* Makefile.am (libgpgme_la_SOURCES): Remove util.h.
* conversion.c (_gpgme_decode_c_string): Use malloc instead of
xtrymalloc, realloc instead of xtryrealloc, calloc instead of
xtrycalloc, free instead of xfree.
(_gpgme_data_append_percentstring_for_xml): Likewise.
* data.c (_gpgme_data_new, _gpgme_data_release): Likewise.
* data-compat.c (gpgme_data_new_from_filepart): Likewise.
* data-mem.c (mem_write, mem_release, gpgme_data_new_from_mem,
_gpgme_data_get_as_string): Likewise.
* debug.c (debug_init): Likewise.
* decrypt.c (_gpgme_release_decrypt_result): Likewise.
* delete.c (_gpgme_release_delete_result): Likewise.
* edit.c (_gpgme_release_edit_result, _gpgme_op_edit_start):
Likewise.
* encrypt.c (_gpgme_release_encrypt_result): Likewise.
* engine.c (_gpgme_engine_get_info, _gpgme_engine_new,
_gpgme_engine_release): Likewise.
* engine-gpgsm.c (_gpgme_gpgsm_new, _gpgme_gpgsm_release,
_gpgme_gpgsm_op_decrypt, _gpgme_gpgsm_op_delete,
gpgsm_set_recipients, _gpgme_gpgsm_op_encrypt,
_gpgme_gpgsm_op_export, _gpgme_gpgsm_op_genkey,
_gpgme_gpgsm_op_import, _gpgme_gpgsm_op_keylist,
_gpgme_gpgsm_op_keylist_ext, _gpgme_gpgsm_op_sign,
_gpgme_gpgsm_op_verify, gpgsm_status_handler): Likewise.
* genkey.c (_gpgme_release_genkey_result): Likewise.
* gpgme.c (gpgme_new, gpgme_release): Likewise.
* import.c (_gpgme_release_import_result): Likewise.
* key.c (_gpgme_key_cache_init, _gpgme_key_cache_add, key_new,
add_subkey, gpgme_key_release, _gpgme_key_append_name): Likewise.
* keylist.c (_gpgme_release_keylist_result, keylist_colon_handler,
_gpgme_op_keylist_event_cb, gpgme_op_keylist_next): Likewise.
* ops.h (test_and_allocate_result): Likewise.
* passphrase.c (_gpgme_release_passphrase_result,
_gpgme_passphrase_status_handler,
_gpgme_passphrase_command_handler): Likewise.
* progress.c (_gpgme_progress_status_handler): Likewise.
* recipient.c (gpgme_recipients_new, gpgme_recipients_release,
gpgme_recipients_add_name_with_validity): Likewise.
* rungpg.c (_gpgme_gpg_new, _gpgme_gpg_release,
_gpgme_gpg_add_arg, _gpgme_gpg_add_data,
_gpgme_gpg_set_colon_line_handler, free_argv, free_fd_data_map,
build_argv, _gpgme_gpg_spawn, read_status, read_colon_line):
Likewise.
* sign.c (_gpgme_release_sign_result): Likewise.
* signers.c (_gpgme_signers_add): Likewise.
* trustlist.c (trust_item_new, trustlist_colon_handler,
_gpgme_op_trustlist_event_cb, gpgme_op_trustlist_next,
gpgme_trustitem_release): Likewise.
* verify.c (_gpgme_release_verify_result, finish_sig): Likewise.
* version.c (gpgme_get_engine_info, _gpgme_get_program_version):
Likewise.
* w32-io.c (create_reader, create_writer, destroy_reader,
destroy_writer, build_commandline, _gpgme_io_spawn): Likewise.
* w32-sema.c (critsect_init, _gpgme_sema_cs_destroy): Likewise.
* w32-util.c (read_w32_registry_string): Likewise.
* wait.c (_gpgme_fd_table_deinit, _gpgme_fd_table_put,
_gpgme_wait_event_cb, _gpgme_add_io_cb, _gpgme_remove_io_cb)
* data-compat.c: Include <stdlib.h>.
2002-10-09 01:08:21 +00:00
|
|
|
|
free (p);
|
2002-05-08 03:57:42 +00:00
|
|
|
|
}
|
|
|
|
|
#ifndef HAVE_DOSISH_SYSTEM
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
}
|
2003-09-13 17:45:04 +00:00
|
|
|
|
free (e);
|
2001-04-02 08:40:32 +00:00
|
|
|
|
}
|
|
|
|
|
|
2002-05-08 03:57:42 +00:00
|
|
|
|
if (debug_level > 0)
|
2007-08-02 14:59:01 +00:00
|
|
|
|
fprintf (errfp, "gpgme_debug: level=%d\n", debug_level);
|
|
|
|
|
#ifdef HAVE_ASSUAN_H
|
|
|
|
|
assuan_set_assuan_log_prefix ("gpgme-assuan");
|
2009-03-06 22:29:49 +00:00
|
|
|
|
assuan_set_assuan_log_stream (debug_level > 0 ? errfp : NULL);
|
2007-08-02 14:59:01 +00:00
|
|
|
|
#endif /* HAVE_ASSUAN_H*/
|
2001-01-30 11:01:41 +00:00
|
|
|
|
}
|
2002-05-08 03:57:42 +00:00
|
|
|
|
UNLOCK (debug_lock);
|
2001-04-02 08:40:32 +00:00
|
|
|
|
}
|
2001-01-30 11:01:41 +00:00
|
|
|
|
|
2007-08-02 14:59:01 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* This should be called as soon as the locks are intialized. It is
|
|
|
|
|
required so that the assuan logging gets conncted to the gpgme log
|
|
|
|
|
stream as early as possible. */
|
|
|
|
|
void
|
|
|
|
|
_gpgme_debug_subsystem_init (void)
|
|
|
|
|
{
|
|
|
|
|
debug_init ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2002-05-08 03:57:42 +00:00
|
|
|
|
|
|
|
|
|
/* Log the formatted string FORMAT at debug level LEVEL or higher. */
|
2001-01-30 11:01:41 +00:00
|
|
|
|
void
|
|
|
|
|
_gpgme_debug (int level, const char *format, ...)
|
|
|
|
|
{
|
2002-05-08 03:57:42 +00:00
|
|
|
|
va_list arg_ptr;
|
2007-07-17 Marcus Brinkmann <marcus@g10code.de>
* debug.c:;5B Include <errno.h> and "debug.h".
(_gpgme_debug): Save and restore ERRNO.
(TOHEX): New macro.
(_gpgme_debug_buffer): New function.
* conversion.c, data-compat.c, data-mem.c, data.c, engine-gpgsm.c,
gpgme.c, keylist.c, posix-io.c, rungpg.c, sign.c, version.c,
w32-io.c, wait.c: Replace DEBUG macros by TRACE_* variants. In
most of these files, add many more tracepoints.
2007-07-17 12:36:04 +00:00
|
|
|
|
int saved_errno;
|
|
|
|
|
|
|
|
|
|
saved_errno = errno;
|
2001-01-30 11:01:41 +00:00
|
|
|
|
|
2002-05-08 03:57:42 +00:00
|
|
|
|
debug_init ();
|
|
|
|
|
if (debug_level < level)
|
|
|
|
|
return;
|
2001-01-30 11:01:41 +00:00
|
|
|
|
|
2002-05-08 03:57:42 +00:00
|
|
|
|
va_start (arg_ptr, format);
|
|
|
|
|
LOCK (debug_lock);
|
|
|
|
|
vfprintf (errfp, format, arg_ptr);
|
|
|
|
|
va_end (arg_ptr);
|
|
|
|
|
if(format && *format && format[strlen (format) - 1] != '\n')
|
|
|
|
|
putc ('\n', errfp);
|
|
|
|
|
UNLOCK (debug_lock);
|
|
|
|
|
fflush (errfp);
|
2007-07-17 Marcus Brinkmann <marcus@g10code.de>
* debug.c:;5B Include <errno.h> and "debug.h".
(_gpgme_debug): Save and restore ERRNO.
(TOHEX): New macro.
(_gpgme_debug_buffer): New function.
* conversion.c, data-compat.c, data-mem.c, data.c, engine-gpgsm.c,
gpgme.c, keylist.c, posix-io.c, rungpg.c, sign.c, version.c,
w32-io.c, wait.c: Replace DEBUG macros by TRACE_* variants. In
most of these files, add many more tracepoints.
2007-07-17 12:36:04 +00:00
|
|
|
|
|
|
|
|
|
errno = saved_errno;
|
2001-01-30 11:01:41 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2002-05-08 03:57:42 +00:00
|
|
|
|
/* Start a new debug line in *LINE, logged at level LEVEL or higher,
|
|
|
|
|
and starting with the formatted string FORMAT. */
|
2001-01-30 11:01:41 +00:00
|
|
|
|
void
|
2002-05-08 03:57:42 +00:00
|
|
|
|
_gpgme_debug_begin (void **line, int level, const char *format, ...)
|
2001-01-30 11:01:41 +00:00
|
|
|
|
{
|
2002-05-08 03:57:42 +00:00
|
|
|
|
va_list arg_ptr;
|
2009-06-22 14:50:17 +00:00
|
|
|
|
int res;
|
2001-01-30 11:01:41 +00:00
|
|
|
|
|
2002-05-08 03:57:42 +00:00
|
|
|
|
debug_init ();
|
|
|
|
|
if (debug_level < level)
|
2001-06-12 07:37:15 +00:00
|
|
|
|
{
|
2002-05-08 03:57:42 +00:00
|
|
|
|
/* Disable logging of this line. */
|
|
|
|
|
*line = NULL;
|
|
|
|
|
return;
|
2001-06-12 07:37:15 +00:00
|
|
|
|
}
|
2001-01-30 11:01:41 +00:00
|
|
|
|
|
2002-05-08 03:57:42 +00:00
|
|
|
|
va_start (arg_ptr, format);
|
2009-06-22 14:50:17 +00:00
|
|
|
|
res = vasprintf ((char **) line, format, arg_ptr);
|
2002-05-08 03:57:42 +00:00
|
|
|
|
va_end (arg_ptr);
|
2009-06-22 14:50:17 +00:00
|
|
|
|
if (res < 0)
|
|
|
|
|
*line = NULL;
|
2001-01-30 11:01:41 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2002-05-08 03:57:42 +00:00
|
|
|
|
/* Add the formatted string FORMAT to the debug line *LINE. */
|
2001-01-30 11:01:41 +00:00
|
|
|
|
void
|
2002-05-08 03:57:42 +00:00
|
|
|
|
_gpgme_debug_add (void **line, const char *format, ...)
|
2001-01-30 11:01:41 +00:00
|
|
|
|
{
|
2002-05-08 03:57:42 +00:00
|
|
|
|
va_list arg_ptr;
|
|
|
|
|
char *toadd;
|
|
|
|
|
char *result;
|
2009-06-22 14:50:17 +00:00
|
|
|
|
int res;
|
2002-05-08 03:57:42 +00:00
|
|
|
|
|
2002-09-02 12:29:53 +00:00
|
|
|
|
if (!*line)
|
2002-05-08 03:57:42 +00:00
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
va_start (arg_ptr, format);
|
2009-06-22 14:50:17 +00:00
|
|
|
|
res = vasprintf (&toadd, format, arg_ptr);
|
2002-05-08 03:57:42 +00:00
|
|
|
|
va_end (arg_ptr);
|
2009-06-22 14:50:17 +00:00
|
|
|
|
if (res < 0)
|
|
|
|
|
{
|
|
|
|
|
free (*line);
|
|
|
|
|
*line = NULL;
|
|
|
|
|
}
|
|
|
|
|
res = asprintf (&result, "%s%s", *(char **) line, toadd);
|
2002-05-08 03:57:42 +00:00
|
|
|
|
free (toadd);
|
2009-06-22 14:50:17 +00:00
|
|
|
|
free (*line);
|
|
|
|
|
if (res < 0)
|
|
|
|
|
*line = NULL;
|
|
|
|
|
else
|
|
|
|
|
*line = result;
|
2001-01-30 11:01:41 +00:00
|
|
|
|
}
|
|
|
|
|
|
2002-05-08 03:57:42 +00:00
|
|
|
|
|
|
|
|
|
/* Finish construction of *LINE and send it to the debug output
|
|
|
|
|
stream. */
|
2001-01-30 11:01:41 +00:00
|
|
|
|
void
|
2002-05-08 03:57:42 +00:00
|
|
|
|
_gpgme_debug_end (void **line)
|
2001-01-30 11:01:41 +00:00
|
|
|
|
{
|
2002-09-02 12:29:53 +00:00
|
|
|
|
if (!*line)
|
2002-05-08 03:57:42 +00:00
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
/* The smallest possible level is 1, so force logging here by
|
|
|
|
|
using that. */
|
|
|
|
|
_gpgme_debug (1, "%s", *line);
|
|
|
|
|
free (*line);
|
|
|
|
|
*line = NULL;
|
2001-01-30 11:01:41 +00:00
|
|
|
|
}
|
2007-07-17 Marcus Brinkmann <marcus@g10code.de>
* debug.c:;5B Include <errno.h> and "debug.h".
(_gpgme_debug): Save and restore ERRNO.
(TOHEX): New macro.
(_gpgme_debug_buffer): New function.
* conversion.c, data-compat.c, data-mem.c, data.c, engine-gpgsm.c,
gpgme.c, keylist.c, posix-io.c, rungpg.c, sign.c, version.c,
w32-io.c, wait.c: Replace DEBUG macros by TRACE_* variants. In
most of these files, add many more tracepoints.
2007-07-17 12:36:04 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#define TOHEX(val) (((val) < 10) ? ((val) + '0') : ((val) - 10 + 'a'))
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
_gpgme_debug_buffer (int lvl, const char *const fmt,
|
|
|
|
|
const char *const func, const char *const tagname,
|
|
|
|
|
void *tag, const char *const buffer, size_t len)
|
|
|
|
|
{
|
|
|
|
|
int idx = 0;
|
|
|
|
|
int j;
|
|
|
|
|
|
|
|
|
|
if (!_gpgme_debug_trace ())
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
while (idx < len)
|
|
|
|
|
{
|
|
|
|
|
char str[51];
|
|
|
|
|
char *strp = str;
|
|
|
|
|
char *strp2 = &str[34];
|
|
|
|
|
|
|
|
|
|
for (j = 0; j < 16; j++)
|
|
|
|
|
{
|
|
|
|
|
unsigned char val;
|
|
|
|
|
if (idx < len)
|
|
|
|
|
{
|
|
|
|
|
val = buffer[idx++];
|
|
|
|
|
*(strp++) = TOHEX (val >> 4);
|
|
|
|
|
*(strp++) = TOHEX (val % 16);
|
|
|
|
|
*(strp2++) = isprint (val) ? val : '.';
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
*(strp++) = ' ';
|
|
|
|
|
*(strp++) = ' ';
|
|
|
|
|
}
|
|
|
|
|
if (j == 7)
|
|
|
|
|
*(strp++) = ' ';
|
|
|
|
|
}
|
|
|
|
|
*(strp++) = ' ';
|
|
|
|
|
*(strp2) = '\0';
|
|
|
|
|
|
|
|
|
|
_gpgme_debug (lvl, fmt, func, tagname, tag, str);
|
|
|
|
|
}
|
|
|
|
|
}
|