2006-10-02 13:54:35 +02:00
|
|
|
/* logging.c - Useful logging functions
|
2011-02-04 12:57:53 +01:00
|
|
|
* Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
|
2010-03-10 18:22:23 +01:00
|
|
|
* 2009, 2010 Free Software Foundation, Inc.
|
2003-01-09 13:36:05 +01:00
|
|
|
*
|
2011-09-30 12:52:11 +02:00
|
|
|
* This file is part of JNLIB, which is a subsystem of GnuPG.
|
2003-01-09 13:36:05 +01:00
|
|
|
*
|
2006-10-02 13:54:35 +02:00
|
|
|
* JNLIB is free software; you can redistribute it and/or modify it
|
2011-09-30 12:52:11 +02:00
|
|
|
* 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.
|
2003-01-09 13:36:05 +01:00
|
|
|
*
|
2006-10-02 13:54:35 +02:00
|
|
|
* JNLIB 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
|
2011-09-30 12:52:11 +02:00
|
|
|
* General Public License for more details.
|
2003-01-09 13:36:05 +01:00
|
|
|
*
|
2011-09-30 12:52:11 +02:00
|
|
|
* 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 <http://www.gnu.org/licenses/>.
|
2003-01-09 13:36:05 +01:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <stdarg.h>
|
2003-12-16 12:30:16 +01:00
|
|
|
#include <stddef.h>
|
2003-01-09 13:36:05 +01:00
|
|
|
#include <errno.h>
|
|
|
|
#include <time.h>
|
|
|
|
#include <sys/types.h>
|
2004-11-23 18:09:51 +01:00
|
|
|
#include <sys/stat.h>
|
2010-08-09 17:40:29 +02:00
|
|
|
#ifdef HAVE_W32_SYSTEM
|
2014-03-07 09:46:44 +01:00
|
|
|
# ifdef HAVE_WINSOCK2_H
|
|
|
|
# include <winsock2.h>
|
|
|
|
# endif
|
2010-08-09 17:40:29 +02:00
|
|
|
# include <windows.h>
|
|
|
|
#else /*!HAVE_W32_SYSTEM*/
|
2010-03-15 14:08:51 +01:00
|
|
|
# include <sys/socket.h>
|
|
|
|
# include <sys/un.h>
|
2010-08-09 17:40:29 +02:00
|
|
|
# include <netinet/in.h>
|
|
|
|
# include <arpa/inet.h>
|
|
|
|
#endif /*!HAVE_W32_SYSTEM*/
|
2003-01-09 13:36:05 +01:00
|
|
|
#include <unistd.h>
|
2004-10-22 11:41:24 +02:00
|
|
|
#include <fcntl.h>
|
|
|
|
#include <assert.h>
|
2003-01-09 13:36:05 +01:00
|
|
|
|
2004-10-22 11:41:24 +02:00
|
|
|
|
2003-01-09 13:36:05 +01:00
|
|
|
#define JNLIB_NEED_LOG_LOGV 1
|
2009-05-20 00:39:45 +02:00
|
|
|
#define JNLIB_NEED_AFLOCAL 1
|
2003-01-09 13:36:05 +01:00
|
|
|
#include "libjnlib-config.h"
|
|
|
|
#include "logging.h"
|
|
|
|
|
2010-03-15 14:08:51 +01:00
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
# define S_IRGRP S_IRUSR
|
|
|
|
# define S_IROTH S_IRUSR
|
|
|
|
# define S_IWGRP S_IWUSR
|
|
|
|
# define S_IWOTH S_IWUSR
|
|
|
|
#endif
|
|
|
|
|
2003-01-09 13:36:05 +01:00
|
|
|
|
2010-03-22 13:46:05 +01:00
|
|
|
#ifdef HAVE_W32CE_SYSTEM
|
|
|
|
# define isatty(a) (0)
|
|
|
|
#endif
|
|
|
|
|
2010-08-09 17:40:29 +02:00
|
|
|
#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
|
2010-10-01 22:33:53 +02:00
|
|
|
#ifndef INADDR_NONE /* Slowaris is missing that. */
|
|
|
|
#define INADDR_NONE ((unsigned long)(-1))
|
|
|
|
#endif /*INADDR_NONE*/
|
2010-08-09 17:40:29 +02:00
|
|
|
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
#define sock_close(a) closesocket(a)
|
|
|
|
#else
|
|
|
|
#define sock_close(a) close(a)
|
|
|
|
#endif
|
|
|
|
|
2010-03-22 13:46:05 +01:00
|
|
|
|
2010-03-10 18:22:23 +01:00
|
|
|
static estream_t logstream;
|
2004-04-16 11:46:54 +02:00
|
|
|
static int log_socket = -1;
|
2003-01-09 13:36:05 +01:00
|
|
|
static char prefix_buffer[80];
|
|
|
|
static int with_time;
|
|
|
|
static int with_prefix;
|
|
|
|
static int with_pid;
|
2013-08-01 11:20:48 +02:00
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
static int no_registry;
|
|
|
|
#endif
|
2010-06-09 18:53:51 +02:00
|
|
|
static int (*get_pid_suffix_cb)(unsigned long *r_value);
|
2004-04-16 11:46:54 +02:00
|
|
|
static int running_detached;
|
2003-12-16 17:30:48 +01:00
|
|
|
static int force_prefixes;
|
2003-01-09 13:36:05 +01:00
|
|
|
|
|
|
|
static int missing_lf;
|
|
|
|
static int errorcount;
|
|
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
log_get_errorcount (int clear)
|
|
|
|
{
|
|
|
|
int n = errorcount;
|
|
|
|
if( clear )
|
|
|
|
errorcount = 0;
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
2003-06-18 21:56:13 +02:00
|
|
|
void
|
|
|
|
log_inc_errorcount (void)
|
|
|
|
{
|
|
|
|
errorcount++;
|
|
|
|
}
|
|
|
|
|
2003-12-16 12:30:16 +01:00
|
|
|
|
2010-03-10 18:22:23 +01:00
|
|
|
/* The following 3 functions are used by es_fopencookie to write logs
|
|
|
|
to a socket. */
|
|
|
|
struct fun_cookie_s
|
|
|
|
{
|
2003-12-16 12:30:16 +01:00
|
|
|
int fd;
|
|
|
|
int quiet;
|
2004-10-22 11:41:24 +02:00
|
|
|
int want_socket;
|
|
|
|
int is_socket;
|
2010-12-02 14:56:28 +01:00
|
|
|
#ifdef HAVE_W32CE_SYSTEM
|
|
|
|
int use_writefile;
|
|
|
|
#endif
|
2003-12-16 12:30:16 +01:00
|
|
|
char name[1];
|
|
|
|
};
|
|
|
|
|
2010-03-10 18:22:23 +01:00
|
|
|
|
2005-06-16 10:12:03 +02:00
|
|
|
/* Write NBYTES of BUFFER to file descriptor FD. */
|
2003-12-16 12:30:16 +01:00
|
|
|
static int
|
2010-08-18 21:25:15 +02:00
|
|
|
writen (int fd, const void *buffer, size_t nbytes, int is_socket)
|
2003-01-09 13:36:05 +01:00
|
|
|
{
|
2005-06-16 10:12:03 +02:00
|
|
|
const char *buf = buffer;
|
2003-12-16 12:30:16 +01:00
|
|
|
size_t nleft = nbytes;
|
|
|
|
int nwritten;
|
2010-08-18 21:25:15 +02:00
|
|
|
#ifndef HAVE_W32_SYSTEM
|
|
|
|
(void)is_socket; /* Not required. */
|
|
|
|
#endif
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2003-12-16 12:30:16 +01:00
|
|
|
while (nleft > 0)
|
|
|
|
{
|
2010-08-09 17:40:29 +02:00
|
|
|
#ifdef HAVE_W32_SYSTEM
|
2010-08-18 21:25:15 +02:00
|
|
|
if (is_socket)
|
|
|
|
nwritten = send (fd, buf, nleft, 0);
|
|
|
|
else
|
2010-08-09 17:40:29 +02:00
|
|
|
#endif
|
2010-08-18 21:25:15 +02:00
|
|
|
nwritten = write (fd, buf, nleft);
|
|
|
|
|
2003-12-16 12:30:16 +01:00
|
|
|
if (nwritten < 0 && errno == EINTR)
|
|
|
|
continue;
|
|
|
|
if (nwritten < 0)
|
|
|
|
return -1;
|
|
|
|
nleft -= nwritten;
|
|
|
|
buf = buf + nwritten;
|
2003-01-09 13:36:05 +01:00
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2003-12-16 12:30:16 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-08-09 17:40:29 +02:00
|
|
|
/* Returns true if STR represents a valid port number in decimal
|
|
|
|
notation and no garbage is following. */
|
2011-02-04 12:57:53 +01:00
|
|
|
static int
|
2010-08-09 17:40:29 +02:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
static ssize_t
|
2010-03-10 18:22:23 +01:00
|
|
|
fun_writer (void *cookie_arg, const void *buffer, size_t size)
|
2003-12-16 12:30:16 +01:00
|
|
|
{
|
|
|
|
struct fun_cookie_s *cookie = cookie_arg;
|
|
|
|
|
2010-08-18 21:25:15 +02:00
|
|
|
/* FIXME: Use only estream with a callback for socket writing. This
|
|
|
|
avoids the ugly mix of fd and estream code. */
|
|
|
|
|
2004-04-16 11:46:54 +02:00
|
|
|
/* Note that we always try to reconnect to the socket but print
|
2004-06-21 11:50:22 +02:00
|
|
|
error messages only the first time an error occured. If
|
2004-04-16 11:46:54 +02:00
|
|
|
RUNNING_DETACHED is set we don't fall back to stderr and even do
|
2004-06-21 11:50:22 +02:00
|
|
|
not print any error messages. This is needed because detached
|
|
|
|
processes often close stderr and by writing to file descriptor 2
|
2004-04-16 11:46:54 +02:00
|
|
|
we might send the log message to a file not intended for logging
|
|
|
|
(e.g. a pipe or network connection). */
|
2004-10-22 11:41:24 +02:00
|
|
|
if (cookie->want_socket && cookie->fd == -1)
|
2003-12-16 12:30:16 +01:00
|
|
|
{
|
2010-08-09 17:40:29 +02:00
|
|
|
#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
|
|
|
|
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;
|
|
|
|
|
2004-06-21 11:50:22 +02:00
|
|
|
/* Not yet open or meanwhile closed due to an error. */
|
2004-10-22 11:41:24 +02:00
|
|
|
cookie->is_socket = 0;
|
2010-08-09 17:40:29 +02:00
|
|
|
|
|
|
|
/* 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])
|
|
|
|
name += 9;
|
|
|
|
#endif
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2010-08-09 17:40:29 +02:00
|
|
|
if (af == AF_LOCAL)
|
|
|
|
{
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
addrlen = 0;
|
|
|
|
#else
|
|
|
|
memset (&srvr_addr, 0, sizeof srvr_addr);
|
|
|
|
srvr_addr_un.sun_family = af;
|
|
|
|
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
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
char *addrstr, *p;
|
2014-03-07 09:46:44 +01:00
|
|
|
#ifdef HAVE_INET_PTON
|
2010-08-09 17:40:29 +02:00
|
|
|
void *addrbuf = NULL;
|
2014-03-07 09:46:44 +01:00
|
|
|
#endif /*HAVE_INET_PTON*/
|
2010-08-09 17:40:29 +02:00
|
|
|
|
|
|
|
addrstr = jnlib_malloc (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))
|
|
|
|
{
|
|
|
|
jnlib_set_errno (EINVAL);
|
|
|
|
addrlen = 0;
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
else
|
2010-08-09 17:40:29 +02:00
|
|
|
{
|
|
|
|
*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);
|
2014-03-07 09:46:44 +01:00
|
|
|
#ifdef HAVE_INET_PTON
|
2010-08-09 17:40:29 +02:00
|
|
|
addrbuf = &srvr_addr_in6.sin6_addr;
|
2014-03-07 09:46:44 +01:00
|
|
|
#endif /*HAVE_INET_PTON*/
|
2010-08-09 17:40:29 +02:00
|
|
|
srvr_addr = (struct sockaddr *)&srvr_addr_in6;
|
|
|
|
addrlen = sizeof srvr_addr_in6;
|
|
|
|
#else
|
|
|
|
jnlib_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))
|
|
|
|
{
|
|
|
|
jnlib_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);
|
2014-03-07 09:46:44 +01:00
|
|
|
#ifdef HAVE_INET_PTON
|
2010-08-09 17:40:29 +02:00
|
|
|
addrbuf = &srvr_addr_in.sin_addr;
|
2014-03-07 09:46:44 +01:00
|
|
|
#endif /*HAVE_INET_PTON*/
|
2010-08-09 17:40:29 +02:00
|
|
|
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*/
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2010-08-09 17:40:29 +02:00
|
|
|
jnlib_free (addrstr);
|
|
|
|
}
|
|
|
|
|
|
|
|
cookie->fd = addrlen? socket (pf, SOCK_STREAM, 0) : -1;
|
2003-12-16 12:30:16 +01:00
|
|
|
if (cookie->fd == -1)
|
|
|
|
{
|
2005-02-03 14:20:57 +01:00
|
|
|
if (!cookie->quiet && !running_detached
|
2010-03-22 13:46:05 +01:00
|
|
|
&& isatty (es_fileno (es_stderr)))
|
|
|
|
es_fprintf (es_stderr, "failed to create socket for logging: %s\n",
|
|
|
|
strerror(errno));
|
2003-12-16 12:30:16 +01:00
|
|
|
}
|
2004-10-22 11:41:24 +02:00
|
|
|
else
|
|
|
|
{
|
2010-08-09 17:40:29 +02:00
|
|
|
if (connect (cookie->fd, srvr_addr, addrlen) == -1)
|
2004-10-22 11:41:24 +02:00
|
|
|
{
|
2005-02-03 14:20:57 +01:00
|
|
|
if (!cookie->quiet && !running_detached
|
2010-03-22 13:46:05 +01:00
|
|
|
&& isatty (es_fileno (es_stderr)))
|
2012-06-05 19:29:22 +02:00
|
|
|
es_fprintf (es_stderr, "can't connect to '%s': %s\n",
|
2010-03-22 13:46:05 +01:00
|
|
|
cookie->name, strerror(errno));
|
2010-08-09 17:40:29 +02:00
|
|
|
sock_close (cookie->fd);
|
2004-10-22 11:41:24 +02:00
|
|
|
cookie->fd = -1;
|
|
|
|
}
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2004-10-22 11:41:24 +02:00
|
|
|
if (cookie->fd == -1)
|
2003-12-16 12:30:16 +01:00
|
|
|
{
|
2004-10-22 11:41:24 +02:00
|
|
|
if (!running_detached)
|
|
|
|
{
|
2005-02-03 14:20:57 +01:00
|
|
|
/* Due to all the problems with apps not running
|
2010-08-09 17:40:29 +02:00
|
|
|
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. */
|
2004-10-22 11:41:24 +02:00
|
|
|
if (!cookie->quiet)
|
|
|
|
{
|
2005-02-03 14:20:57 +01:00
|
|
|
/* fputs ("switching logging to stderr\n", stderr);*/
|
2004-10-22 11:41:24 +02:00
|
|
|
cookie->quiet = 1;
|
|
|
|
}
|
2005-02-03 14:20:57 +01:00
|
|
|
cookie->fd = -1; /*fileno (stderr);*/
|
2004-10-22 11:41:24 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else /* Connection has been established. */
|
|
|
|
{
|
|
|
|
cookie->quiet = 0;
|
|
|
|
cookie->is_socket = 1;
|
2003-12-16 12:30:16 +01:00
|
|
|
}
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2004-10-22 11:41:24 +02:00
|
|
|
log_socket = cookie->fd;
|
2010-12-02 14:56:28 +01:00
|
|
|
if (cookie->fd != -1)
|
2011-02-04 12:57:53 +01:00
|
|
|
{
|
2010-12-02 14:56:28 +01:00
|
|
|
#ifdef HAVE_W32CE_SYSTEM
|
|
|
|
if (cookie->use_writefile)
|
|
|
|
{
|
|
|
|
DWORD nwritten;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2010-12-02 14:56:28 +01:00
|
|
|
WriteFile ((HANDLE)cookie->fd, buffer, size, &nwritten, NULL);
|
|
|
|
return (ssize_t)size; /* Okay. */
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
if (!writen (cookie->fd, buffer, size, cookie->is_socket))
|
2011-02-04 12:57:53 +01:00
|
|
|
return (ssize_t)size; /* Okay. */
|
2010-12-02 14:56:28 +01:00
|
|
|
}
|
|
|
|
|
2005-02-03 14:20:57 +01:00
|
|
|
if (!running_detached && cookie->fd != -1
|
2010-03-22 13:46:05 +01:00
|
|
|
&& isatty (es_fileno (es_stderr)))
|
2003-12-16 12:30:16 +01:00
|
|
|
{
|
2004-10-22 11:41:24 +02:00
|
|
|
if (*cookie->name)
|
2012-06-05 19:29:22 +02:00
|
|
|
es_fprintf (es_stderr, "error writing to '%s': %s\n",
|
2010-03-22 13:46:05 +01:00
|
|
|
cookie->name, strerror(errno));
|
2004-10-22 11:41:24 +02:00
|
|
|
else
|
2010-03-22 13:46:05 +01:00
|
|
|
es_fprintf (es_stderr, "error writing to file descriptor %d: %s\n",
|
|
|
|
cookie->fd, strerror(errno));
|
2004-10-22 11:41:24 +02:00
|
|
|
}
|
|
|
|
if (cookie->is_socket && cookie->fd != -1)
|
|
|
|
{
|
2010-08-09 17:40:29 +02:00
|
|
|
sock_close (cookie->fd);
|
2004-10-22 11:41:24 +02:00
|
|
|
cookie->fd = -1;
|
|
|
|
log_socket = -1;
|
2003-12-16 12:30:16 +01:00
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2010-03-10 18:22:23 +01:00
|
|
|
return (ssize_t)size;
|
2003-12-16 12:30:16 +01:00
|
|
|
}
|
2003-01-09 13:36:05 +01:00
|
|
|
|
2010-03-10 18:22:23 +01:00
|
|
|
|
2003-12-16 12:30:16 +01:00
|
|
|
static int
|
|
|
|
fun_closer (void *cookie_arg)
|
|
|
|
{
|
|
|
|
struct fun_cookie_s *cookie = cookie_arg;
|
|
|
|
|
2009-03-25 15:58:31 +01:00
|
|
|
if (cookie->fd != -1 && cookie->fd != 2)
|
2010-08-09 17:40:29 +02:00
|
|
|
sock_close (cookie->fd);
|
2003-12-16 12:30:16 +01:00
|
|
|
jnlib_free (cookie);
|
2004-10-22 11:41:24 +02:00
|
|
|
log_socket = -1;
|
2003-12-16 12:30:16 +01:00
|
|
|
return 0;
|
2003-01-09 13:36:05 +01:00
|
|
|
}
|
2003-12-16 12:30:16 +01:00
|
|
|
|
|
|
|
|
2004-10-22 11:41:24 +02:00
|
|
|
/* Common function to either set the logging to a file or a file
|
|
|
|
descriptor. */
|
|
|
|
static void
|
2011-02-04 12:57:53 +01:00
|
|
|
set_file_fd (const char *name, int fd)
|
2003-12-16 12:30:16 +01:00
|
|
|
{
|
2010-03-10 18:22:23 +01:00
|
|
|
estream_t fp;
|
2004-10-22 11:41:24 +02:00
|
|
|
int want_socket;
|
2010-12-02 14:56:28 +01:00
|
|
|
#ifdef HAVE_W32CE_SYSTEM
|
|
|
|
int use_writefile = 0;
|
|
|
|
#endif
|
2004-10-22 11:41:24 +02:00
|
|
|
struct fun_cookie_s *cookie;
|
2003-12-16 12:30:16 +01:00
|
|
|
|
2009-03-25 15:58:31 +01:00
|
|
|
/* Close an open log stream. */
|
|
|
|
if (logstream)
|
|
|
|
{
|
2010-03-10 18:22:23 +01:00
|
|
|
es_fclose (logstream);
|
2009-03-25 15:58:31 +01:00
|
|
|
logstream = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Figure out what kind of logging we want. */
|
2004-10-22 11:41:24 +02:00
|
|
|
if (name && !strcmp (name, "-"))
|
2003-12-16 12:30:16 +01:00
|
|
|
{
|
2004-10-22 11:41:24 +02:00
|
|
|
name = NULL;
|
2010-03-22 13:46:05 +01:00
|
|
|
fd = es_fileno (es_stderr);
|
2004-10-22 11:41:24 +02:00
|
|
|
}
|
2003-12-16 12:30:16 +01:00
|
|
|
|
2010-08-09 17:40:29 +02:00
|
|
|
want_socket = 0;
|
|
|
|
if (name && !strncmp (name, "tcp://", 6) && name[6])
|
|
|
|
want_socket = 1;
|
2010-03-15 14:08:51 +01:00
|
|
|
#ifndef HAVE_W32_SYSTEM
|
2010-08-09 17:40:29 +02:00
|
|
|
else if (name && !strncmp (name, "socket://", 9) && name[9])
|
|
|
|
want_socket = 2;
|
2010-03-15 14:08:51 +01:00
|
|
|
#endif /*HAVE_W32_SYSTEM*/
|
2010-12-02 14:56:28 +01:00
|
|
|
#ifdef HAVE_W32CE_SYSTEM
|
|
|
|
else if (name && !strcmp (name, "GPG2:"))
|
|
|
|
{
|
|
|
|
HANDLE hd;
|
|
|
|
|
2013-11-18 14:09:47 +01:00
|
|
|
ActivateDevice (L"Drivers\\"GNUPG_NAME"_Log", 0);
|
2010-12-02 14:56:28 +01:00
|
|
|
/* 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*/
|
2003-12-16 12:30:16 +01:00
|
|
|
|
2009-03-25 15:58:31 +01:00
|
|
|
/* Setup a new stream. */
|
2010-03-10 18:22:23 +01:00
|
|
|
|
2009-07-07 18:51:33 +02:00
|
|
|
/* 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. */
|
2004-10-22 11:41:24 +02:00
|
|
|
cookie = jnlib_xmalloc (sizeof *cookie + (name? strlen (name):0));
|
|
|
|
strcpy (cookie->name, name? name:"");
|
|
|
|
cookie->quiet = 0;
|
|
|
|
cookie->is_socket = 0;
|
|
|
|
cookie->want_socket = want_socket;
|
2010-12-02 14:56:28 +01:00
|
|
|
#ifdef HAVE_W32CE_SYSTEM
|
|
|
|
cookie->use_writefile = use_writefile;
|
|
|
|
#endif
|
2004-10-22 11:41:24 +02:00
|
|
|
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;
|
2003-12-16 12:30:16 +01:00
|
|
|
|
2004-10-22 11:41:24 +02:00
|
|
|
{
|
2010-03-10 18:22:23 +01:00
|
|
|
es_cookie_io_functions_t io = { NULL };
|
|
|
|
io.func_write = fun_writer;
|
|
|
|
io.func_close = fun_closer;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2010-03-10 18:22:23 +01:00
|
|
|
fp = es_fopencookie (cookie, "w", io);
|
2004-10-22 11:41:24 +02:00
|
|
|
}
|
|
|
|
|
2010-03-10 18:22:23 +01:00
|
|
|
/* On error default to a stderr based estream. */
|
2003-12-16 12:30:16 +01:00
|
|
|
if (!fp)
|
2010-03-15 12:15:45 +01:00
|
|
|
fp = es_stderr;
|
2010-03-10 18:22:23 +01:00
|
|
|
|
|
|
|
es_setvbuf (fp, NULL, _IOLBF, 0);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2003-12-16 12:30:16 +01:00
|
|
|
logstream = fp;
|
2004-10-22 11:41:24 +02:00
|
|
|
|
|
|
|
/* 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;
|
|
|
|
|
2003-12-16 12:30:16 +01:00
|
|
|
missing_lf = 0;
|
|
|
|
}
|
|
|
|
|
2003-01-09 13:36:05 +01:00
|
|
|
|
2004-10-22 11:41:24 +02:00
|
|
|
/* 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.
|
|
|
|
*/
|
2003-01-09 13:36:05 +01:00
|
|
|
void
|
2011-02-04 12:57:53 +01:00
|
|
|
log_set_file (const char *name)
|
2003-01-09 13:36:05 +01:00
|
|
|
{
|
2004-10-22 11:41:24 +02:00
|
|
|
set_file_fd (name? name: "-", -1);
|
|
|
|
}
|
2003-12-16 17:30:48 +01:00
|
|
|
|
2004-10-22 11:41:24 +02:00
|
|
|
void
|
|
|
|
log_set_fd (int fd)
|
|
|
|
{
|
|
|
|
set_file_fd (NULL, fd);
|
2003-01-09 13:36:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-02-25 11:58:56 +01:00
|
|
|
void
|
2010-06-09 18:53:51 +02:00
|
|
|
log_set_pid_suffix_cb (int (*cb)(unsigned long *r_value))
|
2009-02-25 11:58:56 +01:00
|
|
|
{
|
2010-06-09 18:53:51 +02:00
|
|
|
get_pid_suffix_cb = cb;
|
2009-02-25 11:58:56 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-01-09 13:36:05 +01:00
|
|
|
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;
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2004-04-16 11:46:54 +02:00
|
|
|
with_prefix = (flags & JNLIB_LOG_WITH_PREFIX);
|
|
|
|
with_time = (flags & JNLIB_LOG_WITH_TIME);
|
|
|
|
with_pid = (flags & JNLIB_LOG_WITH_PID);
|
|
|
|
running_detached = (flags & JNLIB_LOG_RUN_DETACHED);
|
2013-08-01 11:20:48 +02:00
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
no_registry = (flags & JNLIB_LOG_NO_REGISTRY);
|
|
|
|
#endif
|
2003-01-09 13:36:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
const char *
|
|
|
|
log_get_prefix (unsigned int *flags)
|
|
|
|
{
|
|
|
|
if (flags)
|
|
|
|
{
|
|
|
|
*flags = 0;
|
|
|
|
if (with_prefix)
|
2004-04-16 11:46:54 +02:00
|
|
|
*flags |= JNLIB_LOG_WITH_PREFIX;
|
2003-01-09 13:36:05 +01:00
|
|
|
if (with_time)
|
2004-04-16 11:46:54 +02:00
|
|
|
*flags |= JNLIB_LOG_WITH_TIME;
|
2003-01-09 13:36:05 +01:00
|
|
|
if (with_pid)
|
2004-04-16 11:46:54 +02:00
|
|
|
*flags |= JNLIB_LOG_WITH_PID;
|
|
|
|
if (running_detached)
|
|
|
|
*flags |= JNLIB_LOG_RUN_DETACHED;
|
2013-08-01 11:20:48 +02:00
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
if (no_registry)
|
|
|
|
*flags |= JNLIB_LOG_NO_REGISTRY;
|
|
|
|
#endif
|
2003-01-09 13:36:05 +01:00
|
|
|
}
|
|
|
|
return prefix_buffer;
|
|
|
|
}
|
|
|
|
|
2004-04-16 11:46:54 +02:00
|
|
|
/* 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
|
2010-03-10 18:22:23 +01:00
|
|
|
it allows the logging code to use more then one file descriptor. */
|
2004-04-16 11:46:54 +02:00
|
|
|
int
|
|
|
|
log_test_fd (int fd)
|
|
|
|
{
|
2004-11-23 18:09:51 +01:00
|
|
|
if (logstream)
|
|
|
|
{
|
2010-03-10 18:22:23 +01:00
|
|
|
int tmp = es_fileno (logstream);
|
2004-11-23 18:09:51 +01:00
|
|
|
if ( tmp != -1 && tmp == fd)
|
|
|
|
return 1;
|
|
|
|
}
|
2004-10-22 11:41:24 +02:00
|
|
|
if (log_socket != -1 && log_socket == fd)
|
2004-04-16 11:46:54 +02:00
|
|
|
return 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2003-01-09 13:36:05 +01:00
|
|
|
int
|
2004-04-16 11:46:54 +02:00
|
|
|
log_get_fd ()
|
2003-01-09 13:36:05 +01:00
|
|
|
{
|
2010-03-10 18:22:23 +01:00
|
|
|
return logstream? es_fileno(logstream) : -1;
|
2003-01-09 13:36:05 +01:00
|
|
|
}
|
|
|
|
|
2010-03-10 18:22:23 +01:00
|
|
|
estream_t
|
2003-01-09 13:36:05 +01:00
|
|
|
log_get_stream ()
|
|
|
|
{
|
2010-06-07 15:33:02 +02:00
|
|
|
if (!logstream)
|
|
|
|
{
|
|
|
|
log_set_file (NULL); /* Make sure a log stream has been set. */
|
|
|
|
assert (logstream);
|
|
|
|
}
|
2010-03-10 18:22:23 +01:00
|
|
|
return logstream;
|
2003-01-09 13:36:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2010-03-11 13:34:11 +01:00
|
|
|
do_logv (int level, int ignore_arg_ptr, const char *fmt, va_list arg_ptr)
|
2003-01-09 13:36:05 +01:00
|
|
|
{
|
|
|
|
if (!logstream)
|
2004-10-22 11:41:24 +02:00
|
|
|
{
|
2010-08-18 21:25:15 +02:00
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
char *tmp;
|
|
|
|
|
2013-08-01 11:20:48 +02:00
|
|
|
tmp = (no_registry
|
|
|
|
? NULL
|
2014-01-08 11:47:07 +01:00
|
|
|
: read_w32_registry_string (NULL, GNUPG_REGISTRY_DIR,
|
2013-08-01 11:20:48 +02:00
|
|
|
"DefaultLogFile"));
|
2010-11-08 10:18:47 +01:00
|
|
|
log_set_file (tmp && *tmp? tmp : NULL);
|
2010-08-18 21:25:15 +02:00
|
|
|
jnlib_free (tmp);
|
|
|
|
#else
|
2004-10-22 11:41:24 +02:00
|
|
|
log_set_file (NULL); /* Make sure a log stream has been set. */
|
2010-08-18 21:25:15 +02:00
|
|
|
#endif
|
2004-10-22 11:41:24 +02:00
|
|
|
assert (logstream);
|
|
|
|
}
|
2003-01-09 13:36:05 +01:00
|
|
|
|
2010-03-10 18:22:23 +01:00
|
|
|
es_flockfile (logstream);
|
2003-01-09 13:36:05 +01:00
|
|
|
if (missing_lf && level != JNLIB_LOG_CONT)
|
2010-03-10 18:22:23 +01:00
|
|
|
es_putc_unlocked ('\n', logstream );
|
2003-01-09 13:36:05 +01:00
|
|
|
missing_lf = 0;
|
|
|
|
|
|
|
|
if (level != JNLIB_LOG_CONT)
|
|
|
|
{ /* Note this does not work for multiple line logging as we would
|
|
|
|
* need to print to a buffer first */
|
2003-12-16 17:30:48 +01:00
|
|
|
if (with_time && !force_prefixes)
|
2003-01-09 13:36:05 +01:00
|
|
|
{
|
|
|
|
struct tm *tp;
|
|
|
|
time_t atime = time (NULL);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2003-01-09 13:36:05 +01:00
|
|
|
tp = localtime (&atime);
|
2010-03-10 18:22:23 +01:00
|
|
|
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 );
|
2003-01-09 13:36:05 +01:00
|
|
|
}
|
2003-12-16 17:30:48 +01:00
|
|
|
if (with_prefix || force_prefixes)
|
2010-03-10 18:22:23 +01:00
|
|
|
es_fputs_unlocked (prefix_buffer, logstream);
|
2003-12-16 17:30:48 +01:00
|
|
|
if (with_pid || force_prefixes)
|
2009-02-25 11:58:56 +01:00
|
|
|
{
|
2010-06-09 18:53:51 +02:00
|
|
|
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);
|
2009-02-25 11:58:56 +01:00
|
|
|
else
|
2010-03-10 18:22:23 +01:00
|
|
|
es_fprintf_unlocked (logstream, "[%u]", (unsigned int)getpid ());
|
2009-02-25 11:58:56 +01:00
|
|
|
}
|
2003-12-16 17:30:48 +01:00
|
|
|
if (!with_time || force_prefixes)
|
2010-03-10 18:22:23 +01:00
|
|
|
es_putc_unlocked (':', logstream);
|
2003-06-18 21:56:13 +02:00
|
|
|
/* A leading backspace suppresses the extra space so that we can
|
2003-12-16 17:30:48 +01:00
|
|
|
correctly output, programname, filename and linenumber. */
|
2003-06-18 21:56:13 +02:00
|
|
|
if (fmt && *fmt == '\b')
|
|
|
|
fmt++;
|
|
|
|
else
|
2010-03-10 18:22:23 +01:00
|
|
|
es_putc_unlocked (' ', logstream);
|
2003-01-09 13:36:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
switch (level)
|
|
|
|
{
|
|
|
|
case JNLIB_LOG_BEGIN: break;
|
|
|
|
case JNLIB_LOG_CONT: break;
|
|
|
|
case JNLIB_LOG_INFO: break;
|
|
|
|
case JNLIB_LOG_WARN: break;
|
|
|
|
case JNLIB_LOG_ERROR: break;
|
2010-03-10 18:22:23 +01:00
|
|
|
case JNLIB_LOG_FATAL: es_fputs_unlocked ("Fatal: ",logstream ); break;
|
|
|
|
case JNLIB_LOG_BUG: es_fputs_unlocked ("Ohhhh jeeee: ", logstream); break;
|
|
|
|
case JNLIB_LOG_DEBUG: es_fputs_unlocked ("DBG: ", logstream ); break;
|
2011-02-04 12:57:53 +01:00
|
|
|
default:
|
2010-03-10 18:22:23 +01:00
|
|
|
es_fprintf_unlocked (logstream,"[Unknown log level %d]: ", level);
|
|
|
|
break;
|
2003-01-09 13:36:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (fmt)
|
|
|
|
{
|
2010-03-11 13:34:11 +01:00
|
|
|
if (ignore_arg_ptr)
|
|
|
|
es_fputs_unlocked (fmt, logstream);
|
|
|
|
else
|
|
|
|
es_vfprintf_unlocked (logstream, fmt, arg_ptr);
|
2003-01-09 13:36:05 +01:00
|
|
|
if (*fmt && fmt[strlen(fmt)-1] != '\n')
|
|
|
|
missing_lf = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (level == JNLIB_LOG_FATAL)
|
2006-08-29 18:18:30 +02:00
|
|
|
{
|
|
|
|
if (missing_lf)
|
2010-03-10 18:22:23 +01:00
|
|
|
es_putc_unlocked ('\n', logstream);
|
|
|
|
es_funlockfile (logstream);
|
|
|
|
exit (2);
|
2006-08-29 18:18:30 +02:00
|
|
|
}
|
2010-03-10 18:22:23 +01:00
|
|
|
else if (level == JNLIB_LOG_BUG)
|
2006-08-29 18:18:30 +02:00
|
|
|
{
|
|
|
|
if (missing_lf)
|
2010-03-10 18:22:23 +01:00
|
|
|
es_putc_unlocked ('\n', logstream );
|
|
|
|
es_funlockfile (logstream);
|
|
|
|
abort ();
|
2006-08-29 18:18:30 +02:00
|
|
|
}
|
2010-03-10 18:22:23 +01:00
|
|
|
else
|
|
|
|
es_funlockfile (logstream);
|
2003-01-09 13:36:05 +01:00
|
|
|
}
|
|
|
|
|
2010-03-10 18:22:23 +01:00
|
|
|
|
2010-10-26 11:10:29 +02:00
|
|
|
void
|
|
|
|
log_log (int level, const char *fmt, ...)
|
2003-01-09 13:36:05 +01:00
|
|
|
{
|
2010-03-11 13:34:11 +01:00
|
|
|
va_list arg_ptr ;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2010-03-11 13:34:11 +01:00
|
|
|
va_start (arg_ptr, fmt) ;
|
|
|
|
do_logv (level, 0, fmt, arg_ptr);
|
|
|
|
va_end (arg_ptr);
|
2003-01-09 13:36:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
log_logv (int level, const char *fmt, va_list arg_ptr)
|
|
|
|
{
|
2010-03-11 13:34:11 +01:00
|
|
|
do_logv (level, 0, fmt, arg_ptr);
|
2003-01-09 13:36:05 +01:00
|
|
|
}
|
|
|
|
|
2010-03-11 13:34:11 +01:00
|
|
|
|
2010-04-20 03:11:35 +02:00
|
|
|
static void
|
|
|
|
do_log_ignore_arg (int level, const char *str, ...)
|
|
|
|
{
|
|
|
|
va_list arg_ptr;
|
|
|
|
va_start (arg_ptr, str);
|
|
|
|
do_logv (level, 1, str, arg_ptr);
|
|
|
|
va_end (arg_ptr);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-01-09 13:36:05 +01:00
|
|
|
void
|
2010-03-11 13:34:11 +01:00
|
|
|
log_string (int level, const char *string)
|
2003-01-09 13:36:05 +01:00
|
|
|
{
|
2010-04-20 03:11:35 +02:00
|
|
|
/* 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.
|
|
|
|
MB: Why not just use "%s"? */
|
|
|
|
do_log_ignore_arg (level, string);
|
2003-01-09 13:36:05 +01:00
|
|
|
}
|
|
|
|
|
2010-03-11 13:34:11 +01:00
|
|
|
|
2003-01-09 13:36:05 +01:00
|
|
|
void
|
2010-03-11 13:34:11 +01:00
|
|
|
log_info (const char *fmt, ...)
|
2003-01-09 13:36:05 +01:00
|
|
|
{
|
2010-03-11 13:34:11 +01:00
|
|
|
va_list arg_ptr ;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2010-03-11 13:34:11 +01:00
|
|
|
va_start (arg_ptr, fmt);
|
|
|
|
do_logv (JNLIB_LOG_INFO, 0, fmt, arg_ptr);
|
|
|
|
va_end (arg_ptr);
|
2003-01-09 13:36:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
2010-03-11 13:34:11 +01:00
|
|
|
log_error (const char *fmt, ...)
|
2003-01-09 13:36:05 +01:00
|
|
|
{
|
2010-03-11 13:34:11 +01:00
|
|
|
va_list arg_ptr ;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2010-03-11 13:34:11 +01:00
|
|
|
va_start (arg_ptr, fmt);
|
|
|
|
do_logv (JNLIB_LOG_ERROR, 0, fmt, arg_ptr);
|
|
|
|
va_end (arg_ptr);
|
|
|
|
/* Protect against counter overflow. */
|
|
|
|
if (errorcount < 30000)
|
|
|
|
errorcount++;
|
|
|
|
}
|
|
|
|
|
2003-01-09 13:36:05 +01:00
|
|
|
|
2010-03-11 13:34:11 +01:00
|
|
|
void
|
|
|
|
log_fatal (const char *fmt, ...)
|
|
|
|
{
|
|
|
|
va_list arg_ptr ;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2010-03-11 13:34:11 +01:00
|
|
|
va_start (arg_ptr, fmt);
|
|
|
|
do_logv (JNLIB_LOG_FATAL, 0, fmt, arg_ptr);
|
|
|
|
va_end (arg_ptr);
|
|
|
|
abort (); /* Never called; just to make the compiler happy. */
|
2003-01-09 13:36:05 +01:00
|
|
|
}
|
|
|
|
|
2010-03-11 13:34:11 +01:00
|
|
|
|
2003-01-09 13:36:05 +01:00
|
|
|
void
|
2010-03-11 13:34:11 +01:00
|
|
|
log_bug (const char *fmt, ...)
|
2003-01-09 13:36:05 +01:00
|
|
|
{
|
2010-03-11 13:34:11 +01:00
|
|
|
va_list arg_ptr ;
|
2003-01-09 13:36:05 +01:00
|
|
|
|
2010-03-11 13:34:11 +01:00
|
|
|
va_start (arg_ptr, fmt);
|
|
|
|
do_logv (JNLIB_LOG_BUG, 0, fmt, arg_ptr);
|
|
|
|
va_end (arg_ptr);
|
|
|
|
abort (); /* Never called; just to make the compiler happy. */
|
2003-01-09 13:36:05 +01:00
|
|
|
}
|
|
|
|
|
2010-03-11 13:34:11 +01:00
|
|
|
|
2003-01-09 13:36:05 +01:00
|
|
|
void
|
2010-03-11 13:34:11 +01:00
|
|
|
log_debug (const char *fmt, ...)
|
2003-01-09 13:36:05 +01:00
|
|
|
{
|
2010-03-11 13:34:11 +01:00
|
|
|
va_list arg_ptr ;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2010-03-11 13:34:11 +01:00
|
|
|
va_start (arg_ptr, fmt);
|
|
|
|
do_logv (JNLIB_LOG_DEBUG, 0, fmt, arg_ptr);
|
|
|
|
va_end (arg_ptr);
|
2003-01-09 13:36:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
log_printf (const char *fmt, ...)
|
|
|
|
{
|
|
|
|
va_list arg_ptr;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
2003-01-09 13:36:05 +01:00
|
|
|
va_start (arg_ptr, fmt);
|
2010-03-11 13:34:11 +01:00
|
|
|
do_logv (fmt ? JNLIB_LOG_CONT : JNLIB_LOG_BEGIN, 0, fmt, arg_ptr);
|
2003-01-09 13:36:05 +01:00
|
|
|
va_end (arg_ptr);
|
|
|
|
}
|
|
|
|
|
2010-03-11 13:34:11 +01:00
|
|
|
|
2010-03-15 12:15:45 +01:00
|
|
|
/* Flush the log - this is useful to make sure that the trailing
|
|
|
|
linefeed has been printed. */
|
|
|
|
void
|
|
|
|
log_flush (void)
|
|
|
|
{
|
2010-04-20 03:11:35 +02:00
|
|
|
do_log_ignore_arg (JNLIB_LOG_CONT, NULL);
|
2010-03-15 12:15:45 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-01-09 13:36:05 +01:00
|
|
|
/* 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 char *text, const void *buffer, size_t length)
|
|
|
|
{
|
|
|
|
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");
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-05-21 15:00:00 +02:00
|
|
|
/*
|
|
|
|
void
|
|
|
|
log_printcanon () {}
|
|
|
|
is found in sexputils.c
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
void
|
|
|
|
log_printsexp () {}
|
|
|
|
is found in sexputils.c
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
2013-01-07 16:51:24 +01:00
|
|
|
void
|
|
|
|
log_clock (const char *string)
|
|
|
|
{
|
|
|
|
#if 0
|
|
|
|
static unsigned long long initial;
|
|
|
|
struct timespec tv;
|
|
|
|
unsigned long long now;
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
2013-01-08 14:35:27 +01:00
|
|
|
log_debug ("[%6llu] %s", (now - initial)/1000, string);
|
2013-01-07 16:51:24 +01:00
|
|
|
#else
|
|
|
|
/* You need to link with -ltr to enable the above code. */
|
|
|
|
log_debug ("[not enabled in the source] %s", string);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-01-09 13:36:05 +01:00
|
|
|
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5 )
|
|
|
|
void
|
|
|
|
bug_at( const char *file, int line, const char *func )
|
|
|
|
{
|
2010-10-26 11:10:29 +02:00
|
|
|
log_log (JNLIB_LOG_BUG, ("... this is a bug (%s:%d:%s)\n"), file, line, func);
|
2010-03-11 13:34:11 +01:00
|
|
|
abort (); /* Never called; just to make the compiler happy. */
|
2003-01-09 13:36:05 +01:00
|
|
|
}
|
|
|
|
#else
|
|
|
|
void
|
|
|
|
bug_at( const char *file, int line )
|
|
|
|
{
|
2010-10-26 11:10:29 +02:00
|
|
|
log_log (JNLIB_LOG_BUG, _("you found a bug ... (%s:%d)\n"), file, line);
|
2010-03-11 13:34:11 +01:00
|
|
|
abort (); /* Never called; just to make the compiler happy. */
|
2003-01-09 13:36:05 +01:00
|
|
|
}
|
|
|
|
#endif
|