commit 07337c5255e6001031d456660174a39a1c73a11d Author: Taylor R Campbell <campbell@mumble.net> Date: Wed Apr 17 21:13:30 2013 +0000 Implement fmemopen in terms of funopen where needed and possible. Currently done only on NetBSD 5, but this should work for other BSDs and probably Android as well, instead of the libc-internal hacks that tlsdate currently uses for fmemopen on Android. --- configure.ac | 13 ++-- src/common/fmemopen-funopen.c | 158 +++++++++++++++++++++++++++++++++++++++++ src/common/fmemopen.h | 8 ++ src/conf-unittest.c | 6 ++ src/include.am | 9 +++ 5 files changed, 189 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index d1649da..a4f2eb3 100644 --- a/configure.ac +++ b/configure.ac @@ -145,6 +145,9 @@ AC_CHECK_HEADERS([unistd.h], ,[AC_MSG_ERROR([Required headers missing; compilati AC_CHECK_FUNCS([setresuid]) AC_CHECK_FUNCS([gettimeofday]) +AC_CHECK_FUNCS([fmemopen funopen]) +AM_CONDITIONAL(HAVE_FMEMOPEN, [test "x${ac_cv_func_fmemopen}" = xyes]) +AM_CONDITIONAL(HAVE_FUNOPEN, [test "x${ac_cv_func_funopen}" = xyes]) case "$host" in *-darwin*) @@ -182,11 +185,11 @@ case "$host" in dnl clock_gettime is either part of libc or unavailable. AC_CHECK_FUNC([clock_gettime], , [AC_MSG_ERROR([Your system lacks clock_gettime])]) - dnl If the autoconf goo picks up a compiler that runs in pre-POSIX mode, - dnl the fmemopen prototype is hidden causing the unit tests to segfault. - dnl This can happen if gcc is a symlink to gcc46 and is preferred to clang. - AC_CHECK_FUNC([fmemopen], , - [AC_MSG_WARN([Missing fmemopen, unit tests are likely to segfault. Try CC=clang.])]) + if test "x${ac_cv_func_fmemopen}" != xyes; then + if test "x${ac_cv_func_funopen}" != xyes; then + AC_MSG_ERROR([We need fmemopen or funopen for unit tests.]) + fi + fi AC_ARG_WITH([unpriv-group], [AS_HELP_STRING([--with-unpriv-group=<group>], [Group to drop privs to @<:@default: nobody@:>@])]) diff --git a/src/common/fmemopen-funopen.c b/src/common/fmemopen-funopen.c new file mode 100644 index 0000000..87c8675 --- /dev/null +++ b/src/common/fmemopen-funopen.c @@ -0,0 +1,158 @@ +/* + * POSIX 2008 fmemopen(3) implemented in terms of BSD funopen(3) + */ + +/* + * Copyright (c) 2013 Taylor R. Campbell + * 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. + */ + +#define _BSD_SOURCE +#define _NETBSD_SOURCE + +#include <errno.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include "fmemopen.h" + +struct fmem_cookie { + void *fmc_buffer; + size_t fmc_index; + size_t fmc_limit; +}; + +static int +fmem_read(void *cookie, char *buffer, int n) +{ + struct fmem_cookie *const fmc = cookie; + + if (n < 0) { /* paranoia */ + errno = EINVAL; + return -1; + } + + if (n > (fmc->fmc_limit - fmc->fmc_index)) + n = (fmc->fmc_limit - fmc->fmc_index); + + (void)memcpy(buffer, (char *)fmc->fmc_buffer + fmc->fmc_index, n); + fmc->fmc_index += n; + return n; +} + +static int +fmem_write(void *cookie, const char *buffer, int n) +{ + struct fmem_cookie *const fmc = cookie; + + if (n < 0) { /* paranoia */ + errno = EINVAL; + return -1; + } + + if (n > (fmc->fmc_limit - fmc->fmc_index)) + n = (fmc->fmc_limit - fmc->fmc_index); + + (void)memcpy((char *)fmc->fmc_buffer + fmc->fmc_index, buffer, n); + fmc->fmc_index += n; + return n; +} + +static fpos_t +fmem_seek(void *cookie, fpos_t offset, int cmd) +{ + struct fmem_cookie *const fmc = cookie; + + switch (cmd) { + case SEEK_SET: + if ((offset < 0) || (fmc->fmc_limit < offset)) + goto einval; + fmc->fmc_index = offset; + return 0; + + case SEEK_CUR: + if (offset < 0) { + /* Assume two's-complement arithmetic. */ + if ((offset == ~(fpos_t)0) || (-offset > fmc->fmc_index)) + goto einval; + } else { + if (offset > (fmc->fmc_limit - fmc->fmc_index)) + goto einval; + } + fmc->fmc_index += offset; + return 0; + + case SEEK_END: + /* Assume two's-complement arithmetic. */ + if ((offset >= 0) || (offset == ~(fpos_t)0) || (fmc->fmc_limit < -offset)) + goto einval; + fmc->fmc_index = (fmc->fmc_limit + offset); + return 0; + + default: + goto einval; + } + +einval: + errno = EINVAL; + return -1; +} + +static int +fmem_close(void *cookie) +{ + struct fmem_cookie *const fmc = cookie; + + free(fmc); + + return 0; +} + +FILE * +fmemopen(void *buffer, size_t len, const char *mode) +{ + struct fmem_cookie *fmc; + FILE *file; + + fmc = malloc(sizeof(*fmc)); + if (fmc == NULL) + goto fail0; + + (void)memset(fmc, 0, sizeof(*fmc)); + fmc->fmc_buffer = buffer; + fmc->fmc_index = 0; + fmc->fmc_limit = len; + + file = funopen(fmc, &fmem_read, &fmem_write, &fmem_seek, &fmem_close); + if (file == NULL) + goto fail1; + + return file; + +fail1: + free(fmc); +fail0: + return NULL; +} diff --git a/src/common/fmemopen.h b/src/common/fmemopen.h new file mode 100644 index 0000000..28a2500 --- /dev/null +++ b/src/common/fmemopen.h @@ -0,0 +1,8 @@ +#ifndef TLSDATE_FMEMOPEN_H +#define TLSDATE_FMEMOPEN_H + +#include <stdio.h> + +FILE *fmemopen(void *, size_t, const char *); + +#endif /* TLSDATE_FMEMOPEN_H */ diff --git a/src/conf-unittest.c b/src/conf-unittest.c index 7a371ac..e883ac7 100644 --- a/src/conf-unittest.c +++ b/src/conf-unittest.c @@ -5,6 +5,8 @@ * found in the LICENSE file. */ +#include "config.h" + #include <errno.h> #include <stdio.h> #include <stdlib.h> @@ -17,6 +19,10 @@ #include "src/common/fmemopen.h" #endif +#ifndef HAVE_FMEMOPEN +#include "src/common/fmemopen.h" +#endif + FILE *fopenstr(const char *str) { /* strlen(str) instead of strlen(str) + 1 because files shouldn't appear * null-terminated. Cast away constness because we're in read mode, but the diff --git a/src/include.am b/src/include.am index 8d3a25c..76c916b 100644 --- a/src/include.am +++ b/src/include.am @@ -45,6 +45,15 @@ bin_PROGRAMS+= src/tlsdate-helper src_conf_unittest_SOURCES = src/conf.c src_conf_unittest_SOURCES+= src/conf-unittest.c src_conf_unittest_SOURCES+= src/common/android.c + +# XXX This conditional should apply for any system where we're building +# conf_unittest, but I don't know how to tell that to automake. +if !HAVE_FMEMOPEN +if HAVE_FUNOPEN +src_conf_unittest_SOURCES+= src/common/fmemopen-funopen.c +endif +endif + check_PROGRAMS+= src/conf_unittest noinst_PROGRAMS+= src/conf_unittest endif