2004-02-10 20:27:54 +01:00
|
|
|
/* util.h - Utility functions for GnuPG
|
2009-03-06 18:31:27 +01:00
|
|
|
* Copyright (C) 2001, 2002, 2003, 2004, 2009 Free Software Foundation, Inc.
|
2003-08-05 19:11:04 +02:00
|
|
|
*
|
|
|
|
* This file is part of GnuPG.
|
|
|
|
*
|
|
|
|
* GnuPG is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
2007-07-04 21:49:40 +02:00
|
|
|
* the Free Software Foundation; either version 3 of the License, or
|
2003-08-05 19:11:04 +02:00
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* 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 copy of the GNU General Public License
|
2007-07-04 21:49:40 +02:00
|
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
2003-08-05 19:11:04 +02:00
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef GNUPG_COMMON_UTIL_H
|
|
|
|
#define GNUPG_COMMON_UTIL_H
|
|
|
|
|
|
|
|
#include <gcrypt.h> /* We need this for the memory function protos. */
|
|
|
|
#include <time.h> /* We need time_t. */
|
2006-09-06 18:35:52 +02:00
|
|
|
#include <errno.h> /* We need errno. */
|
|
|
|
#include <gpg-error.h> /* We need gpg_error_t. */
|
2003-08-05 19:11:04 +02:00
|
|
|
|
* configure.ac (gl_INIT): Add gnulib stuff.
(fseeko, ftello, ttyname, isascii): Replaced the AC_REPLACE_FUNCS
by a simple check.
(putc_unlocked): Removed check. Not used.
(strsep, mkdtemp, asprintf): Replaced checks by gnulib checks.
(xsize): Added will probably come handy soon.
(CFLAGS): Use -Wformat-security instead of
-Wformat-nonliteral. Add --Wno-format-y2k.
* gl/, gl/m4/: New.
* gpg-agent.c: Include setenv.h.
* Makefile.am (AM_CPPFLAGS): Added.
* util.h: Add some includes for gnulib.
(ttyname, isascii): Define them inline.
* fseeko.c, ftello.c: Removed.
* strsep.c, mkdtemp.c: Removed.
* ttyname.c, isascii.c: Removed.
* mkdtemp.c: Removed.
* exec.c: Include mkdtemp.h
* keybox-file.c (ftello) [!HAVE_FSEEKO]: New replacement
function. Copied from ../common/ftello.c.
* keybox-update.c (fseeko) [!HAVE_FSEEKO]: New replacement
function. Copied from ../common/iobuf.c.
* scdaemon.c: Include mkdtemp.h.
* misc.c: Include setenv.h.
* symcryptrun.c: Include mkdtemp.h.
2005-06-01 17:46:01 +02:00
|
|
|
/* Hash function used with libksba. */
|
2003-08-05 19:11:04 +02:00
|
|
|
#define HASH_FNC ((void (*)(void *, const void*,size_t))gcry_md_write)
|
|
|
|
|
2006-11-28 17:36:02 +01:00
|
|
|
/* Get all the stuff from jnlib. */
|
2003-08-05 19:11:04 +02:00
|
|
|
#include "../jnlib/logging.h"
|
|
|
|
#include "../jnlib/argparse.h"
|
|
|
|
#include "../jnlib/stringhelp.h"
|
|
|
|
#include "../jnlib/mischelp.h"
|
|
|
|
#include "../jnlib/strlist.h"
|
|
|
|
#include "../jnlib/dotlock.h"
|
|
|
|
#include "../jnlib/utf8conv.h"
|
2007-06-06 20:12:30 +02:00
|
|
|
#include "../jnlib/dynload.h"
|
2003-08-05 19:11:04 +02:00
|
|
|
|
2007-06-26 15:48:44 +02:00
|
|
|
#include "init.h"
|
|
|
|
|
2007-05-15 18:10:48 +02:00
|
|
|
/* Redefine asprintf by our estream version which uses our own memory
|
|
|
|
allocator.. */
|
|
|
|
#include "estream-printf.h"
|
|
|
|
#define asprintf estream_asprintf
|
|
|
|
#define vasprintf estream_vasprintf
|
|
|
|
|
2008-10-17 21:18:46 +02:00
|
|
|
/* Due to a bug in mingw32's snprintf related to the 'l' modifier we
|
|
|
|
better use our snprintf. */
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
#define snprintf estream_snprintf
|
|
|
|
#endif
|
|
|
|
|
2007-06-26 15:48:44 +02:00
|
|
|
|
2007-05-15 18:10:48 +02:00
|
|
|
/* GCC attributes. */
|
2006-10-10 13:11:04 +02:00
|
|
|
#if __GNUC__ >= 4
|
|
|
|
# define GNUPG_GCC_A_SENTINEL(a) __attribute__ ((sentinel(a)))
|
|
|
|
#else
|
|
|
|
# define GNUPG_GCC_A_SENTINEL(a)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2006-09-21 15:30:45 +02:00
|
|
|
/* We need this type even if we are not using libreadline and or we
|
|
|
|
did not include libreadline in the current file. */
|
|
|
|
#ifndef GNUPG_LIBREADLINE_H_INCLUDED
|
|
|
|
typedef char **rl_completion_func_t (const char *, int, int);
|
|
|
|
#endif /*!GNUPG_LIBREADLINE_H_INCLUDED*/
|
|
|
|
|
|
|
|
|
2004-06-06 14:59:02 +02:00
|
|
|
/* Handy malloc macros - please use only them. */
|
2003-08-05 19:11:04 +02:00
|
|
|
#define xtrymalloc(a) gcry_malloc ((a))
|
2004-06-06 14:59:02 +02:00
|
|
|
#define xtrymalloc_secure(a) gcry_malloc_secure ((a))
|
2003-08-05 19:11:04 +02:00
|
|
|
#define xtrycalloc(a,b) gcry_calloc ((a),(b))
|
2004-06-06 14:59:02 +02:00
|
|
|
#define xtrycalloc_secure(a,b) gcry_calloc_secure ((a),(b))
|
2003-08-05 19:11:04 +02:00
|
|
|
#define xtryrealloc(a,b) gcry_realloc ((a),(b))
|
|
|
|
#define xtrystrdup(a) gcry_strdup ((a))
|
|
|
|
#define xfree(a) gcry_free ((a))
|
|
|
|
|
|
|
|
#define xmalloc(a) gcry_xmalloc ((a))
|
|
|
|
#define xmalloc_secure(a) gcry_xmalloc_secure ((a))
|
|
|
|
#define xcalloc(a,b) gcry_xcalloc ((a),(b))
|
|
|
|
#define xcalloc_secure(a,b) gcry_xcalloc_secure ((a),(b))
|
|
|
|
#define xrealloc(a,b) gcry_xrealloc ((a),(b))
|
|
|
|
#define xstrdup(a) gcry_xstrdup ((a))
|
|
|
|
|
2006-04-19 13:26:11 +02:00
|
|
|
/* For compatibility with gpg 1.4 we also define these: */
|
|
|
|
#define xmalloc_clear(a) gcry_xcalloc (1, (a))
|
|
|
|
#define xmalloc_secure_clear(a) gcry_xcalloc_secure (1, (a))
|
|
|
|
|
2006-09-06 18:35:52 +02:00
|
|
|
/* Convenience function to return a gpg-error code for memory
|
|
|
|
allocation failures. This function makes sure that an error will
|
|
|
|
be returned even if accidently ERRNO is not set. */
|
|
|
|
static inline gpg_error_t
|
|
|
|
out_of_core (void)
|
|
|
|
{
|
2006-09-14 18:50:33 +02:00
|
|
|
return gpg_error_from_syserror ();
|
2006-09-06 18:35:52 +02:00
|
|
|
}
|
2003-10-31 13:11:57 +01:00
|
|
|
|
|
|
|
/* A type to hold the ISO time. Note that this this is the same as
|
|
|
|
the the KSBA type ksba_isotime_t. */
|
|
|
|
typedef char gnupg_isotime_t[16];
|
|
|
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
/*-- gettime.c --*/
|
|
|
|
time_t gnupg_get_time (void);
|
2003-10-31 13:11:57 +01:00
|
|
|
void gnupg_get_isotime (gnupg_isotime_t timebuf);
|
2003-08-05 19:11:04 +02:00
|
|
|
void gnupg_set_time (time_t newtime, int freeze);
|
|
|
|
int gnupg_faked_time_p (void);
|
|
|
|
u32 make_timestamp (void);
|
|
|
|
u32 scan_isodatestr (const char *string);
|
2007-07-05 18:58:19 +02:00
|
|
|
time_t isotime2epoch (const char *string);
|
|
|
|
void epoch2isotime (gnupg_isotime_t timebuf, time_t atime);
|
2003-08-05 19:11:04 +02:00
|
|
|
u32 add_days_to_timestamp (u32 stamp, u16 days);
|
|
|
|
const char *strtimevalue (u32 stamp);
|
|
|
|
const char *strtimestamp (u32 stamp); /* GMT */
|
2006-05-23 18:19:43 +02:00
|
|
|
const char *isotimestamp (u32 stamp); /* GMT */
|
2003-08-05 19:11:04 +02:00
|
|
|
const char *asctimestamp (u32 stamp); /* localized */
|
2007-08-28 19:48:13 +02:00
|
|
|
gpg_error_t add_seconds_to_isotime (gnupg_isotime_t atime, int nseconds);
|
|
|
|
gpg_error_t add_days_to_isotime (gnupg_isotime_t atime, int ndays);
|
|
|
|
gpg_error_t check_isotime (const gnupg_isotime_t atime);
|
2009-03-16 10:44:44 +01:00
|
|
|
void dump_isotime (const gnupg_isotime_t atime);
|
2003-10-31 13:11:57 +01:00
|
|
|
|
2007-08-10 18:52:05 +02:00
|
|
|
/* Copy one ISO date to another, this is inline so that we can do a
|
2008-06-05 09:46:12 +02:00
|
|
|
minimal sanity check. A null date (empty string) is allowed. */
|
2003-10-31 13:11:57 +01:00
|
|
|
static inline void
|
|
|
|
gnupg_copy_time (gnupg_isotime_t d, const gnupg_isotime_t s)
|
|
|
|
{
|
2008-06-05 09:46:12 +02:00
|
|
|
if (*s)
|
|
|
|
{
|
|
|
|
if ((strlen (s) != 15 || s[8] != 'T'))
|
|
|
|
BUG();
|
|
|
|
memcpy (d, s, 15);
|
|
|
|
d[15] = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
*d = 0;
|
2003-10-31 13:11:57 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
/*-- signal.c --*/
|
|
|
|
void gnupg_init_signals (int mode, void (*fast_cleanup)(void));
|
|
|
|
void gnupg_pause_on_sigusr (int which);
|
|
|
|
void gnupg_block_all_signals (void);
|
|
|
|
void gnupg_unblock_all_signals (void);
|
|
|
|
|
|
|
|
/*-- yesno.c --*/
|
|
|
|
int answer_is_yes (const char *s);
|
|
|
|
int answer_is_yes_no_default (const char *s, int def_answer);
|
|
|
|
int answer_is_yes_no_quit (const char *s);
|
2006-05-23 18:19:43 +02:00
|
|
|
int answer_is_okay_cancel (const char *s, int def_answer);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
2004-06-14 10:32:07 +02:00
|
|
|
/*-- xreadline.c --*/
|
|
|
|
ssize_t read_line (FILE *fp,
|
|
|
|
char **addr_of_buffer, size_t *length_of_buffer,
|
|
|
|
size_t *max_length);
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
2008-06-09 16:49:28 +02:00
|
|
|
/*-- b64enc.c and b64dec.c --*/
|
2004-02-10 20:27:54 +01:00
|
|
|
struct b64state
|
|
|
|
{
|
|
|
|
unsigned int flags;
|
|
|
|
int idx;
|
|
|
|
int quad_count;
|
|
|
|
FILE *fp;
|
|
|
|
char *title;
|
|
|
|
unsigned char radbuf[4];
|
2008-04-07 21:31:12 +02:00
|
|
|
u32 crc;
|
2008-06-09 16:49:28 +02:00
|
|
|
int stop_seen:1;
|
|
|
|
int invalid_encoding:1;
|
2004-02-10 20:27:54 +01:00
|
|
|
};
|
2008-06-09 16:49:28 +02:00
|
|
|
|
2004-02-10 20:27:54 +01:00
|
|
|
gpg_error_t b64enc_start (struct b64state *state, FILE *fp, const char *title);
|
|
|
|
gpg_error_t b64enc_write (struct b64state *state,
|
|
|
|
const void *buffer, size_t nbytes);
|
|
|
|
gpg_error_t b64enc_finish (struct b64state *state);
|
|
|
|
|
2008-06-09 16:49:28 +02:00
|
|
|
gpg_error_t b64dec_start (struct b64state *state, const char *title);
|
|
|
|
gpg_error_t b64dec_proc (struct b64state *state, void *buffer, size_t length,
|
|
|
|
size_t *r_nbytes);
|
|
|
|
gpg_error_t b64dec_finish (struct b64state *state);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2005-04-11 18:10:03 +02:00
|
|
|
/*-- sexputil.c */
|
2009-03-06 18:31:27 +01:00
|
|
|
gpg_error_t make_canon_sexp (gcry_sexp_t sexp,
|
|
|
|
unsigned char **r_buffer, size_t *r_buflen);
|
2005-04-11 18:10:03 +02:00
|
|
|
gpg_error_t keygrip_from_canon_sexp (const unsigned char *key, size_t keylen,
|
|
|
|
unsigned char *grip);
|
2005-04-18 12:44:46 +02:00
|
|
|
int cmp_simple_canon_sexp (const unsigned char *a, const unsigned char *b);
|
|
|
|
unsigned char *make_simple_sexp_from_hexstr (const char *line,
|
|
|
|
size_t *nscanned);
|
2007-12-13 16:45:40 +01:00
|
|
|
int hash_algo_from_sigval (const unsigned char *sigval);
|
2009-05-07 17:01:47 +02:00
|
|
|
unsigned char *make_canon_sexp_from_rsa_pk (const void *m, size_t mlen,
|
|
|
|
const void *e, size_t elen,
|
|
|
|
size_t *r_len);
|
|
|
|
gpg_error_t get_rsa_pk_from_canon_sexp (const unsigned char *keydata,
|
|
|
|
size_t keydatalen,
|
|
|
|
unsigned char const **r_n,
|
|
|
|
size_t *r_nlen,
|
|
|
|
unsigned char const **r_e,
|
|
|
|
size_t *r_elen);
|
2009-07-01 20:30:33 +02:00
|
|
|
gpg_error_t get_pk_algo_from_canon_sexp (const unsigned char *keydata,
|
|
|
|
size_t keydatalen,
|
|
|
|
int *r_algo);
|
2004-02-10 20:27:54 +01:00
|
|
|
|
2006-09-15 20:53:37 +02:00
|
|
|
/*-- convert.c --*/
|
2006-10-20 13:38:48 +02:00
|
|
|
int hex2bin (const char *string, void *buffer, size_t length);
|
2006-09-15 20:53:37 +02:00
|
|
|
int hexcolon2bin (const char *string, void *buffer, size_t length);
|
|
|
|
char *bin2hex (const void *buffer, size_t length, char *stringbuf);
|
|
|
|
char *bin2hexcolon (const void *buffer, size_t length, char *stringbuf);
|
2008-09-03 11:37:32 +02:00
|
|
|
const char *hex2str (const char *hexstring,
|
|
|
|
char *buffer, size_t bufsize, size_t *buflen);
|
|
|
|
char *hex2str_alloc (const char *hexstring, size_t *r_count);
|
2006-09-15 20:53:37 +02:00
|
|
|
|
2008-12-05 17:31:39 +01:00
|
|
|
/*-- percent.c --*/
|
|
|
|
char *percent_plus_escape (const char *string);
|
2009-04-01 12:51:53 +02:00
|
|
|
char *percent_plus_unescape (const char *string, int nulrepl);
|
|
|
|
char *percent_unescape (const char *string, int nulrepl);
|
|
|
|
|
|
|
|
size_t percent_plus_unescape_inplace (char *string, int nulrepl);
|
|
|
|
size_t percent_unescape_inplace (char *string, int nulrepl);
|
2008-12-05 17:31:39 +01:00
|
|
|
|
2006-09-15 20:53:37 +02:00
|
|
|
|
2006-04-19 13:26:11 +02:00
|
|
|
/*-- homedir.c --*/
|
2007-06-26 15:48:44 +02:00
|
|
|
const char *standard_homedir (void);
|
2004-12-21 11:03:00 +01:00
|
|
|
const char *default_homedir (void);
|
2007-06-14 19:05:07 +02:00
|
|
|
const char *gnupg_sysconfdir (void);
|
|
|
|
const char *gnupg_bindir (void);
|
|
|
|
const char *gnupg_libexecdir (void);
|
|
|
|
const char *gnupg_libdir (void);
|
|
|
|
const char *gnupg_datadir (void);
|
2008-11-04 20:54:02 +01:00
|
|
|
const char *gnupg_localedir (void);
|
2007-08-14 18:50:27 +02:00
|
|
|
const char *dirmngr_socket_name (void);
|
2007-06-14 19:05:07 +02:00
|
|
|
|
2007-08-29 11:51:37 +02:00
|
|
|
/* All module names. We also include gpg and gpgsm for the sake for
|
|
|
|
gpgconf. */
|
2007-06-14 19:05:07 +02:00
|
|
|
#define GNUPG_MODULE_NAME_AGENT 1
|
|
|
|
#define GNUPG_MODULE_NAME_PINENTRY 2
|
|
|
|
#define GNUPG_MODULE_NAME_SCDAEMON 3
|
|
|
|
#define GNUPG_MODULE_NAME_DIRMNGR 4
|
|
|
|
#define GNUPG_MODULE_NAME_PROTECT_TOOL 5
|
2007-08-27 20:10:27 +02:00
|
|
|
#define GNUPG_MODULE_NAME_CHECK_PATTERN 6
|
2007-08-29 11:51:37 +02:00
|
|
|
#define GNUPG_MODULE_NAME_GPGSM 7
|
|
|
|
#define GNUPG_MODULE_NAME_GPG 8
|
2008-05-27 14:03:50 +02:00
|
|
|
#define GNUPG_MODULE_NAME_CONNECT_AGENT 9
|
|
|
|
#define GNUPG_MODULE_NAME_GPGCONF 10
|
2007-06-14 19:05:07 +02:00
|
|
|
const char *gnupg_module_name (int which);
|
|
|
|
|
|
|
|
|
2004-12-21 11:03:00 +01:00
|
|
|
|
2006-09-21 15:30:45 +02:00
|
|
|
/*-- gpgrlhelp.c --*/
|
|
|
|
void gnupg_rl_initialize (void);
|
2004-12-21 11:03:00 +01:00
|
|
|
|
2007-12-04 12:23:31 +01:00
|
|
|
/*-- helpfile.c --*/
|
2007-12-04 16:00:14 +01:00
|
|
|
char *gnupg_get_help_string (const char *key, int only_current_locale);
|
2007-12-04 12:23:31 +01:00
|
|
|
|
|
|
|
/*-- localename.c --*/
|
|
|
|
const char *gnupg_messages_locale_name (void);
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
/*-- miscellaneous.c --*/
|
2003-12-17 13:26:38 +01:00
|
|
|
|
2007-04-20 18:59:37 +02:00
|
|
|
/* This function is called at startup to tell libgcrypt to use our own
|
|
|
|
logging subsystem. */
|
|
|
|
void setup_libgcrypt_logging (void);
|
|
|
|
|
2007-05-15 18:10:48 +02:00
|
|
|
/* Same as estream_asprintf but die on memory failure. */
|
2003-12-17 13:26:38 +01:00
|
|
|
char *xasprintf (const char *fmt, ...) JNLIB_GCC_A_PRINTF(1,2);
|
2007-05-15 18:10:48 +02:00
|
|
|
/* This is now an alias to estream_asprintf. */
|
2005-02-25 17:14:55 +01:00
|
|
|
char *xtryasprintf (const char *fmt, ...) JNLIB_GCC_A_PRINTF(1,2);
|
2003-12-17 13:26:38 +01:00
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
const char *print_fname_stdout (const char *s);
|
|
|
|
const char *print_fname_stdin (const char *s);
|
|
|
|
void print_string (FILE *fp, const byte *p, size_t n, int delim);
|
|
|
|
void print_utf8_string2 ( FILE *fp, const byte *p, size_t n, int delim);
|
|
|
|
void print_utf8_string (FILE *fp, const byte *p, size_t n);
|
2007-03-19 16:44:59 +01:00
|
|
|
void print_hexstring (FILE *fp, const void *buffer, size_t length,
|
|
|
|
int reserved);
|
2005-06-16 10:12:03 +02:00
|
|
|
char *make_printable_string (const void *p, size_t n, int delim);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
int is_file_compressed (const char *s, int *ret_rc);
|
|
|
|
|
2006-05-23 18:19:43 +02:00
|
|
|
int match_multistr (const char *multistr,const char *match);
|
2003-08-05 19:11:04 +02:00
|
|
|
|
* configure.ac (gl_INIT): Add gnulib stuff.
(fseeko, ftello, ttyname, isascii): Replaced the AC_REPLACE_FUNCS
by a simple check.
(putc_unlocked): Removed check. Not used.
(strsep, mkdtemp, asprintf): Replaced checks by gnulib checks.
(xsize): Added will probably come handy soon.
(CFLAGS): Use -Wformat-security instead of
-Wformat-nonliteral. Add --Wno-format-y2k.
* gl/, gl/m4/: New.
* gpg-agent.c: Include setenv.h.
* Makefile.am (AM_CPPFLAGS): Added.
* util.h: Add some includes for gnulib.
(ttyname, isascii): Define them inline.
* fseeko.c, ftello.c: Removed.
* strsep.c, mkdtemp.c: Removed.
* ttyname.c, isascii.c: Removed.
* mkdtemp.c: Removed.
* exec.c: Include mkdtemp.h
* keybox-file.c (ftello) [!HAVE_FSEEKO]: New replacement
function. Copied from ../common/ftello.c.
* keybox-update.c (fseeko) [!HAVE_FSEEKO]: New replacement
function. Copied from ../common/iobuf.c.
* scdaemon.c: Include mkdtemp.h.
* misc.c: Include setenv.h.
* symcryptrun.c: Include mkdtemp.h.
2005-06-01 17:46:01 +02:00
|
|
|
|
|
|
|
/*-- Simple replacement functions. */
|
2004-12-15 15:15:54 +01:00
|
|
|
#ifndef HAVE_TTYNAME
|
* configure.ac (gl_INIT): Add gnulib stuff.
(fseeko, ftello, ttyname, isascii): Replaced the AC_REPLACE_FUNCS
by a simple check.
(putc_unlocked): Removed check. Not used.
(strsep, mkdtemp, asprintf): Replaced checks by gnulib checks.
(xsize): Added will probably come handy soon.
(CFLAGS): Use -Wformat-security instead of
-Wformat-nonliteral. Add --Wno-format-y2k.
* gl/, gl/m4/: New.
* gpg-agent.c: Include setenv.h.
* Makefile.am (AM_CPPFLAGS): Added.
* util.h: Add some includes for gnulib.
(ttyname, isascii): Define them inline.
* fseeko.c, ftello.c: Removed.
* strsep.c, mkdtemp.c: Removed.
* ttyname.c, isascii.c: Removed.
* mkdtemp.c: Removed.
* exec.c: Include mkdtemp.h
* keybox-file.c (ftello) [!HAVE_FSEEKO]: New replacement
function. Copied from ../common/ftello.c.
* keybox-update.c (fseeko) [!HAVE_FSEEKO]: New replacement
function. Copied from ../common/iobuf.c.
* scdaemon.c: Include mkdtemp.h.
* misc.c: Include setenv.h.
* symcryptrun.c: Include mkdtemp.h.
2005-06-01 17:46:01 +02:00
|
|
|
/* Systems without ttyname (W32) will merely return NULL. */
|
|
|
|
static inline char *
|
|
|
|
ttyname (int fd)
|
|
|
|
{
|
2008-10-17 21:18:46 +02:00
|
|
|
(void)fd;
|
2007-06-06 20:12:30 +02:00
|
|
|
return NULL;
|
|
|
|
}
|
* configure.ac (gl_INIT): Add gnulib stuff.
(fseeko, ftello, ttyname, isascii): Replaced the AC_REPLACE_FUNCS
by a simple check.
(putc_unlocked): Removed check. Not used.
(strsep, mkdtemp, asprintf): Replaced checks by gnulib checks.
(xsize): Added will probably come handy soon.
(CFLAGS): Use -Wformat-security instead of
-Wformat-nonliteral. Add --Wno-format-y2k.
* gl/, gl/m4/: New.
* gpg-agent.c: Include setenv.h.
* Makefile.am (AM_CPPFLAGS): Added.
* util.h: Add some includes for gnulib.
(ttyname, isascii): Define them inline.
* fseeko.c, ftello.c: Removed.
* strsep.c, mkdtemp.c: Removed.
* ttyname.c, isascii.c: Removed.
* mkdtemp.c: Removed.
* exec.c: Include mkdtemp.h
* keybox-file.c (ftello) [!HAVE_FSEEKO]: New replacement
function. Copied from ../common/ftello.c.
* keybox-update.c (fseeko) [!HAVE_FSEEKO]: New replacement
function. Copied from ../common/iobuf.c.
* scdaemon.c: Include mkdtemp.h.
* misc.c: Include setenv.h.
* symcryptrun.c: Include mkdtemp.h.
2005-06-01 17:46:01 +02:00
|
|
|
#endif /* !HAVE_TTYNAME */
|
2004-12-20 17:17:25 +01:00
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
* configure.ac (gl_INIT): Add gnulib stuff.
(fseeko, ftello, ttyname, isascii): Replaced the AC_REPLACE_FUNCS
by a simple check.
(putc_unlocked): Removed check. Not used.
(strsep, mkdtemp, asprintf): Replaced checks by gnulib checks.
(xsize): Added will probably come handy soon.
(CFLAGS): Use -Wformat-security instead of
-Wformat-nonliteral. Add --Wno-format-y2k.
* gl/, gl/m4/: New.
* gpg-agent.c: Include setenv.h.
* Makefile.am (AM_CPPFLAGS): Added.
* util.h: Add some includes for gnulib.
(ttyname, isascii): Define them inline.
* fseeko.c, ftello.c: Removed.
* strsep.c, mkdtemp.c: Removed.
* ttyname.c, isascii.c: Removed.
* mkdtemp.c: Removed.
* exec.c: Include mkdtemp.h
* keybox-file.c (ftello) [!HAVE_FSEEKO]: New replacement
function. Copied from ../common/ftello.c.
* keybox-update.c (fseeko) [!HAVE_FSEEKO]: New replacement
function. Copied from ../common/iobuf.c.
* scdaemon.c: Include mkdtemp.h.
* misc.c: Include setenv.h.
* symcryptrun.c: Include mkdtemp.h.
2005-06-01 17:46:01 +02:00
|
|
|
/*-- Macros to replace ctype ones to avoid locale problems. --*/
|
2003-08-05 19:11:04 +02:00
|
|
|
#define spacep(p) (*(p) == ' ' || *(p) == '\t')
|
|
|
|
#define digitp(p) (*(p) >= '0' && *(p) <= '9')
|
|
|
|
#define hexdigitp(a) (digitp (a) \
|
|
|
|
|| (*(a) >= 'A' && *(a) <= 'F') \
|
|
|
|
|| (*(a) >= 'a' && *(a) <= 'f'))
|
2003-09-23 19:48:33 +02:00
|
|
|
/* Note this isn't identical to a C locale isspace() without \f and
|
|
|
|
\v, but works for the purposes used here. */
|
|
|
|
#define ascii_isspace(a) ((a)==' ' || (a)=='\n' || (a)=='\r' || (a)=='\t')
|
|
|
|
|
2004-01-27 17:40:42 +01:00
|
|
|
/* The atoi macros assume that the buffer has only valid digits. */
|
2003-08-05 19:11:04 +02:00
|
|
|
#define atoi_1(p) (*(p) - '0' )
|
|
|
|
#define atoi_2(p) ((atoi_1(p) * 10) + atoi_1((p)+1))
|
|
|
|
#define atoi_4(p) ((atoi_2(p) * 100) + atoi_2((p)+2))
|
|
|
|
#define xtoi_1(p) (*(p) <= '9'? (*(p)- '0'): \
|
|
|
|
*(p) <= 'F'? (*(p)-'A'+10):(*(p)-'a'+10))
|
|
|
|
#define xtoi_2(p) ((xtoi_1(p) * 16) + xtoi_1((p)+1))
|
2004-01-27 17:40:42 +01:00
|
|
|
#define xtoi_4(p) ((xtoi_2(p) * 256) + xtoi_2((p)+2))
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
|
2007-06-21 20:44:48 +02:00
|
|
|
/*-- Forward declaration of the commonly used server control structure. */
|
|
|
|
/* (We need it here as it is used by some callback prototypes.) */
|
|
|
|
struct server_control_s;
|
|
|
|
typedef struct server_control_s *ctrl_t;
|
|
|
|
|
2003-08-05 19:11:04 +02:00
|
|
|
|
|
|
|
#endif /*GNUPG_COMMON_UTIL_H*/
|