mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
cad9562436
(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.
63 lines
1.6 KiB
C
63 lines
1.6 KiB
C
/* xasprintf.c
|
|
* Copyright (C) 2003, 2005 Free Software Foundation, Inc.
|
|
*
|
|
* 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
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (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
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
|
*/
|
|
|
|
#include <config.h>
|
|
#include <stdlib.h>
|
|
#include <errno.h>
|
|
|
|
#include "util.h"
|
|
#include "iobuf.h"
|
|
|
|
/* 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;
|
|
char *buf, *p;
|
|
|
|
va_start (ap, fmt);
|
|
if (vasprintf (&buf, fmt, ap) < 0)
|
|
log_fatal ("asprintf failed: %s\n", strerror (errno));
|
|
va_end (ap);
|
|
p = xstrdup (buf);
|
|
free (buf);
|
|
return p;
|
|
}
|
|
|
|
/* Same as above but return NULL on memory failure. */
|
|
char *
|
|
xtryasprintf (const char *fmt, ...)
|
|
{
|
|
int rc;
|
|
va_list ap;
|
|
char *buf, *p;
|
|
|
|
va_start (ap, fmt);
|
|
rc = vasprintf (&buf, fmt, ap);
|
|
va_end (ap);
|
|
if (rc < 0)
|
|
return NULL;
|
|
p = xtrystrdup (buf);
|
|
free (buf);
|
|
return p;
|
|
}
|