Move fmtcheck and fgetln declarations to <bsd/stdio.h>

This is were they are located on the BSDs.

diff --git a/Makefile b/Makefile
index 91893e70cdd0d40ffda2977ff89fd8b958d437c6..c751f32d9d65553ddaf699bf412db9122caa9029 100644 (file)
--- 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 (file)
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 <sys/cdefs.h>
+#include <sys/types.h>
+#include <stdio.h>
+
+__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 e2a678a3b7bdf9d911b338c04b6dfc6399f05757..cec5a281c21f5795d813bbfeac5a5f7aa6e8c52d 100644 (file)
--- a/include/bsd/stdlib.h
+++ b/include/bsd/stdlib.h
@@ -37,7 +37,8 @@
 /* For compatibility with NetBSD, which defines humanize_number here. */
 #include <libutil.h>
 
-/* FIXME: Temporary inclusion to avoid API breakage, will be removed soon. */
+/* FIXME: Temporary inclusions to avoid API breakage, will be removed soon. */
+#include <bsd/stdio.h>
 #include <bsd/unistd.h>
 
 __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 293e093a0a0e059202025a3bfeaa0521f99fde4f..cf72cc0d7581d6cb3af9a023f6ad3efe7715eebe 100644 (file)
--- a/include/bsd/string.h
+++ b/include/bsd/string.h
@@ -29,13 +29,13 @@
 
 #include <sys/cdefs.h>
 #include <sys/types.h>
-#include <stddef.h>
-#include <stdio.h>
+
+/* FIXME: Temporary inclusion to avoid API breakage, will be removed soon. */
+#include <bsd/stdio.h>
 
 __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