2004-01-30 13:37:09 +01:00
|
|
|
/* xasprintf.c
|
2005-02-25 17:14:55 +01:00
|
|
|
* Copyright (C) 2003, 2005 Free Software Foundation, Inc.
|
2004-01-30 13:37:09 +01: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
|
2004-01-30 13:37:09 +01: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/>.
|
2004-01-30 13:37:09 +01:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <errno.h>
|
|
|
|
|
|
|
|
#include "util.h"
|
|
|
|
#include "iobuf.h"
|
2007-05-15 18:10:48 +02:00
|
|
|
#include "estream-printf.h"
|
|
|
|
|
2007-05-15 21:47:15 +02:00
|
|
|
#if !defined(_ESTREAM_PRINTF_MALLOC) || !defined(_ESTREAM_PRINTF_FREE)
|
|
|
|
#error Need to define ESTREAM_PRINTF_MALLOC and _FREE
|
2007-05-15 18:10:48 +02:00
|
|
|
#endif
|
2004-01-30 13:37:09 +01:00
|
|
|
|
|
|
|
/* Same as asprintf but return an allocated buffer suitable to be
|
|
|
|
freed using xfree. This function simply dies on memory failure,
|
|
|
|
thus no extra check is required. */
|
|
|
|
char *
|
|
|
|
xasprintf (const char *fmt, ...)
|
|
|
|
{
|
|
|
|
va_list ap;
|
2007-05-15 18:10:48 +02:00
|
|
|
char *buf;
|
2004-01-30 13:37:09 +01:00
|
|
|
|
|
|
|
va_start (ap, fmt);
|
2007-05-15 18:10:48 +02:00
|
|
|
if (estream_vasprintf (&buf, fmt, ap) < 0)
|
|
|
|
log_fatal ("estream_asprintf failed: %s\n", strerror (errno));
|
2004-01-30 13:37:09 +01:00
|
|
|
va_end (ap);
|
2007-05-15 18:10:48 +02:00
|
|
|
return buf;
|
2004-01-30 13:37:09 +01:00
|
|
|
}
|
2005-02-25 17:14:55 +01: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
|
|
|
/* Same as above but return NULL on memory failure. */
|
2005-02-25 17:14:55 +01:00
|
|
|
char *
|
|
|
|
xtryasprintf (const char *fmt, ...)
|
|
|
|
{
|
|
|
|
int rc;
|
|
|
|
va_list ap;
|
2007-05-15 18:10:48 +02:00
|
|
|
char *buf;
|
2005-02-25 17:14:55 +01:00
|
|
|
|
|
|
|
va_start (ap, fmt);
|
2007-05-15 18:10:48 +02:00
|
|
|
rc = estream_vasprintf (&buf, fmt, ap);
|
2005-02-25 17:14:55 +01:00
|
|
|
va_end (ap);
|
|
|
|
if (rc < 0)
|
|
|
|
return NULL;
|
2007-05-15 18:10:48 +02:00
|
|
|
return buf;
|
2005-02-25 17:14:55 +01:00
|
|
|
}
|