[git] GnuPG - branch, master, updated. gnupg-2.2.7-150-g4404726
by Werner Koch
cvs at cvs.gnupg.org
Tue Jun 12 13:45:41 CEST 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".
The branch, master has been updated
via 440472663d608660343c54f09172c851f5127c9c (commit)
from fe621cc64b13b00914633630f28b4b417892d629 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 440472663d608660343c54f09172c851f5127c9c
Author: Werner Koch <wk at gnupg.org>
Date: Tue Jun 12 13:46:00 2018 +0200
Require libgpg-error 1.29 and remove internal logging functions.
* configure.ac (NEED_GPG_ERROR_VERSION): Set to 1.29
* common/util.h: Remove replacement error codes.
* common/logging.h: Remove fallback to internal logging functions.
* common/logging.c: Remove.
* common/Makefile.am (common_sources): Remove logging.c
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/common/Makefile.am b/common/Makefile.am
index 94318da..d288fa3 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -49,7 +49,7 @@ common_sources = \
strlist.c strlist.h \
utf8conv.c utf8conv.h \
argparse.c argparse.h \
- logging.c logging.h \
+ logging.h \
dotlock.c dotlock.h \
mischelp.c mischelp.h \
status.c status.h\
diff --git a/common/logging.c b/common/logging.c
deleted file mode 100644
index 88860e7..0000000
--- a/common/logging.c
+++ /dev/null
@@ -1,1121 +0,0 @@
-/* logging.c - Useful logging functions
- * Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
- * 2009, 2010 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG is free software; you can redistribute and/or modify this
- * part of GnuPG under the terms of either
- *
- * - the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 3 of the License, or (at
- * your option) any later version.
- *
- * or
- *
- * - 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.
- *
- * or both in parallel, as here.
- *
- * GnuPG 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 copies of the GNU General Public License
- * and the GNU Lesser General Public License along with this program;
- * if not, see <https://www.gnu.org/licenses/>.
- */
-
-
-#include <config.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <errno.h>
-#include <time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#ifdef HAVE_W32_SYSTEM
-# ifdef HAVE_WINSOCK2_H
-# include <winsock2.h>
-# endif
-# include <windows.h>
-#else /*!HAVE_W32_SYSTEM*/
-# include <sys/socket.h>
-# include <sys/un.h>
-# include <netinet/in.h>
-# include <arpa/inet.h>
-#endif /*!HAVE_W32_SYSTEM*/
-#include <unistd.h>
-#include <fcntl.h>
-#include <assert.h>
-/* #include <execinfo.h> */
-
-#define GNUPG_COMMON_NEED_AFLOCAL 1
-#include "util.h"
-#include "i18n.h"
-#include "common-defs.h"
-#include "logging.h"
-#include "sysutils.h"
-
-#if defined(GPGRT_ENABLE_LOG_MACROS) && defined(log_debug_string)
- /* Nothing to do; the libgpgrt functions are used. */
-#else /* Use our own logging functions. */
-
-#ifdef HAVE_W32_SYSTEM
-# ifndef S_IRWXG
-# define S_IRGRP S_IRUSR
-# define S_IWGRP S_IWUSR
-# endif
-# ifndef S_IRWXO
-# define S_IROTH S_IRUSR
-# define S_IWOTH S_IWUSR
-# endif
-#endif
-
-
-#ifdef HAVE_W32CE_SYSTEM
-# define isatty(a) (0)
-#endif
-
-#undef WITH_IPV6
-#if defined (AF_INET6) && defined(PF_INET) \
- && defined (INET6_ADDRSTRLEN) && defined(HAVE_INET_PTON)
-# define WITH_IPV6 1
-#endif
-
-#ifndef EAFNOSUPPORT
-# define EAFNOSUPPORT EINVAL
-#endif
-#ifndef INADDR_NONE /* Slowaris is missing that. */
-#define INADDR_NONE ((unsigned long)(-1))
-#endif /*INADDR_NONE*/
-
-#ifdef HAVE_W32_SYSTEM
-#define sock_close(a) closesocket(a)
-#else
-#define sock_close(a) close(a)
-#endif
-
-
-static estream_t logstream;
-static int log_socket = -1;
-static char prefix_buffer[80];
-static int with_time;
-static int with_prefix;
-static int with_pid;
-#ifdef HAVE_W32_SYSTEM
-static int no_registry;
-#endif
-static int (*get_pid_suffix_cb)(unsigned long *r_value);
-static const char * (*socket_dir_cb)(void);
-static int running_detached;
-static int force_prefixes;
-
-static int missing_lf;
-static int errorcount;
-
-
-int
-log_get_errorcount (int clear)
-{
- int n = errorcount;
- if( clear )
- errorcount = 0;
- return n;
-}
-
-void
-log_inc_errorcount (void)
-{
- errorcount++;
-}
-
-
-/* The following 3 functions are used by es_fopencookie to write logs
- to a socket. */
-struct fun_cookie_s
-{
- int fd;
- int quiet;
- int want_socket;
- int is_socket;
-#ifdef HAVE_W32CE_SYSTEM
- int use_writefile;
-#endif
- char name[1];
-};
-
-
-/* Write NBYTES of BUFFER to file descriptor FD. */
-static int
-writen (int fd, const void *buffer, size_t nbytes, int is_socket)
-{
- const char *buf = buffer;
- size_t nleft = nbytes;
- int nwritten;
-#ifndef HAVE_W32_SYSTEM
- (void)is_socket; /* Not required. */
-#endif
-
- while (nleft > 0)
- {
-#ifdef HAVE_W32_SYSTEM
- if (is_socket)
- nwritten = send (fd, buf, nleft, 0);
- else
-#endif
- nwritten = write (fd, buf, nleft);
-
- if (nwritten < 0 && errno == EINTR)
- continue;
- if (nwritten < 0)
- return -1;
- nleft -= nwritten;
- buf = buf + nwritten;
- }
-
- return 0;
-}
-
-
-/* Returns true if STR represents a valid port number in decimal
- notation and no garbage is following. */
-static int
-parse_portno (const char *str, unsigned short *r_port)
-{
- unsigned int value;
-
- for (value=0; *str && (*str >= '0' && *str <= '9'); str++)
- {
- value = value * 10 + (*str - '0');
- if (value > 65535)
- return 0;
- }
- if (*str || !value)
- return 0;
-
- *r_port = value;
- return 1;
-}
-
-
-static gpgrt_ssize_t
-fun_writer (void *cookie_arg, const void *buffer, size_t size)
-{
- struct fun_cookie_s *cookie = cookie_arg;
-
- /* FIXME: Use only estream with a callback for socket writing. This
- avoids the ugly mix of fd and estream code. */
-
- /* Note that we always try to reconnect to the socket but print
- error messages only the first time an error occurred. If
- RUNNING_DETACHED is set we don't fall back to stderr and even do
- not print any error messages. This is needed because detached
- processes often close stderr and by writing to file descriptor 2
- we might send the log message to a file not intended for logging
- (e.g. a pipe or network connection). */
- if (cookie->want_socket && cookie->fd == -1)
- {
-#ifdef WITH_IPV6
- struct sockaddr_in6 srvr_addr_in6;
-#endif
- struct sockaddr_in srvr_addr_in;
-#ifndef HAVE_W32_SYSTEM
- struct sockaddr_un srvr_addr_un;
-#endif
- const char *name_for_err = "";
- size_t addrlen;
- struct sockaddr *srvr_addr = NULL;
- unsigned short port = 0;
- int af = AF_LOCAL;
- int pf = PF_LOCAL;
- const char *name = cookie->name;
-
- /* Not yet open or meanwhile closed due to an error. */
- cookie->is_socket = 0;
-
- /* Check whether this is a TCP socket or a local socket. */
- if (!strncmp (name, "tcp://", 6) && name[6])
- {
- name += 6;
- af = AF_INET;
- pf = PF_INET;
- }
-#ifndef HAVE_W32_SYSTEM
- else if (!strncmp (name, "socket://", 9))
- name += 9;
-#endif
-
- if (af == AF_LOCAL)
- {
- addrlen = 0;
-#ifndef HAVE_W32_SYSTEM
- memset (&srvr_addr, 0, sizeof srvr_addr);
- srvr_addr_un.sun_family = af;
- if (!*name && (name = socket_dir_cb ()) && *name)
- {
- if (strlen (name) + 7 < sizeof (srvr_addr_un.sun_path)-1)
- {
- strncpy (srvr_addr_un.sun_path,
- name, sizeof (srvr_addr_un.sun_path)-1);
- strcat (srvr_addr_un.sun_path, "/S.log");
- srvr_addr_un.sun_path[sizeof (srvr_addr_un.sun_path)-1] = 0;
- srvr_addr = (struct sockaddr *)&srvr_addr_un;
- addrlen = SUN_LEN (&srvr_addr_un);
- name_for_err = srvr_addr_un.sun_path;
- }
- }
- else
- {
- if (*name && strlen (name) < sizeof (srvr_addr_un.sun_path)-1)
- {
- strncpy (srvr_addr_un.sun_path,
- name, sizeof (srvr_addr_un.sun_path)-1);
- srvr_addr_un.sun_path[sizeof (srvr_addr_un.sun_path)-1] = 0;
- srvr_addr = (struct sockaddr *)&srvr_addr_un;
- addrlen = SUN_LEN (&srvr_addr_un);
- }
- }
-#endif /*!HAVE_W32SYSTEM*/
- }
- else
- {
- char *addrstr, *p;
-#ifdef HAVE_INET_PTON
- void *addrbuf = NULL;
-#endif /*HAVE_INET_PTON*/
-
- addrstr = xtrymalloc (strlen (name) + 1);
- if (!addrstr)
- addrlen = 0; /* This indicates an error. */
- else if (*name == '[')
- {
- /* Check for IPv6 literal address. */
- strcpy (addrstr, name+1);
- p = strchr (addrstr, ']');
- if (!p || p[1] != ':' || !parse_portno (p+2, &port))
- {
- gpg_err_set_errno (EINVAL);
- addrlen = 0;
- }
- else
- {
- *p = 0;
-#ifdef WITH_IPV6
- af = AF_INET6;
- pf = PF_INET6;
- memset (&srvr_addr_in6, 0, sizeof srvr_addr_in6);
- srvr_addr_in6.sin6_family = af;
- srvr_addr_in6.sin6_port = htons (port);
-#ifdef HAVE_INET_PTON
- addrbuf = &srvr_addr_in6.sin6_addr;
-#endif /*HAVE_INET_PTON*/
- srvr_addr = (struct sockaddr *)&srvr_addr_in6;
- addrlen = sizeof srvr_addr_in6;
-#else
- gpg_err_set_errno (EAFNOSUPPORT);
- addrlen = 0;
-#endif
- }
- }
- else
- {
- /* Check for IPv4 literal address. */
- strcpy (addrstr, name);
- p = strchr (addrstr, ':');
- if (!p || !parse_portno (p+1, &port))
- {
- gpg_err_set_errno (EINVAL);
- addrlen = 0;
- }
- else
- {
- *p = 0;
- memset (&srvr_addr_in, 0, sizeof srvr_addr_in);
- srvr_addr_in.sin_family = af;
- srvr_addr_in.sin_port = htons (port);
-#ifdef HAVE_INET_PTON
- addrbuf = &srvr_addr_in.sin_addr;
-#endif /*HAVE_INET_PTON*/
- srvr_addr = (struct sockaddr *)&srvr_addr_in;
- addrlen = sizeof srvr_addr_in;
- }
- }
-
- if (addrlen)
- {
-#ifdef HAVE_INET_PTON
- if (inet_pton (af, addrstr, addrbuf) != 1)
- addrlen = 0;
-#else /*!HAVE_INET_PTON*/
- /* We need to use the old function. If we are here v6
- support isn't enabled anyway and thus we can do fine
- without. Note that Windows has a compatible inet_pton
- function named inetPton, but only since Vista. */
- srvr_addr_in.sin_addr.s_addr = inet_addr (addrstr);
- if (srvr_addr_in.sin_addr.s_addr == INADDR_NONE)
- addrlen = 0;
-#endif /*!HAVE_INET_PTON*/
- }
-
- xfree (addrstr);
- }
-
- cookie->fd = addrlen? socket (pf, SOCK_STREAM, 0) : -1;
- if (cookie->fd == -1)
- {
- if (!cookie->quiet && !running_detached
- && isatty (es_fileno (es_stderr)))
- es_fprintf (es_stderr, "failed to create socket for logging: %s\n",
- strerror(errno));
- }
- else
- {
- if (connect (cookie->fd, srvr_addr, addrlen) == -1)
- {
- if (!cookie->quiet && !running_detached
- && isatty (es_fileno (es_stderr)))
- es_fprintf (es_stderr, "can't connect to '%s%s': %s\n",
- cookie->name, name_for_err, strerror(errno));
- sock_close (cookie->fd);
- cookie->fd = -1;
- }
- }
-
- if (cookie->fd == -1)
- {
- if (!running_detached)
- {
- /* Due to all the problems with apps not running
- detached but being called with stderr closed or used
- for a different purposes, it does not make sense to
- switch to stderr. We therefore disable it. */
- if (!cookie->quiet)
- {
- /* fputs ("switching logging to stderr\n", stderr);*/
- cookie->quiet = 1;
- }
- cookie->fd = -1; /*fileno (stderr);*/
- }
- }
- else /* Connection has been established. */
- {
- cookie->quiet = 0;
- cookie->is_socket = 1;
- }
- }
-
- log_socket = cookie->fd;
- if (cookie->fd != -1)
- {
-#ifdef HAVE_W32CE_SYSTEM
- if (cookie->use_writefile)
- {
- DWORD nwritten;
-
- WriteFile ((HANDLE)cookie->fd, buffer, size, &nwritten, NULL);
- return (gpgrt_ssize_t)size; /* Okay. */
- }
-#endif
- if (!writen (cookie->fd, buffer, size, cookie->is_socket))
- return (gpgrt_ssize_t)size; /* Okay. */
- }
-
- if (!running_detached && cookie->fd != -1
- && isatty (es_fileno (es_stderr)))
- {
- if (*cookie->name)
- es_fprintf (es_stderr, "error writing to '%s': %s\n",
- cookie->name, strerror(errno));
- else
- es_fprintf (es_stderr, "error writing to file descriptor %d: %s\n",
- cookie->fd, strerror(errno));
- }
- if (cookie->is_socket && cookie->fd != -1)
- {
- sock_close (cookie->fd);
- cookie->fd = -1;
- log_socket = -1;
- }
-
- return (gpgrt_ssize_t)size;
-}
-
-
-static int
-fun_closer (void *cookie_arg)
-{
- struct fun_cookie_s *cookie = cookie_arg;
-
- if (cookie->fd != -1 && cookie->fd != 2)
- sock_close (cookie->fd);
- xfree (cookie);
- log_socket = -1;
- return 0;
-}
-
-
-/* Common function to either set the logging to a file or a file
- descriptor. */
-static void
-set_file_fd (const char *name, int fd)
-{
- estream_t fp;
- int want_socket;
-#ifdef HAVE_W32CE_SYSTEM
- int use_writefile = 0;
-#endif
- struct fun_cookie_s *cookie;
-
- /* Close an open log stream. */
- if (logstream)
- {
- if (logstream != es_stderr)
- es_fclose (logstream);
- logstream = NULL;
- }
-
- /* Figure out what kind of logging we want. */
- if (name && !strcmp (name, "-"))
- {
- name = NULL;
- fd = es_fileno (es_stderr);
- }
-
- want_socket = 0;
- if (name && !strncmp (name, "tcp://", 6) && name[6])
- want_socket = 1;
-#ifndef HAVE_W32_SYSTEM
- else if (name && !strncmp (name, "socket://", 9))
- want_socket = 2;
-#endif /*HAVE_W32_SYSTEM*/
-#ifdef HAVE_W32CE_SYSTEM
- else if (name && !strcmp (name, "GPG2:"))
- {
- HANDLE hd;
-
- ActivateDevice (L"Drivers\\"GNUPG_NAME"_Log", 0);
- /* Ignore a filename and write the debug output to the GPG2:
- device. */
- hd = CreateFile (L"GPG2:", GENERIC_WRITE,
- FILE_SHARE_READ | FILE_SHARE_WRITE,
- NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
- fd = (hd == INVALID_HANDLE_VALUE)? -1 : (int)hd;
- name = NULL;
- force_prefixes = 1;
- use_writefile = 1;
- }
-#endif /*HAVE_W32CE_SYSTEM*/
-
- /* Setup a new stream. */
-
- /* The xmalloc below is justified because we can expect that this
- function is called only during initialization and there is no
- easy way out of this error condition. */
- cookie = xmalloc (sizeof *cookie + (name? strlen (name):0));
- strcpy (cookie->name, name? name:"");
- cookie->quiet = 0;
- cookie->is_socket = 0;
- cookie->want_socket = want_socket;
-#ifdef HAVE_W32CE_SYSTEM
- cookie->use_writefile = use_writefile;
-#endif
- if (!name)
- cookie->fd = fd;
- else if (want_socket)
- cookie->fd = -1;
- else
- {
- do
- cookie->fd = open (name, O_WRONLY|O_APPEND|O_CREAT,
- (S_IRUSR|S_IRGRP|S_IROTH|S_IWUSR|S_IWGRP|S_IWOTH));
- while (cookie->fd == -1 && errno == EINTR);
- }
- log_socket = cookie->fd;
-
- {
- es_cookie_io_functions_t io = { NULL };
- io.func_write = fun_writer;
- io.func_close = fun_closer;
-
- fp = es_fopencookie (cookie, "w", io);
- }
-
- /* On error default to a stderr based estream. */
- if (!fp)
- fp = es_stderr;
-
- es_setvbuf (fp, NULL, _IOLBF, 0);
-
- logstream = fp;
-
- /* We always need to print the prefix and the pid for socket mode,
- so that the server reading the socket can do something
- meaningful. */
- force_prefixes = want_socket;
-
- missing_lf = 0;
-}
-
-
-/* Set the file to write log to. The special names NULL and "-" may
- be used to select stderr and names formatted like
- "socket:///home/foo/mylogs" may be used to write the logging to the
- socket "/home/foo/mylogs". If the connection to the socket fails
- or a write error is detected, the function writes to stderr and
- tries the next time again to connect the socket.
- */
-void
-log_set_file (const char *name)
-{
- set_file_fd (name? name: "-", -1);
-}
-
-void
-log_set_fd (int fd)
-{
- if (! gnupg_fd_valid (fd))
- log_fatal ("logger-fd is invalid: %s\n", strerror (errno));
-
- set_file_fd (NULL, fd);
-}
-
-
-/* Set a function to retrieve the directory name of a socket if
- * only "socket://" has been given to log_set_file. */
-void
-log_set_socket_dir_cb (const char *(*fnc)(void))
-{
- socket_dir_cb = fnc;
-}
-
-
-void
-log_set_pid_suffix_cb (int (*cb)(unsigned long *r_value))
-{
- get_pid_suffix_cb = cb;
-}
-
-
-void
-log_set_prefix (const char *text, unsigned int flags)
-{
- if (text)
- {
- strncpy (prefix_buffer, text, sizeof (prefix_buffer)-1);
- prefix_buffer[sizeof (prefix_buffer)-1] = 0;
- }
-
- with_prefix = (flags & GPGRT_LOG_WITH_PREFIX);
- with_time = (flags & GPGRT_LOG_WITH_TIME);
- with_pid = (flags & GPGRT_LOG_WITH_PID);
- running_detached = (flags & GPGRT_LOG_RUN_DETACHED);
-#ifdef HAVE_W32_SYSTEM
- no_registry = (flags & GPGRT_LOG_NO_REGISTRY);
-#endif
-}
-
-
-const char *
-log_get_prefix (unsigned int *flags)
-{
- if (flags)
- {
- *flags = 0;
- if (with_prefix)
- *flags |= GPGRT_LOG_WITH_PREFIX;
- if (with_time)
- *flags |= GPGRT_LOG_WITH_TIME;
- if (with_pid)
- *flags |= GPGRT_LOG_WITH_PID;
- if (running_detached)
- *flags |= GPGRT_LOG_RUN_DETACHED;
-#ifdef HAVE_W32_SYSTEM
- if (no_registry)
- *flags |= GPGRT_LOG_NO_REGISTRY;
-#endif
- }
- return prefix_buffer;
-}
-
-/* This function returns true if the file descriptor FD is in use for
- logging. This is preferable over a test using log_get_fd in that
- it allows the logging code to use more then one file descriptor. */
-int
-log_test_fd (int fd)
-{
- if (logstream)
- {
- int tmp = es_fileno (logstream);
- if ( tmp != -1 && tmp == fd)
- return 1;
- }
- if (log_socket != -1 && log_socket == fd)
- return 1;
- return 0;
-}
-
-int
-log_get_fd ()
-{
- return logstream? es_fileno(logstream) : -1;
-}
-
-estream_t
-log_get_stream ()
-{
- if (!logstream)
- {
- log_set_file (NULL); /* Make sure a log stream has been set. */
- assert (logstream);
- }
- return logstream;
-}
-
-
-static void
-print_prefix (int level, int leading_backspace)
-{
- if (level != GPGRT_LOG_CONT)
- { /* Note this does not work for multiple line logging as we would
- * need to print to a buffer first */
- if (with_time && !force_prefixes)
- {
- struct tm *tp;
- time_t atime = time (NULL);
-
- tp = localtime (&atime);
- es_fprintf_unlocked (logstream, "%04d-%02d-%02d %02d:%02d:%02d ",
- 1900+tp->tm_year, tp->tm_mon+1, tp->tm_mday,
- tp->tm_hour, tp->tm_min, tp->tm_sec );
- }
- if (with_prefix || force_prefixes)
- es_fputs_unlocked (prefix_buffer, logstream);
- if (with_pid || force_prefixes)
- {
- unsigned long pidsuf;
- int pidfmt;
-
- if (get_pid_suffix_cb && (pidfmt=get_pid_suffix_cb (&pidsuf)))
- es_fprintf_unlocked (logstream, pidfmt == 1? "[%u.%lu]":"[%u.%lx]",
- (unsigned int)getpid (), pidsuf);
- else
- es_fprintf_unlocked (logstream, "[%u]", (unsigned int)getpid ());
- }
- if ((!with_time && (with_prefix || with_pid)) || force_prefixes)
- es_putc_unlocked (':', logstream);
- /* A leading backspace suppresses the extra space so that we can
- correctly output, programname, filename and linenumber. */
- if (!leading_backspace
- && (with_time || with_prefix || with_pid || force_prefixes))
- es_putc_unlocked (' ', logstream);
- }
-
- switch (level)
- {
- case GPGRT_LOG_BEGIN: break;
- case GPGRT_LOG_CONT: break;
- case GPGRT_LOG_INFO: break;
- case GPGRT_LOG_WARN: break;
- case GPGRT_LOG_ERROR: break;
- case GPGRT_LOG_FATAL: es_fputs_unlocked ("Fatal: ",logstream ); break;
- case GPGRT_LOG_BUG: es_fputs_unlocked ("Ohhhh jeeee: ", logstream); break;
- case GPGRT_LOG_DEBUG: es_fputs_unlocked ("DBG: ", logstream ); break;
- default:
- es_fprintf_unlocked (logstream,"[Unknown log level %d]: ", level);
- break;
- }
-}
-
-
-static void
-do_logv (int level, int ignore_arg_ptr, const char *extrastring,
- const char *prefmt, const char *fmt, va_list arg_ptr)
-{
- int leading_backspace = (fmt && *fmt == '\b');
-
- if (!logstream)
- {
-#ifdef HAVE_W32_SYSTEM
- char *tmp;
-
- tmp = (no_registry
- ? NULL
- : read_w32_registry_string (NULL, GNUPG_REGISTRY_DIR,
- "DefaultLogFile"));
- log_set_file (tmp && *tmp? tmp : NULL);
- xfree (tmp);
-#else
- log_set_file (NULL); /* Make sure a log stream has been set. */
-#endif
- assert (logstream);
- }
-
- es_flockfile (logstream);
- if (missing_lf && level != GPGRT_LOG_CONT)
- es_putc_unlocked ('\n', logstream );
- missing_lf = 0;
-
- print_prefix (level, leading_backspace);
- if (leading_backspace)
- fmt++;
-
- if (fmt)
- {
- if (prefmt)
- es_fputs_unlocked (prefmt, logstream);
-
- if (ignore_arg_ptr)
- { /* This is used by log_string and comes with the extra
- * feature that after a LF the next line is indent at the
- * length of the prefix. Note that we do not yet include
- * the length of the timestamp and pid in the indent
- * computation. */
- const char *p, *pend;
-
- for (p = fmt; (pend = strchr (p, '\n')); p = pend+1)
- es_fprintf_unlocked (logstream, "%*s%.*s",
- (int)((p != fmt
- && (with_prefix || force_prefixes))
- ?strlen (prefix_buffer)+2:0), "",
- (int)(pend - p)+1, p);
- es_fputs_unlocked (p, logstream);
- }
- else
- es_vfprintf_unlocked (logstream, fmt, arg_ptr);
- if (*fmt && fmt[strlen(fmt)-1] != '\n')
- missing_lf = 1;
- }
-
- /* If we have an EXTRASTRING print it now while we still hold the
- * lock on the logstream. */
- if (extrastring)
- {
- int c;
-
- if (missing_lf)
- {
- es_putc_unlocked ('\n', logstream);
- missing_lf = 0;
- }
- print_prefix (level, leading_backspace);
- es_fputs_unlocked (">> ", logstream);
- missing_lf = 1;
- while ((c = *extrastring++))
- {
- missing_lf = 1;
- if (c == '\\')
- es_fputs_unlocked ("\\\\", logstream);
- else if (c == '\r')
- es_fputs_unlocked ("\\r", logstream);
- else if (c == '\n')
- {
- es_fputs_unlocked ("\\n\n", logstream);
- if (*extrastring)
- {
- print_prefix (level, leading_backspace);
- es_fputs_unlocked (">> ", logstream);
- }
- else
- missing_lf = 0;
- }
- else
- es_putc_unlocked (c, logstream);
- }
- if (missing_lf)
- {
- es_putc_unlocked ('\n', logstream);
- missing_lf = 0;
- }
- }
-
- if (level == GPGRT_LOG_FATAL)
- {
- if (missing_lf)
- es_putc_unlocked ('\n', logstream);
- es_funlockfile (logstream);
- exit (2);
- }
- else if (level == GPGRT_LOG_BUG)
- {
- if (missing_lf)
- es_putc_unlocked ('\n', logstream );
- es_funlockfile (logstream);
- /* Using backtrace requires a configure test and to pass
- * -rdynamic to gcc. Thus we do not enable it now. */
- /* { */
- /* void *btbuf[20]; */
- /* int btidx, btlen; */
- /* char **btstr; */
-
- /* btlen = backtrace (btbuf, DIM (btbuf)); */
- /* btstr = backtrace_symbols (btbuf, btlen); */
- /* if (btstr) */
- /* for (btidx=0; btidx < btlen; btidx++) */
- /* log_debug ("[%d] %s\n", btidx, btstr[btidx]); */
- /* } */
- abort ();
- }
- else
- es_funlockfile (logstream);
-}
-
-
-void
-log_log (int level, const char *fmt, ...)
-{
- va_list arg_ptr ;
-
- va_start (arg_ptr, fmt) ;
- do_logv (level, 0, NULL, NULL, fmt, arg_ptr);
- va_end (arg_ptr);
-}
-
-
-void
-log_logv (int level, const char *fmt, va_list arg_ptr)
-{
- do_logv (level, 0, NULL, NULL, fmt, arg_ptr);
-}
-
-
-/* Same as log_logv but PREFIX is printed immediately before FMT.
- * Note that PREFIX is an additional string and independent of the
- * prefix set by log_set_prefix. */
-void
-log_logv_prefix (int level, const char *prefix,
- const char *fmt, va_list arg_ptr)
-{
- do_logv (level, 0, NULL, prefix, fmt, arg_ptr);
-}
-
-
-static void
-do_log_ignore_arg (int level, const char *str, ...)
-{
- va_list arg_ptr;
- va_start (arg_ptr, str);
- do_logv (level, 1, NULL, NULL, str, arg_ptr);
- va_end (arg_ptr);
-}
-
-
-/* Log STRING at LEVEL but indent from the second line on by the
- * length of the prefix. */
-void
-log_string (int level, const char *string)
-{
- /* We need a dummy arg_ptr, but there is no portable way to create
- * one. So we call the do_logv function through a variadic wrapper. */
- do_log_ignore_arg (level, string);
-}
-
-
-void
-log_info (const char *fmt, ...)
-{
- va_list arg_ptr ;
-
- va_start (arg_ptr, fmt);
- do_logv (GPGRT_LOG_INFO, 0, NULL, NULL, fmt, arg_ptr);
- va_end (arg_ptr);
-}
-
-
-void
-log_error (const char *fmt, ...)
-{
- va_list arg_ptr ;
-
- va_start (arg_ptr, fmt);
- do_logv (GPGRT_LOG_ERROR, 0, NULL, NULL, fmt, arg_ptr);
- va_end (arg_ptr);
- /* Protect against counter overflow. */
- if (errorcount < 30000)
- errorcount++;
-}
-
-
-void
-log_fatal (const char *fmt, ...)
-{
- va_list arg_ptr ;
-
- va_start (arg_ptr, fmt);
- do_logv (GPGRT_LOG_FATAL, 0, NULL, NULL, fmt, arg_ptr);
- va_end (arg_ptr);
- abort (); /* Never called; just to make the compiler happy. */
-}
-
-
-void
-log_bug (const char *fmt, ...)
-{
- va_list arg_ptr ;
-
- va_start (arg_ptr, fmt);
- do_logv (GPGRT_LOG_BUG, 0, NULL, NULL, fmt, arg_ptr);
- va_end (arg_ptr);
- abort (); /* Never called; just to make the compiler happy. */
-}
-
-
-void
-log_debug (const char *fmt, ...)
-{
- va_list arg_ptr ;
-
- va_start (arg_ptr, fmt);
- do_logv (GPGRT_LOG_DEBUG, 0, NULL, NULL, fmt, arg_ptr);
- va_end (arg_ptr);
-}
-
-
-/* The same as log_debug but at the end of the output STRING is
- * printed with LFs expanded to include the prefix and a final --end--
- * marker. */
-void
-log_debug_string (const char *string, const char *fmt, ...)
-{
- va_list arg_ptr ;
-
- va_start (arg_ptr, fmt);
- do_logv (GPGRT_LOG_DEBUG, 0, string, NULL, fmt, arg_ptr);
- va_end (arg_ptr);
-}
-
-
-void
-log_printf (const char *fmt, ...)
-{
- va_list arg_ptr;
-
- va_start (arg_ptr, fmt);
- do_logv (fmt ? GPGRT_LOG_CONT : GPGRT_LOG_BEGIN, 0, NULL, NULL, fmt, arg_ptr);
- va_end (arg_ptr);
-}
-
-
-/* Flush the log - this is useful to make sure that the trailing
- linefeed has been printed. */
-void
-log_flush (void)
-{
- do_log_ignore_arg (GPGRT_LOG_CONT, NULL);
-}
-
-
-/* Print a hexdump of BUFFER. With TEXT of NULL print just the raw
- dump, with TEXT just an empty string, print a trailing linefeed,
- otherwise print an entire debug line. */
-void
-log_printhex (const void *buffer, size_t length, const char *text)
-{
- if (text && *text)
- log_debug ("%s ", text);
- if (length)
- {
- const unsigned char *p = buffer;
- log_printf ("%02X", *p);
- for (length--, p++; length--; p++)
- log_printf (" %02X", *p);
- }
- if (text)
- log_printf ("\n");
-}
-
-
-/*
-void
-log_printcanon () {}
-is found in sexputils.c
-*/
-
-/*
-void
-log_printsexp () {}
-is found in sexputils.c
-*/
-
-/* Print a microsecond timestamp followed by a FORMAT. */
-void
-log_clock (const char *fmt, ...)
-{
-#if ENABLE_LOG_CLOCK
- static unsigned long long initial;
- struct timespec tv;
- unsigned long long now;
- char clockbuf[50];
- va_list arg_ptr;
-
- if (clock_gettime (CLOCK_REALTIME, &tv))
- {
- log_debug ("error getting the realtime clock value\n");
- return;
- }
- now = tv.tv_sec * 1000000000ull;
- now += tv.tv_nsec;
-
- if (!initial)
- initial = now;
-
- snprintf (clockbuf, sizeof clockbuf, "[%6llu] ", (now - initial)/1000);
- va_start (arg_ptr, fmt);
- do_logv (GPGRT_LOG_DEBUG, 0, NULL, clockbuf, fmt, arg_ptr);
- va_end (arg_ptr);
-
-#else /*!ENABLE_LOG_CLOCK*/
-
- /* You may need to link with -ltr to use the above code. */
- va_list arg_ptr;
-
- va_start (arg_ptr, fmt);
- do_logv (GPGRT_LOG_DEBUG, 0, NULL, "[no clock] ", fmt, arg_ptr);
- va_end (arg_ptr);
-
-#endif /*!ENABLE_LOG_CLOCK*/
-}
-
-
-#ifdef GPGRT_HAVE_MACRO_FUNCTION
-void
-bug_at( const char *file, int line, const char *func )
-{
- log_log (GPGRT_LOG_BUG, "... this is a bug (%s:%d:%s)\n", file, line, func);
- abort (); /* Never called; just to make the compiler happy. */
-}
-#else /*!GPGRT_HAVE_MACRO_FUNCTION*/
-void
-bug_at( const char *file, int line )
-{
- log_log (GPGRT_LOG_BUG, "you found a bug ... (%s:%d)\n", file, line);
- abort (); /* Never called; just to make the compiler happy. */
-}
-#endif /*!GPGRT_HAVE_MACRO_FUNCTION*/
-
-
-#ifdef GPGRT_HAVE_MACRO_FUNCTION
-void
-_log_assert (const char *expr, const char *file, int line, const char *func)
-{
- log_log (GPGRT_LOG_BUG, "Assertion \"%s\" in %s failed (%s:%d)\n",
- expr, func, file, line);
- abort (); /* Never called; just to make the compiler happy. */
-}
-#else /*!GPGRT_HAVE_MACRO_FUNCTION*/
-void
-_log_assert (const char *expr, const char *file, int line)
-{
- log_log (GPGRT_LOG_BUG, "Assertion \"%s\" failed (%s:%d)\n",
- expr, file, line);
- abort (); /* Never called; just to make the compiler happy. */
-}
-#endif /*!GPGRT_HAVE_MACRO_FUNCTION*/
-
-#endif /* Use our own logging functions. */
diff --git a/common/logging.h b/common/logging.h
index a20b8f8..a5800cb 100644
--- a/common/logging.h
+++ b/common/logging.h
@@ -38,10 +38,9 @@
#include "mischelp.h"
#include "w32help.h"
-#if defined(GPGRT_ENABLE_LOG_MACROS) && defined(log_debug_string)
- /* We use the libgpg-error provided log functions. but we need one
- * more function: */
-# ifdef GPGRT_HAVE_MACRO_FUNCTION
+/* We use the libgpg-error provided log functions. but we need one
+ * more function: */
+#ifdef GPGRT_HAVE_MACRO_FUNCTION
# define BUG() bug_at ( __FILE__, __LINE__, __FUNCTION__)
static inline void bug_at (const char *file, int line, const char *func)
GPGRT_ATTR_NORETURN;
@@ -52,7 +51,7 @@ bug_at (const char *file, int line, const char *func)
file, line, func);
abort ();
}
-# else
+#else
# define BUG() bug_at ( __FILE__, __LINE__)
static inline void bug_at (const char *file, int line)
GPGRT_ATTR_NORETURN;
@@ -62,94 +61,9 @@ bug_at (const char *file, int line)
gpgrt_log (GPGRT_LOGLVL_BUG, "there is a bug at %s:%d\n", file, line);
abort ();
}
-# endif /*!GPGRT_HAVE_MACRO_FUNCTION*/
-
-
-#else /* Use gnupg internal logging functions. */
-
-int log_get_errorcount (int clear);
-void log_inc_errorcount (void);
-void log_set_file( const char *name );
-void log_set_fd (int fd);
-void log_set_socket_dir_cb (const char *(*fnc)(void));
-void log_set_pid_suffix_cb (int (*cb)(unsigned long *r_value));
-void log_set_prefix (const char *text, unsigned int flags);
-const char *log_get_prefix (unsigned int *flags);
-int log_test_fd (int fd);
-int log_get_fd(void);
-estream_t log_get_stream (void);
-
-#ifdef GPGRT_HAVE_MACRO_FUNCTION
- void bug_at (const char *file, int line, const char *func)
- GPGRT_ATTR_NORETURN;
- void _log_assert (const char *expr, const char *file, int line,
- const char *func) GPGRT_ATTR_NORETURN;
-# define BUG() bug_at( __FILE__ , __LINE__, __FUNCTION__)
-# define log_assert(expr) \
- ((expr) \
- ? (void) 0 \
- : _log_assert (#expr, __FILE__, __LINE__, __FUNCTION__))
-#else /*!GPGRT_HAVE_MACRO_FUNCTION*/
- void bug_at (const char *file, int line);
- void _log_assert (const char *expr, const char *file, int line);
-# define BUG() bug_at( __FILE__ , __LINE__ )
-# define log_assert(expr) \
- ((expr) \
- ? (void) 0 \
- : _log_assert (#expr, __FILE__, __LINE__))
#endif /*!GPGRT_HAVE_MACRO_FUNCTION*/
-/* Flag values for log_set_prefix. */
-#define GPGRT_LOG_WITH_PREFIX 1
-#define GPGRT_LOG_WITH_TIME 2
-#define GPGRT_LOG_WITH_PID 4
-#define GPGRT_LOG_RUN_DETACHED 256
-#define GPGRT_LOG_NO_REGISTRY 512
-
-/* Log levels as used by log_log. */
-enum jnlib_log_levels {
- GPGRT_LOG_BEGIN,
- GPGRT_LOG_CONT,
- GPGRT_LOG_INFO,
- GPGRT_LOG_WARN,
- GPGRT_LOG_ERROR,
- GPGRT_LOG_FATAL,
- GPGRT_LOG_BUG,
- GPGRT_LOG_DEBUG
-};
-#define GPGRT_LOGLVL_BEGIN GPGRT_LOG_BEGIN
-#define GPGRT_LOGLVL_CONT GPGRT_LOG_CONT
-#define GPGRT_LOGLVL_INFO GPGRT_LOG_INFO
-#define GPGRT_LOGLVL_WARN GPGRT_LOG_WARN
-#define GPGRT_LOGLVL_ERROR GPGRT_LOG_ERROR
-#define GPGRT_LOGLVL_FATAL GPGRT_LOG_FATAL
-#define GPGRT_LOGLVL_BUG GPGRT_LOG_BUG
-#define GPGRT_LOGLVL_DEBUG GPGRT_LOG_DEBUG
-
-void log_log (int level, const char *fmt, ...) GPGRT_ATTR_PRINTF(2,3);
-void log_logv (int level, const char *fmt, va_list arg_ptr);
-void log_logv_prefix (int level, const char *prefix,
- const char *fmt, va_list arg_ptr);
-void log_string (int level, const char *string);
-void log_bug (const char *fmt, ...) GPGRT_ATTR_NR_PRINTF(1,2);
-void log_fatal (const char *fmt, ...) GPGRT_ATTR_NR_PRINTF(1,2);
-void log_error (const char *fmt, ...) GPGRT_ATTR_PRINTF(1,2);
-void log_info (const char *fmt, ...) GPGRT_ATTR_PRINTF(1,2);
-void log_debug (const char *fmt, ...) GPGRT_ATTR_PRINTF(1,2);
-void log_debug_string (const char *string, const char *fmt,
- ...) GPGRT_ATTR_PRINTF(2,3);
-void log_printf (const char *fmt, ...) GPGRT_ATTR_PRINTF(1,2);
-void log_flush (void);
-
-/* Print a hexdump of BUFFER. With TEXT passes as NULL print just the
- raw dump, with TEXT being an empty string, print a trailing
- linefeed, otherwise print an entire debug line with TEXT followed
- by the hexdump and a final LF. */
-void log_printhex (const void *buffer, size_t length, const char *text);
-
-void log_clock (const char *fmt, ...) GPGRT_ATTR_PRINTF(1,2);
-#endif /* Use gnupg internal logging functions. */
/* Some handy assertion macros which don't abort. */
diff --git a/common/util.h b/common/util.h
index f372281..123d880 100644
--- a/common/util.h
+++ b/common/util.h
@@ -39,21 +39,6 @@
* libgpg-error version. Define them here.
* Example: (#if GPG_ERROR_VERSION_NUMBER < 0x011500 // 1.21)
*/
-#if GPG_ERROR_VERSION_NUMBER < 0x011a00 /* 1.26 */
-# define GPG_ERR_UNKNOWN_FLAG 309
-# define GPG_ERR_INV_ORDER 310
-# define GPG_ERR_ALREADY_FETCHED 311
-# define GPG_ERR_TRY_LATER 312
-# define GPG_ERR_SYSTEM_BUG 666
-# define GPG_ERR_DNS_UNKNOWN 711
-# define GPG_ERR_DNS_SECTION 712
-# define GPG_ERR_DNS_ADDRESS 713
-# define GPG_ERR_DNS_NO_QUERY 714
-# define GPG_ERR_DNS_NO_ANSWER 715
-# define GPG_ERR_DNS_CLOSED 716
-# define GPG_ERR_DNS_VERIFY 717
-# define GPG_ERR_DNS_TIMEOUT 718
-#endif
/* Hash function used with libksba. */
diff --git a/configure.ac b/configure.ac
index 0665115..4916a5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,7 @@ AC_INIT([mym4_package],[mym4_version], [https://bugs.gnupg.org])
# build-aux/speedo.mk and Makefile.am
AC_DEFINE_UNQUOTED(GNUPG_SWDB_TAG, "gnupg24", [swdb tag for this branch])
-NEED_GPG_ERROR_VERSION=1.24
+NEED_GPG_ERROR_VERSION=1.29
NEED_LIBGCRYPT_API=1
NEED_LIBGCRYPT_VERSION=1.7.0
-----------------------------------------------------------------------
Summary of changes:
common/Makefile.am | 2 +-
common/logging.c | 1121 ----------------------------------------------------
common/logging.h | 94 +----
common/util.h | 15 -
configure.ac | 2 +-
5 files changed, 6 insertions(+), 1228 deletions(-)
delete mode 100644 common/logging.c
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list