From 7a70f1b019a64902a3c8a722ee5287d72a1cbf5b Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Fri, 11 Dec 2009 23:24:31 +0100 Subject: Move fmtcheck and fgetln declarations to This is were they are located on the BSDs. --- Makefile | 1 + include/bsd/stdio.h | 40 ++++++++++++++++++++++++++++++++++++++++ include/bsd/stdlib.h | 5 ++--- include/bsd/string.h | 6 +++--- 4 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 include/bsd/stdio.h diff --git a/Makefile b/Makefile index 91893e7..c751f32 100644 --- a/Makefile +++ b/Makefile @@ -60,6 +60,7 @@ LIB_INCLUDES := \ bsd/md5.h \ bsd/string.h \ bsd/bsd.h \ + bsd/stdio.h \ bsd/stdlib.h \ bsd/readpassphrase.h \ bsd/unistd.h \ diff --git a/include/bsd/stdio.h b/include/bsd/stdio.h new file mode 100644 index 0000000..882f374 --- /dev/null +++ b/include/bsd/stdio.h @@ -0,0 +1,40 @@ +/* + * Copyright © 2004, 2005, 2009 Guillem Jover + * + * 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. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED ``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 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. + */ + +#ifndef LIBBSD_STDIO_H +#define LIBBSD_STDIO_H + +#include +#include +#include + +__BEGIN_DECLS +const char *fmtcheck(const char *, const char *); + +char *fgetln(FILE *fp, size_t *lenp); +__END_DECLS + +#endif diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h index e2a678a..cec5a28 100644 --- a/include/bsd/stdlib.h +++ b/include/bsd/stdlib.h @@ -37,7 +37,8 @@ /* For compatibility with NetBSD, which defines humanize_number here. */ #include -/* FIXME: Temporary inclusion to avoid API breakage, will be removed soon. */ +/* FIXME: Temporary inclusions to avoid API breakage, will be removed soon. */ +#include #include __BEGIN_DECLS @@ -47,8 +48,6 @@ void arc4random_addrandom(u_char *dat, int datlen); int dehumanize_number(const char *str, int64_t *size); -const char *fmtcheck (const char *, const char *); - char *getprogname (); void setprogname (char *); diff --git a/include/bsd/string.h b/include/bsd/string.h index 293e093..cf72cc0 100644 --- a/include/bsd/string.h +++ b/include/bsd/string.h @@ -29,13 +29,13 @@ #include #include -#include -#include + +/* FIXME: Temporary inclusion to avoid API breakage, will be removed soon. */ +#include __BEGIN_DECLS size_t strlcpy(char *dst, const char *src, size_t siz); size_t strlcat(char *dst, const char *src, size_t siz); -char *fgetln(FILE *fp, size_t *lenp); void strmode(mode_t mode, char *str); __END_DECLS -- cgit v1.2.3