Date: Mon, 5 Oct 2015 09:46:23 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r288766 - in stable/10/sys: conf libkern sys Message-ID: <201510050946.t959kNbt052631@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Mon Oct 5 09:46:23 2015 New Revision: 288766 URL: https://svnweb.freebsd.org/changeset/base/288766 Log: MFC r279433 (by rstone): Implement asprintf in libkern Added: stable/10/sys/libkern/asprintf.c - copied unchanged from r279433, head/sys/libkern/asprintf.c Modified: stable/10/sys/conf/files stable/10/sys/sys/systm.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/conf/files ============================================================================== --- stable/10/sys/conf/files Mon Oct 5 09:26:52 2015 (r288765) +++ stable/10/sys/conf/files Mon Oct 5 09:46:23 2015 (r288766) @@ -3215,6 +3215,7 @@ kgssapi/gsstest.c optional kgssapi_debu # the file should be moved to conf/files.<arch> from here. # libkern/arc4random.c standard +libkern/asprintf.c standard libkern/bcd.c standard libkern/bsearch.c standard libkern/crc32.c standard Copied: stable/10/sys/libkern/asprintf.c (from r279433, head/sys/libkern/asprintf.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/sys/libkern/asprintf.c Mon Oct 5 09:46:23 2015 (r288766, copy of r279433, head/sys/libkern/asprintf.c) @@ -0,0 +1,77 @@ +/*- + * Copyright (c) 2013-2015 Sandvine Inc. All rights reserved. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/malloc.h> + +#include <machine/stdarg.h> + +int +vasprintf(char **buf, struct malloc_type *mtp, const char *format, va_list va) +{ + int len, ret; + va_list tmp_va; + char dummy; + + va_copy(tmp_va, va); + len = vsnprintf(&dummy, 0, format, tmp_va); + va_end(tmp_va); + if (len < 0) { + *buf = NULL; + return (len); + } + + /* Account for null terminator. */ + len += 1; + *buf = malloc(len, mtp, M_NOWAIT); + if (*buf == NULL) + return (-1); + + ret = vsnprintf(*buf, len, format, va); + if (ret < 0) { + free(*buf, mtp); + *buf = NULL; + } + + return (ret); +} + +int +asprintf(char **buf, struct malloc_type *mtp, const char *format, ...) +{ + int ret; + va_list va; + + va_start(va, format); + ret = vasprintf(buf, mtp, format, va); + va_end(va); + + return (ret); +} Modified: stable/10/sys/sys/systm.h ============================================================================== --- stable/10/sys/sys/systm.h Mon Oct 5 09:26:52 2015 (r288765) +++ stable/10/sys/sys/systm.h Mon Oct 5 09:46:23 2015 (r288766) @@ -206,11 +206,15 @@ int kvprintf(char const *, void (*)(int, __va_list) __printflike(1, 0); void log(int, const char *, ...) __printflike(2, 3); void log_console(struct uio *); +int asprintf(char **ret, struct malloc_type *mtp, const char *format, + ...) __printflike(3, 4); int printf(const char *, ...) __printflike(1, 2); int snprintf(char *, size_t, const char *, ...) __printflike(3, 4); int sprintf(char *buf, const char *, ...) __printflike(2, 3); int uprintf(const char *, ...) __printflike(1, 2); int vprintf(const char *, __va_list) __printflike(1, 0); +int vasprintf(char **ret, struct malloc_type *mtp, const char *format, + __va_list ap) __printflike(3, 0); int vsnprintf(char *, size_t, const char *, __va_list) __printflike(3, 0); int vsnrprintf(char *, size_t, int, const char *, __va_list) __printflike(4, 0); int vsprintf(char *buf, const char *, __va_list) __printflike(2, 0);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510050946.t959kNbt052631>