浏览代码

Add replacement function for asprintf

tags/fmail-0.1.1
父节点
当前提交
4819ceb7f7
共有 3 个文件被更改,包括 75 次插入1 次删除
  1. +61
    -0
      lib/asprintf.c
  2. +13
    -0
      lib/compat.h
  3. +1
    -1
      m4/notch.m4

+ 61
- 0
lib/asprintf.c 查看文件

@@ -0,0 +1,61 @@
/*
* asprintf - Incenp.org Notch Library: (v)asprintf replacement
* Copyright (C) 2011 Damien Goutte-Gattat
*
* This program 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 3 of the License, or
* (at your option) any later version.
*
* This program 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, see <http://www.gnu.org/licenses/>.
*/

#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
#include <errno.h>

int
vasprintf(char **strp, const char *fmt, va_list ap)
{
int n;
va_list aq;

if ( ! strp ) {
errno = EINVAL;
return -1;
}

n = vsnprintf(NULL, 0, fmt, ap) + 1;
if ( ! (*strp = malloc(n)) )
return -1;

va_copy(ap, aq);
n = vsnprintf(*strp, n, fmt, aq);
va_end(aq);

return n;
}

int
asprintf(char **strp, const char *fmt, ...)
{
int n;
va_list ap;

va_start(ap, fmt);
n = vasprintf(strp, fmt, ap);
va_end(ap);

return n;
}

+ 13
- 0
lib/compat.h 查看文件

@@ -24,6 +24,19 @@ extern "C" {
#endif


#ifndef HAVE_ASPRINTF

#include <stdarg.h>

int
asprintf(char **, const char *, ...);

int
vasprintf(char **, const char *, va_list);

#endif /* ! HAVE_ASPRINTF */


#if HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME

/*


+ 1
- 1
m4/notch.m4 查看文件

@@ -4,7 +4,7 @@ dnl everywhere, and for which we provide a replacement.
dnl
AC_DEFUN([ICP_CHECK_NOTCH_FUNCS],[
AC_CHECK_HEADERS([err.h], [], [AC_CONFIG_LINKS([err.h:lib/err.compat.h])])
AC_REPLACE_FUNCS([err])
AC_REPLACE_FUNCS([asprintf err])
AC_CHECK_DECLS([program_invocation_short_name], [],
[AC_CHECK_FUNCS([getprogname setprogname], [],
[AC_LIBOBJ([progname])])],


正在加载...
取消
保存